diff -r cb197c1eeb15 -r a044269d57e0 .emacs-my
--- a/.emacs-my	Fri Oct 26 01:09:54 2012 +0300
+++ b/.emacs-my	Sun Oct 28 13:31:32 2012 +0200
@@ -1836,6 +1836,49 @@
 ;; (setq erc-kill-server-buffer-on-quit t)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "devel, programming")
+
+(which-func-mode 1)
+
+(add-to-list 'auto-mode-alist '("\\.cu$" . c-mode))
+
+(defun my-c++-header-file-p ()
+  "Return non-nil, if in a C++ header."
+  (and (string-match "\\.h$"
+                     (or (buffer-file-name)
+                         (buffer-name)))
+       (save-excursion
+         (re-search-forward "\\_<class\\_>" nil t))))
+
+(when (>= emacs-major-version 22)
+  (add-to-list 'magic-mode-alist '(my-c++-header-file-p . c++-mode))
+  )
+
+(setq-default comment-style (quote indent))
+(setq-default comment-column 44)
+(setq-default comment-fill-column my-fill-column)
+
+(mapc (lambda (hook) (add-hook hook (lambda () (setq fill-column my-fill-column)) ))
+      (append my-devel-mode-hook-list my-text-mode-hook-list))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "diff, patch, ediff, emerge")
+
+(setq diff-switches "-u")
+
+(setq ediff-diff-options "")
+(setq ediff-custom-diff-options "-u")
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+(setq ediff-split-window-function 'split-window-vertically)
+
+(when window-system
+  (eval-after-load 'diff-mode
+    '(progn
+       (set-face-foreground 'diff-added-face "DarkGreen")
+       (set-face-foreground 'diff-removed-face "DarkRed")
+  )))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil")
 
 ;; `-b' switch to ignore changes in whitespaces.
@@ -1893,49 +1936,6 @@
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "devel, programming")
-
-(which-func-mode 1)
-
-(add-to-list 'auto-mode-alist '("\\.cu$" . c-mode))
-
-(defun my-c++-header-file-p ()
-  "Return non-nil, if in a C++ header."
-  (and (string-match "\\.h$"
-                     (or (buffer-file-name)
-                         (buffer-name)))
-       (save-excursion
-         (re-search-forward "\\_<class\\_>" nil t))))
-
-(when (>= emacs-major-version 22)
-  (add-to-list 'magic-mode-alist '(my-c++-header-file-p . c++-mode))
-  )
-
-(setq-default comment-style (quote indent))
-(setq-default comment-column 44)
-(setq-default comment-fill-column my-fill-column)
-
-(mapc (lambda (hook) (add-hook hook (lambda () (setq fill-column my-fill-column)) ))
-      (append my-devel-mode-hook-list my-text-mode-hook-list))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "diff, patch, ediff, emerge")
-
-(setq diff-switches "-u")
-
-(setq ediff-diff-options "")
-(setq ediff-custom-diff-options "-u")
-(setq ediff-window-setup-function 'ediff-setup-windows-plain)
-(setq ediff-split-window-function 'split-window-vertically)
-
-(when window-system
-  (eval-after-load 'diff-mode
-    '(progn
-       (set-face-foreground 'diff-added-face "DarkGreen")
-       (set-face-foreground 'diff-removed-face "DarkRed")
-  )))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "indenting")
 
 (setq standard-indent 4)