equal
deleted
inserted
replaced
655 '( |
655 '( |
656 ("\t+" 0 'my-tab-face t) |
656 ("\t+" 0 'my-tab-face t) |
657 ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t) |
657 ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t) |
658 ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t) |
658 ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t) |
659 )))))) |
659 )))))) |
|
660 |
|
661 ;; ====================================================================== |
|
662 ;; communication |
|
663 |
|
664 ;; ---------------------------------------------------------------------- |
|
665 ;; jabber |
|
666 (when (featurep 'jabber) |
|
667 (setq jabber-history-enabled t |
|
668 jabber-use-global-history nil |
|
669 jabber-backlog-number 5 |
|
670 jabber-backlog-days 30 |
|
671 ) |
|
672 ) |
|
673 |
660 |
674 |
661 ;; ====================================================================== |
675 ;; ====================================================================== |
662 ;; VCS, version control, cvs, svn. |
676 ;; VCS, version control, cvs, svn. |
663 |
677 |
664 (if (equal window-system 'w32) |
678 (if (equal window-system 'w32) |