--- a/.emacs-my	Wed Feb 24 13:31:36 2010 +0200
+++ b/.emacs-my	Sat Mar 06 14:26:14 2010 +0200
@@ -637,11 +637,6 @@
   "Face for showing TABs."
   :group 'basic-faces)
 
-(defface my-todo-face
-  '((t :foreground "red" :weight bold))
-  "Font for showing TODO words."
-  :group 'basic-faces)
-
 (defface my-conflict-face
   '((t :background "pink" :foreground "red" :weight bold))
   "Font for showing conflicts."
@@ -657,7 +652,7 @@
     (font-lock-add-keywords nil
      '(
        ("\t+" 0 'my-tab-face t)
-       ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t)
+       ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'font-lock-warning-face t)
        ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t)
        ))))))