# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1240048134 -10800
# Node ID 25f15a0fdb2121993e177af8c24582ea08d61f02
# Parent  a071b60e4339cced4ac593b79e9ee0b14621d7bb# Parent  2c870487701346448a4c8995a57f6998125a1c9d
merge

diff -r a071b60e4339 -r 25f15a0fdb21 .emacs-my
--- a/.emacs-my	Sat Apr 18 12:44:07 2009 +0300
+++ b/.emacs-my	Sat Apr 18 12:48:54 2009 +0300
@@ -88,6 +88,8 @@
 
 (setq view-read-only t)
 
+(setq frame-title-format "Emacs - %b")
+
 ;; ----------------------------------------------------------------------
 ;; Switching, creating, selecting buffers.
 (iswitchb-mode 1)
@@ -112,12 +114,19 @@
 ;; ----------------------------------------------------------------------
 ;; Scrolling
 
-;; гладкий скроллинг с полями
-;; (setq-default scroll-conservatively 70)
-;; (setq-default scroll-preserve-screen-position 't)
-;; при перемещении точка останавливается на расстоянии i строк к границе фрейма,
-;; далее скроллиться текст
-;; (setq scroll-margin 2)
+(setq-default
+ ;; 2 - default value
+ next-screen-context-lines 2
+ ;; The number of lines to try scrolling a window by when point moves out.
+ scroll-step 1
+ scroll-conservatively 100
+ ;; при перемещении точка останавливается на расстоянии i строк к границе фрейма,
+ scroll-margin 2
+ scroll-preserve-screen-position t
+ )
+
+;; ----------------------------------------------------------------------
+;; fringe-mode
 
 ;; ----------------------------------------------------------------------
 ;; *Text*
@@ -201,7 +210,6 @@
 (global-set-key [f7] 'occur)            ; Key binding as in mc
 
 ;; frames, windows manipulation, switch buffers
-(global-set-key [C-tab]      'other-window)
 (global-set-key [?\C-x right] 'next-buffer)
 (global-set-key [?\C-x left]  'previous-buffer)
 
@@ -806,37 +814,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.