equal
deleted
inserted
replaced
692 (defface my-conflict-face |
692 (defface my-conflict-face |
693 '((t :background "pink" :foreground "red" :weight bold)) |
693 '((t :background "pink" :foreground "red" :weight bold)) |
694 "Font for showing conflicts." |
694 "Font for showing conflicts." |
695 :group 'basic-faces) |
695 :group 'basic-faces) |
696 |
696 |
|
697 (defvar my-devel-mode-list |
|
698 '(sh-mode script-mode java-mode c-mode outline-mode text-mode |
|
699 lisp-mode makefile-mode makefile-gmake-mode python-mode) |
|
700 "List of development modes." ) |
|
701 |
697 (add-hook 'font-lock-mode-hook (function (lambda () |
702 (add-hook 'font-lock-mode-hook (function (lambda () |
698 (when (or |
703 (when (or |
699 (member major-mode '(sh-mode script-mode java-mode c-mode outline-mode text-mode lisp-mode)) |
704 (member major-mode my-devel-mode-list) |
700 ) |
705 ) |
701 (font-lock-add-keywords nil |
706 (font-lock-add-keywords nil |
702 '( |
707 '( |
703 ("\t+" 0 'my-tab-face t) |
708 ("\t+" 0 'my-tab-face t) |
704 ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t) |
709 ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t) |