equal
deleted
inserted
replaced
71 |
71 |
72 ;; (desktop-load-default) |
72 ;; (desktop-load-default) |
73 ;; (desktop-read) |
73 ;; (desktop-read) |
74 |
74 |
75 ;; ====================================================================== |
75 ;; ====================================================================== |
76 ;; Standart settings |
76 ;; standart/general settings |
77 |
77 |
78 (setq kill-whole-line t) |
78 (setq kill-whole-line t) |
79 |
79 |
80 ;; show column & line numbers in status bar |
80 ;; show column & line numbers in status bar |
81 (setq column-number-mode t) |
81 (setq column-number-mode t) |
85 |
85 |
86 (setq frame-title-format "Emacs - %b") |
86 (setq frame-title-format "Emacs - %b") |
87 |
87 |
88 ;; Always end a file with a newline. |
88 ;; Always end a file with a newline. |
89 ;; (setq require-final-newline t) |
89 ;; (setq require-final-newline t) |
|
90 |
|
91 (setq read-quoted-char-radix 16) |
90 |
92 |
91 ;; ---------------------------------------------------------------------- |
93 ;; ---------------------------------------------------------------------- |
92 ;; Switching, creating, selecting buffers. |
94 ;; Switching, creating, selecting buffers. |
93 (iswitchb-mode 1) |
95 (iswitchb-mode 1) |
94 (setq iswitchb-buffer-ignore nil) |
96 (setq iswitchb-buffer-ignore nil) |
748 (modify-coding-system-alist 'process "svn" '(cp866-dos . cp1251-dos)) |
750 (modify-coding-system-alist 'process "svn" '(cp866-dos . cp1251-dos)) |
749 )) |
751 )) |
750 |
752 |
751 ;; (setq-default vc-svn-register-switches "--encoding cp1251") |
753 ;; (setq-default vc-svn-register-switches "--encoding cp1251") |
752 (setq-default vc-svn-register-switches nil) |
754 (setq-default vc-svn-register-switches nil) |
753 |
|
754 (setq my-svn-dir (concat my-el-dir "/svn")) |
|
755 (if (file-exists-p my-svn-dir) |
|
756 (progn |
|
757 (add-to-list 'load-path my-svn-dir) |
|
758 (require 'vc-svn) |
|
759 ) |
|
760 ) |
|
761 |
|
762 (if (file-exists-p (concat my-el-dir "/mercurial.el")) |
|
763 (require 'mercurial) |
|
764 ) |
|
765 |
755 |
766 (if window-system |
756 (if window-system |
767 (progn |
757 (progn |
768 (custom-set-variables |
758 (custom-set-variables |
769 '(vc-annotate-very-old-color "#0b5b20") |
759 '(vc-annotate-very-old-color "#0b5b20") |
825 ;; TAB (tab settings) |
815 ;; TAB (tab settings) |
826 (setq-default tab-width 4) |
816 (setq-default tab-width 4) |
827 (setq-default indent-tabs-mode nil) ; t - будут вставляться \t |
817 (setq-default indent-tabs-mode nil) ; t - будут вставляться \t |
828 (setq tab-always-indent t) |
818 (setq tab-always-indent t) |
829 (setq c-tab-always-indent t) |
819 (setq c-tab-always-indent t) |
830 (let ( (line-width 400) ) |
820 (let (i (line-width 200)) |
831 (setq i (+ (/ line-width 4) 1)) |
821 (setq i (* (/ line-width tab-width) tab-width)) |
832 (setq tab-stop-list nil) |
822 (setq tab-stop-list nil) |
833 (while (> (setq i (- i 1)) 0) |
823 (while (>= (setq i (- i tab-width)) 0) |
834 (setq tab-stop-list (cons (* i 4) tab-stop-list)))) |
824 (setq tab-stop-list (cons i tab-stop-list)))) |
835 |
825 |
836 ;; ---------------------------------------------------------------------- |
826 ;; ---------------------------------------------------------------------- |
837 ;; Diff. |
827 ;; Diff. |
838 (setq ediff-diff-options "") |
828 (setq ediff-diff-options "") |
839 |
829 |