equal
deleted
inserted
replaced
100 (lambda (symb) (intern (concat (symbol-name symb) "-map"))) |
100 (lambda (symb) (intern (concat (symbol-name symb) "-map"))) |
101 ) |
101 ) |
102 |
102 |
103 (defvar my-devel-mode-list |
103 (defvar my-devel-mode-list |
104 '( |
104 '( |
105 rst-mode outline-mode |
|
106 sh-mode script-mode |
105 sh-mode script-mode |
107 c-mode c++-mode java-mode js-mode |
106 c-mode c++-mode java-mode js-mode |
108 python-mode |
107 python-mode |
109 lisp-mode |
108 lisp-mode |
110 emacs-lisp-mode |
109 emacs-lisp-mode |
1003 (defface my-contrasty-face |
1002 (defface my-contrasty-face |
1004 '((t :background "pink" :foreground "red" :weight bold)) |
1003 '((t :background "pink" :foreground "red" :weight bold)) |
1005 "Font for showing conflicts." |
1004 "Font for showing conflicts." |
1006 :group 'basic-faces) |
1005 :group 'basic-faces) |
1007 |
1006 |
1008 (dolist (mode my-devel-mode-list) |
1007 (dolist (mode (append my-devel-mode-list my-text-mode-list)) |
1009 (font-lock-add-keywords |
1008 (font-lock-add-keywords |
1010 mode |
1009 mode |
1011 `( |
1010 `( |
1012 ("\t+" 0 'my-tab-face t) |
1011 ("\t+" 0 'my-tab-face t) |
1013 ( ,(concat "\\<\\(" (regexp-opt '("TODO" "FIX" "FIXME" "HACK" "XXX")) ":?\\)\\>") 1 'font-lock-warning-face t) |
1012 ( ,(concat "\\<\\(" (regexp-opt '("TODO" "FIX" "FIXME" "HACK" "XXX")) ":?\\)\\>") 1 'font-lock-warning-face t) |
1222 (setq-default comment-style (quote indent)) |
1221 (setq-default comment-style (quote indent)) |
1223 (setq-default comment-column 44) |
1222 (setq-default comment-column 44) |
1224 (setq-default comment-fill-column my-fill-column) |
1223 (setq-default comment-fill-column my-fill-column) |
1225 |
1224 |
1226 (mapc (lambda (hook) (add-hook hook (lambda () (setq fill-column my-fill-column)) )) |
1225 (mapc (lambda (hook) (add-hook hook (lambda () (setq fill-column my-fill-column)) )) |
1227 my-devel-mode-hook-list) |
1226 (append my-devel-mode-hook-list my-text-mode-hook-list)) |
1228 |
1227 |
1229 ;;; ---------------------------------------------------------------- |
1228 ;;; ---------------------------------------------------------------- |
1230 (message "diff, patch, ediff, emerge") |
1229 (message "diff, patch, ediff, emerge") |
1231 |
1230 |
1232 (setq diff-switches "-u") |
1231 (setq diff-switches "-u") |