# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1378480192 -10800
# Node ID 17fd4410d0f1ac681b563dc6b87eb8675880c84b
# Parent  c1cac6e85f9bd606be773377f68f368ed3b54234# Parent  a804ee9bb8e257fbe6c68c8319b641172a03adc9
merged

diff -r c1cac6e85f9b -r 17fd4410d0f1 .emacs-my
--- a/.emacs-my	Tue Jul 30 22:48:54 2013 +0300
+++ b/.emacs-my	Fri Sep 06 18:09:52 2013 +0300
@@ -421,11 +421,12 @@
 (setq default-indicate-buffer-boundaries 'left)
 
 ;; (setq-default show-trailing-whitespace t)
-(defun my-show-trailing-whitespace ()
-  (setq show-trailing-whitespace t)
-  )
-(mapc (lambda (hook) (add-hook hook 'my-show-trailing-whitespace))
-      (append my-devel-mode-hook-list my-text-mode-hook-list))
+
+(setq whitespace-style '(face trailing tabs))
+(setq whitespace-global-modes (append my-devel-mode-list my-text-mode-list))
+(ignore-errors
+  (require 'whitespace)
+  (global-whitespace-mode 1))
 
 (setq next-line-add-newlines nil)
 
@@ -1367,13 +1368,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "TODO, XXX, FIXME highlight")
-;; Show blanks and FIXME
-;; http://www.emacswiki.org/cgi-bin/wiki/EightyColumnRule
-
-(defface my-tab-face
-  '((t :background "gray"))
-  "Face for showing TABs."
-  :group 'basic-faces)
 
 (defface my-contrasty-face
   '((t :background "pink" :foreground "red" :weight bold))
@@ -1384,7 +1378,6 @@
   (font-lock-add-keywords
    mode
    `(
-     ("\t+" 0 'my-tab-face t)
      ( ,(concat "\\<\\(" (regexp-opt '("TODO" "FIX" "FIXME" "HACK" "XXX")) ":?\\)\\>") 1 'font-lock-warning-face t)
      ;; 64 times, for highlight C-u C-u C-u <key>
      ("\\([^[:space:]]\\)\\1\\{63\\}" 0 'my-contrasty-face t)