equal
deleted
inserted
replaced
15 ;; Shut off message buffer by setting nil. |
15 ;; Shut off message buffer by setting nil. |
16 (setq message-log-max 512) |
16 (setq message-log-max 512) |
17 |
17 |
18 ;; Set the debug option to enable a backtrace when a problem occurs. |
18 ;; Set the debug option to enable a backtrace when a problem occurs. |
19 (setq debug-on-error nil) ; t/nil |
19 (setq debug-on-error nil) ; t/nil |
|
20 |
|
21 ;; ---------------------------------------------------------------------- |
|
22 ;; mode groups |
|
23 |
|
24 (defvar my-devel-mode-list |
|
25 '(sh-mode script-mode java-mode c-mode |
|
26 lisp-mode makefile-mode makefile-gmake-mode python-mode) |
|
27 "List of development modes.") |
|
28 |
|
29 (defvar my-devel-mode-hook-list |
|
30 '(sh-mode-hook script-mode-hook java-mode-hook c-mode-hook |
|
31 lisp-mode-hook makefile-mode-hook makefile-gmake-mode-hook python-mode-hook) |
|
32 "List of development mode hooks.") |
|
33 |
|
34 (defvar my-text-mode-list |
|
35 '(outline-mode text-mode) |
|
36 "List of text modes.") |
|
37 |
|
38 (defvar my-text-mode-hook-list |
|
39 '(outline-mode-hook text-mode-hook) |
|
40 "List of text mode hooks.") |
20 |
41 |
21 ;; ====================================================================== |
42 ;; ====================================================================== |
22 ;; appearance. |
43 ;; appearance. |
23 |
44 |
24 (menu-bar-mode -1) |
45 (menu-bar-mode -1) |
111 ;; scrolling. |
132 ;; scrolling. |
112 |
133 |
113 (setq-default |
134 (setq-default |
114 scroll-step 1 |
135 scroll-step 1 |
115 scroll-conservatively 100 |
136 scroll-conservatively 100 |
116 ;; При перемещении точка останавливается на расстоянии i строк к границе фрейма. |
|
117 scroll-margin 2 |
|
118 scroll-preserve-screen-position t |
137 scroll-preserve-screen-position t |
119 ) |
138 ) |
120 |
139 |
|
140 ;; Set margin only for desired modes! Do not frustrate calendar any more. |
|
141 (make-variable-buffer-local 'scroll-margin) |
|
142 (mapc (lambda (hook) (add-hook hook (lambda nil (setq scroll-margin 4)))) |
|
143 (delete-dups (append my-text-mode-hook-list my-devel-mode-hook-list |
|
144 '(recentf-mode-hook))) ) |
|
145 |
121 ;; ---------------------------------------------------------------------- |
146 ;; ---------------------------------------------------------------------- |
122 ;; searching. |
147 ;; searching. |
123 |
148 |
124 (setq case-fold-search t) |
149 (setq case-fold-search t) |
125 |
150 |
127 (setq search-highlight t) ; highlight incremental search |
152 (setq search-highlight t) ; highlight incremental search |
128 |
153 |
129 ;; ---------------------------------------------------------------------- |
154 ;; ---------------------------------------------------------------------- |
130 ;; *Occur* |
155 ;; *Occur* |
131 (global-set-key [f7] 'occur) ; Key binding as in mc |
156 (global-set-key [f7] 'occur) ; Key binding as in mc |
132 |
|
133 ;; ---------------------------------------------------------------------- |
|
134 ;; *Text* |
|
135 (setq default-major-mode 'text-mode) |
|
136 |
157 |
137 ;; ---------------------------------------------------------------------- |
158 ;; ---------------------------------------------------------------------- |
138 ;; syntax highlighting. |
159 ;; syntax highlighting. |
139 |
160 |
140 (setq font-lock-maximum-decoration t) |
161 (setq font-lock-maximum-decoration t) |
649 |
670 |
650 (defface my-conflict-face |
671 (defface my-conflict-face |
651 '((t :background "pink" :foreground "red" :weight bold)) |
672 '((t :background "pink" :foreground "red" :weight bold)) |
652 "Font for showing conflicts." |
673 "Font for showing conflicts." |
653 :group 'basic-faces) |
674 :group 'basic-faces) |
654 |
|
655 (defvar my-devel-mode-list |
|
656 '(sh-mode script-mode java-mode c-mode outline-mode text-mode |
|
657 lisp-mode makefile-mode makefile-gmake-mode python-mode) |
|
658 "List of development modes." ) |
|
659 |
675 |
660 (add-hook 'font-lock-mode-hook (function (lambda () |
676 (add-hook 'font-lock-mode-hook (function (lambda () |
661 (when (member major-mode my-devel-mode-list) |
677 (when (member major-mode my-devel-mode-list) |
662 (font-lock-add-keywords nil |
678 (font-lock-add-keywords nil |
663 '( |
679 '( |