--- a/.emacs-my	Mon Mar 08 10:45:55 2010 +0200
+++ b/.emacs-my	Mon Mar 08 10:46:25 2010 +0200
@@ -523,6 +523,12 @@
 ;; ======================================================================
 ;; Info.
 
+;; Because of Debian policy documentation covered by FDL license with invariant sections not allowed in packet
+;; repository tree. So it must be installed manually. My usual configuration is install user local software
+;; into ~/usr DISTDIR.
+(unless (getenv "INFOPATH")
+  (setenv "INFOPATH" "~/usr/share/info:"))
+
 ;; ======================================================================
 ;; man, woman.
 
@@ -639,11 +645,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."
@@ -659,7 +660,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)
        ))))))
 
@@ -734,31 +735,30 @@
 
 (if window-system
     (progn
-     (custom-set-variables
-      '(vc-annotate-very-old-color "#0b5b20")
-      '(vc-annotate-background "white")
-      '(vc-annotate-color-map
-        (quote (
-                (20 .  "#EE0000")
-                (40 .  "#E0800D")
-                (60 .  "#D3001A")
-                (80 .  "#C68027")
-                (100 . "#B90034")
-                (120 . "#AB8042")
-                (140 . "#9E004F")
-                (160 . "#91805C")
-                (180 . "#840069")
-                (200 . "#778077")
-                (220 . "#690084")
-                (240 . "#5C8091")
-                (260 . "#4F009E")
-                (280 . "#4280AB")
-                (300 . "#3400B9")
-                (320 . "#2780C6")
-                (340 . "#1A00D3")
-                (360 . "#0D80E0"))))
+      (setq
+       vc-annotate-very-old-color "#0b5b20"
+       vc-annotate-background "white"
+       vc-annotate-color-map
+       '(
+         (20 .  "#EE0000")
+         (40 .  "#E0800D")
+         (60 .  "#D3001A")
+         (80 .  "#C68027")
+         (100 . "#B90034")
+         (120 . "#AB8042")
+         (140 . "#9E004F")
+         (160 . "#91805C")
+         (180 . "#840069")
+         (200 . "#778077")
+         (220 . "#690084")
+         (240 . "#5C8091")
+         (260 . "#4F009E")
+         (280 . "#4280AB")
+         (300 . "#3400B9")
+         (320 . "#2780C6")
+         (340 . "#1A00D3")
+         (360 . "#0D80E0")))
       )
-     )
   )
 
 ;; ----------------------------------------------------------------------