# HG changeset patch # User Oleksandr Gavenko # Date 1228835250 -7200 # Node ID 25585e240b4a287c79493a71cc46153d25d90639 # Parent 5b5afd97d6f8c4e18646aaab7289c0075f71fd0a Move customization from .emacs (custom-set-variables) to .emacs-my. Remove duplication. diff -r 5b5afd97d6f8 -r 25585e240b4a .emacs --- a/.emacs Tue Dec 09 09:06:11 2008 +0200 +++ b/.emacs Tue Dec 09 17:07:30 2008 +0200 @@ -37,16 +37,9 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(Info-enable-edit t) - '(browse-url-browser-function (quote browse-url-default-windows-browser)) - '(ecb-tip-of-the-day nil) - '(eshell-command-interpreter-max-length 1024) '(pc-select-meta-moves-sexps t) '(read-quoted-char-radix 16) - '(sentence-end-double-space nil) - '(sql-password "") - '(view-read-only t) - '(w32-allow-system-shell t)) + ) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff -r 5b5afd97d6f8 -r 25585e240b4a .emacs-my --- a/.emacs-my Tue Dec 09 09:06:11 2008 +0200 +++ b/.emacs-my Tue Dec 09 17:07:30 2008 +0200 @@ -83,6 +83,8 @@ (setq column-number-mode t) (setq line-number-mode t) +(setq view-read-only t) + ;; ---------------------------------------------------------------------- ;; Switching, creating, selecting buffers. (iswitchb-mode 1) @@ -106,7 +108,6 @@ ;; ---------------------------------------------------------------------- ;; *Text* (setq default-major-mode 'text-mode) -(add-hook 'text-mode-hook 'turn-on-auto-fill) ;; ---------------------------------------------------------------------- ;; syntax highlighting @@ -124,7 +125,7 @@ (pc-selection-mode) ;; ---------------------------------------------------------------------- -;; Line +;; line (if window-system (progn (global-hl-line-mode t) @@ -133,7 +134,7 @@ ) ;; ---------------------------------------------------------------------- -;; Paren +;; paren, brace (show-paren-mode 1) ; Parenthesis matching via highlighting. ;; (setq show-paren-style 'expression) ; выделять все выражение в скобках @@ -371,10 +372,14 @@ ;; ====================================================================== ;; *auto-fill* -(setq-default fill-column 90) +(setq-default fill-column 78) + +(setq sentence-end-double-space nil) +(global-set-key (kbd "\e\ef") 'auto-fill-mode) + ;; Turn on auto-fill mode (add-hook 'html-mode-hook 'turn-on-auto-fill) -(global-set-key (kbd "\e\ef") 'auto-fill-mode) +(add-hook 'text-mode-hook 'turn-on-auto-fill) ;; ---------------------------------------------------------------------- ;; DESIRE @@ -434,7 +439,6 @@ ;; (desire 'psgml) ;; (desire 'sh-script) ;; (desire 'shell) -;;; (desire 'sql-mode) ;; (desire 'tex) ;; (desire 'w3) @@ -882,16 +886,11 @@ ;; ECB ;; ******************* -;; load ECB +(setq ecb-tip-of-the-day nil) ;; (add-to-list 'load-path "~/emacs/site/ecb-2.32") ;; (require 'ecb) -;; load ECB -;(add-to-list 'load-path "~/emacs/site/ecb-2.32") -;(require 'ecb) -;'(ecb-options-version "2.32") -;'(ecb-wget-setup (quote cons)) -;(global-set-key (kbd "\e\eE") 'ecb-activate) +;; (global-set-key (kbd "\e\eE") 'ecb-activate) ;; ====================================================================== ;; Printing @@ -931,6 +930,11 @@ ; "texify --tex-opt=--src --run-viewer --clean %s.tex" ; 'TeX-run-command nil t)))) +;; ---------------------------------------------------------------- +;; SQL + +;; (desire 'sql-mode) +(setq sql-password "") ;; ====================================================================== ;;