equal
deleted
inserted
replaced
688 '((t :background "pink" :foreground "red" :weight bold)) |
688 '((t :background "pink" :foreground "red" :weight bold)) |
689 "Font for showing conflicts." |
689 "Font for showing conflicts." |
690 :group 'basic-faces) |
690 :group 'basic-faces) |
691 |
691 |
692 (add-hook 'font-lock-mode-hook (function (lambda () |
692 (add-hook 'font-lock-mode-hook (function (lambda () |
693 (unless (or (eq 'diff-mode major-mode) (eq 'script-mode major-mode)) |
693 (when (or |
|
694 (member major-mode '(sh-mode script-mode java-mode c-mode outline-mode text-mode lisp-mode)) |
|
695 ) |
694 (font-lock-add-keywords nil |
696 (font-lock-add-keywords nil |
695 '( |
697 '( |
696 ("\t+" 0 'my-tab-face t) |
698 ("\t+" 0 'my-tab-face t) |
697 ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t) |
699 ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t) |
698 ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t) |
700 ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t) |