# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1245050591 -10800
# Node ID e17e788f06c754492f8ba383dc022e7928c724fe
# Parent  1117ea113161ad876698b3d1eb3e4201e1aae290# Parent  318e69b9be869e152fe72a2442b27617cf1f78e0
Automated merge with file:///d:\srv\hg\dot-emacs

diff -r 318e69b9be86 -r e17e788f06c7 .emacs-my
--- a/.emacs-my	Fri Apr 03 12:18:48 2009 +0200
+++ b/.emacs-my	Mon Jun 15 10:23:11 2009 +0300
@@ -27,10 +27,9 @@
 ;; Настройка внешнего вида редактора.
 ;; View.
 
-; remove menu on nil
 (menu-bar-mode -1)                     ; 1/-1
-; remove button on nil
 (tool-bar-mode -1)                     ; 1/-1
+(tooltip-mode -1)                      ; 1/-1
 
 (if window-system
     ;; Для X-window и Win
@@ -201,6 +200,7 @@
 (global-set-key [f2]    'save-buffer)
 ;; (global-set-key [xxx]    'ediff-buffers)
 (global-set-key [f4]    'ispell-buffer)
+(global-set-key [S-f6]  'rename-buffer)
 (global-set-key [f8]    'kill-this-buffer)
 (global-set-key [M-f4]  'save-buffers-kill-emacs)
 (global-set-key [f6]    'toggle-truncate-lines)
@@ -817,37 +817,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.