# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1240046617 -10800
# Node ID 2c870487701346448a4c8995a57f6998125a1c9d
# Parent  3f6b8e1a3656f407536678cd1975ee2da53d931d# Parent  bd2400a182950a1d2cb2b5080e7626366b25b992
Automated merge with file:///srv/hg/dot-emacs

diff -r 3f6b8e1a3656 -r 2c8704877013 .emacs-my
--- a/.emacs-my	Mon Mar 30 11:15:19 2009 +0300
+++ b/.emacs-my	Sat Apr 18 12:23:37 2009 +0300
@@ -813,37 +813,50 @@
 (setq c-echo-syntactic-information-p t)
 
 (defconst my-c-style
-  '((c-tab-always-indent        . t)
+  '((c-tab-always-indent . t)
     (c-comment-only-line-offset . 4)
-    (c-hanging-braces-alist     . ((substatement-open after)
-                                   (brace-list-open)))
-    (c-hanging-colons-alist     . ((member-init-intro before)
-                                   (inher-intro)
-                                   (case-label after)
-                                   (label after)
-                                   (access-label after)))
-    (c-cleanup-list             . (scope-operator
-                                   empty-defun-braces
-                                   defun-close-semi))
-    (c-offsets-alist            . ((arglist-intro . ++)
-                                   (arglist-close . c-lineup-arglist)
-                                   (arglist-cont-nonempty . ++)
-                                   (statement-block-intro . +)
-                                   (inline-open . 0)
-                                   (inexpr-class . 0)
-                                   (statement-cont . ++)
-                                   (label . 0)
-                                   (substatement-open . 0)
-                                   (case-label        . 0)
-                                   (block-open        . 0)
-                                   (comment-intro     . 0)
-                                   (knr-argdecl-intro . -)))
+    (c-hanging-braces-alist
+     . (
+        (brace-list-open)
+        (substatement-open after)
+        ))
+    (c-hanging-colons-alist
+     . (
+        (access-label after)
+        (case-label after)
+        (inher-intro)
+        (label after)
+        (member-init-intro before)
+        ))
+    (c-cleanup-list
+     . (
+        defun-close-semi
+        empty-defun-braces
+        scope-operator
+        ))
+    (c-offsets-alist
+     . (
+        (arglist-close . c-lineup-arglist)
+        (arglist-cont-nonempty . ++)
+        (arglist-intro . ++)
+        (block-open . 0)
+        (case-label . 0)
+        (comment-intro . 0)
+        (func-decl-cont . ++)
+        (inexpr-class . 0)
+        (inline-open . 0)
+        (knr-argdecl-intro . -)
+        (label . 0)
+        (statement-block-intro . +)
+        (statement-cont . ++)
+        (substatement-open . 0)
+        ))
     (c-echo-syntactic-information-p . t))
   "My C Programming Style")
 
 ;; (objc-mode . "my-mode") (c++-mode . "cc-mode")
-(add-hook 'c-initialization-hook (lambda ()
-                                   (c-add-style "my" my-c-style t)))
+(add-hook 'c-mode-common-hook
+          (lambda () (c-add-style "my" my-c-style t)))
 (setq c-default-style '((java-mode . "my") (c-mode . "my") (csharp-mode . "my") (other . "my")))
 
 ;; Customizations for all modes in CC Mode.