dot-emacs: comparison .emacs-my

equal deleted inserted replaced

-:ae5c2b9ab4bd
+:8e47e801be9d
 (message "term")
 (setq term-buffer-maximum-size (lsh 1 14))
 (my--eval-after-load term
-'(progn
+(defun my-term-send-delete-word-forward () (interactive) (term-send-raw-string "\ed"))
-(defun my-term-send-delete-word-forward () (interactive) (term-send-raw-string "\ed"))
+(defun my-term-send-delete-word-backward () (interactive) (term-send-raw-string "\e\C-h"))
-(defun my-term-send-delete-word-backward () (interactive) (term-send-raw-string "\e\C-h"))
+(define-key term-raw-map [C-delete] 'my-term-send-delete-word-forward)
-(define-key term-raw-map [C-delete] 'my-term-send-delete-word-forward)
+(define-key term-raw-map [C-backspace] 'my-term-send-delete-word-backward)
-(define-key term-raw-map [C-backspace] 'my-term-send-delete-word-backward)
+(defun my-term-send-forward-word () (interactive) (term-send-raw-string "\ef"))
-(defun my-term-send-forward-word () (interactive) (term-send-raw-string "\ef"))
+(defun my-term-send-backward-word () (interactive) (term-send-raw-string "\eb"))
-(defun my-term-send-backward-word () (interactive) (term-send-raw-string "\eb"))
+(define-key term-raw-map [C-left] 'my-term-send-backward-word)
-(define-key term-raw-map [C-left] 'my-term-send-backward-word)
+(define-key term-raw-map [C-right] 'my-term-send-forward-word)
-(define-key term-raw-map [C-right] 'my-term-send-forward-word)
+(defun my-term-send-m-right () (interactive) (term-send-raw-string "\e[1;3C"))
-(defun my-term-send-m-right () (interactive) (term-send-raw-string "\e[1;3C"))
+(defun my-term-send-m-left () (interactive) (term-send-raw-string "\e[1;3D"))
-(defun my-term-send-m-left () (interactive) (term-send-raw-string "\e[1;3D"))
+(define-key term-raw-map [M-right] 'my-term-send-m-right)
-(define-key term-raw-map [M-right] 'my-term-send-m-right)
+(define-key term-raw-map [M-left] 'my-term-send-m-left) )
-(define-key term-raw-map [M-left] 'my-term-send-m-left)
-))
 (defun my-term-mode-hook ()
 (goto-address-mode 1))
 (add-hook 'term-mode-hook #'my-term-mode-hook)
 ;; Do not set t because some grep do not has --color options.
 (setq grep-highlight-matches nil)
 (setq grep-use-null-device nil)
 (my--eval-after-load grep
-'(progn
+(add-to-list 'grep-find-ignored-directories "build" t)
-(add-to-list 'grep-find-ignored-directories "build" t)
+(add-to-list 'grep-find-ignored-directories "dist" t)
-(add-to-list 'grep-find-ignored-directories "dist" t)
+(add-to-list 'grep-find-ignored-directories "lib" t)
-(add-to-list 'grep-find-ignored-directories "lib" t)
+(add-to-list 'grep-find-ignored-directories "_build" t)
-(add-to-list 'grep-find-ignored-directories "_build" t)
+(add-to-list 'grep-find-ignored-directories "_dist" t)
-(add-to-list 'grep-find-ignored-directories "_dist" t)
+(add-to-list 'grep-find-ignored-directories "_lib" t)
-(add-to-list 'grep-find-ignored-directories "_lib" t)
+(when (boundp 'grep-find-ignored-files)
+(add-to-list 'grep-find-ignored-files "*TAGS")
-(when (boundp 'grep-find-ignored-files)
+(add-to-list 'grep-find-ignored-files "GPATH")) )
-(add-to-list 'grep-find-ignored-files "*TAGS")
-(add-to-list 'grep-find-ignored-files "GPATH")
-)
-))
 (global-set-key [f7] 'rgrep)
 (global-set-key [M-f7] 'rgrep)
 (defun lzgrep ()
 (interactive)
 (setq my-yas-root-directory "~/.emacs.d/my-yas")
 (setq yas/ignore-filenames-as-triggers t)
 ;; (my--eval-after-load yasnippet
-;;   '(progn
+;;   (cond
-;;      (cond
+;;    ((listp yas/root-directory) (add-to-list 'yas/root-directory my-yas-root-directory))
-;;       ((listp yas/root-directory) (add-to-list 'yas/root-directory my-yas-root-directory))
+;;    ((stringp yas/root-directory) (setq yas/root-directory (list my-yas-root-directory yas/root-directory)))
-;;       ((stringp yas/root-directory) (setq yas/root-directory (list my-yas-root-directory yas/root-directory)))
+;;    (t (error "I expect that yas/root-directory is a list of string")) )
-;;       (t (error "I expect that yas/root-directory is a list of string")) )
+;;   (mapc 'yas/load-directory yas/root-directory))
-;;      (mapc 'yas/load-directory yas/root-directory)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "dired")
 (setq-default save-place t)
 (message "image, png, svg")
 (when (fboundp 'auto-image-file-mode)
 (auto-image-file-mode 1))
 (my--eval-after-load image-file
-'(progn
+;; Exclude .svg image from supported image list, as Emacs doesn't come
-;; Exclude .svg image from supported image list, as Emacs doesn't come
+;; with SVG shared library.
-;; with SVG shared library.
+(setq image-file-name-extensions (remove "svg" image-file-name-extensions))
-(setq image-file-name-extensions (remove "svg" image-file-name-extensions))
+;; Re-initialize the image-file handler.
-;; Re-initialize the image-file handler.
+(auto-image-file-mode t) )
-(auto-image-file-mode t)
-))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "url")
 ;; http://tools.ietf.org/html/rfc3986
 ;; Maintaining the table of contents up-to-date.
 (add-hook 'rst-adjust-hook 'rst-toc-update)
 (unless window-system
 (my--eval-after-load rst
-'(progn
+(custom-set-faces
-(custom-set-faces
+'(rst-level-1-face ((t (:background "yellow"))) t)
-'(rst-level-1-face ((t (:background "yellow"))) t)
+'(rst-level-2-face ((t (:background "yellow"))) t)
-'(rst-level-2-face ((t (:background "yellow"))) t)
+'(rst-level-3-face ((t (:background "yellow"))) t)
-'(rst-level-3-face ((t (:background "yellow"))) t)
+'(rst-level-4-face ((t (:background "yellow"))) t)
-'(rst-level-4-face ((t (:background "yellow"))) t)
+'(rst-level-5-face ((t (:background "yellow"))) t)
-'(rst-level-5-face ((t (:background "yellow"))) t)
+'(rst-level-6face ((t (:background "yellow"))) t)
-'(rst-level-6face ((t (:background "yellow"))) t)
+) ) )
-) ) ) )
 ;; (add-hook 'rst-mode-hook #'abbrev-mode)
 ;; (remove-hook 'rst-mode-hook #'abbrev-mode)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;%l "latex --src-specials"
 ;%n line number  %p printcommand  %q "lpq"
 ;%r (TeX-style-check TeX-print-style)
 ;%s master-file-name without extention
 ;%v yap command view line
-;(my--eval-after-load "tex"
+;; (my--eval-after-load tex
-;  '(progn
+;;   (add-to-list 'TeX-command-list
-;     (add-to-list 'TeX-command-list
+;;                (list "->PS landscape for pdf"
-;         (list "->PS landscape for pdf"
+;;                      "dvips %d -N0 -Ppdf -G0 -T 297mm,210mm -o %f "
-;           "dvips %d -N0 -Ppdf -G0 -T 297mm,210mm -o %f "
+;;                      'TeX-run-command nil t))
-;           'TeX-run-command nil t))
+;;   (add-to-list 'TeX-command-list
-;     (add-to-list 'TeX-command-list
+;;                (list "All Texify run-viewer"
-;         (list "All Texify run-viewer"
+;;                      "texify --tex-opt=--src --run-viewer --clean %s.tex"
-;           "texify --tex-opt=--src --run-viewer --clean %s.tex"
+;;                      'TeX-run-command nil t)))
-;           'TeX-run-command nil t))))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "reftex")
 ;; Reftex is included with Emacs 21.1.
 "^`" "['(]")))
 ;; Add `my-fix-for-automake-info-lookup' entries to the end of doc-spec for
 ;; some modes.
 (my--eval-after-load info-look
-'(progn
+(mapc
-(mapc
+(lambda (mode)
-(lambda (mode)
+(let ( (doc-spec (info-lookup->doc-spec 'symbol mode)) )
-(let ( (doc-spec (info-lookup->doc-spec 'symbol mode)) )
+(mapc
-(mapc
+(lambda (doc-spec-item)
-(lambda (doc-spec-item)
+(setcdr (last doc-spec) (list doc-spec-item)))
-(setcdr (last doc-spec) (list doc-spec-item)))
+my-fix-for-automake-info-lookup)))
-my-fix-for-automake-info-lookup)))
+'(makefile-mode autoconf-mode))
-'(makefile-mode autoconf-mode))
+(info-lookup-maybe-add-help
-(info-lookup-maybe-add-help
+:mode 'makefile-gmake-mode
-:mode 'makefile-gmake-mode
+:other-modes '(makefile-mode)))
-:other-modes '(makefile-mode))
-))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "man, woman")
 ;; Assume that cygwin-mount already activated.
 (setq mail-aliases t)
 (require 'ecomplete)
 (setq message-mail-alias-type '(abbrev ecomplete))
 (my--eval-after-load message
-'(progn
+(require 'mailabbrev)
-(require 'mailabbrev)
+(define-key message-mode-map "\e\t" 'mail-abbrev-complete-alias))
-(define-key message-mode-map "\e\t" 'mail-abbrev-complete-alias)
-))
 (defun my-message-mode-hook ()
 (setq fill-column 78)
 (turn-on-auto-fill)
 (flyspell-mode 1))
 (defun my-kill-gnus ()
 "Kill Gnus when exiting Emacs."
 (let ( (gnus-interactive-exit nil) )
 (gnus-group-exit)
 ))
-(my--eval-after-load gnus '(add-hook 'kill-emacs-hook 'my-kill-gnus))
+(my--eval-after-load gnus
+(add-hook 'kill-emacs-hook 'my-kill-gnus))
 (my--eval-after-load gnus-art
-'(progn
+(setq gnus-visible-headers (concat gnus-visible-headers "\\|^Archived-At")))
-(setq gnus-visible-headers (concat gnus-visible-headers "\\|^Archived-At"))
-))
 ;; Store gnus specific files to '~/.gnus'.
 (setq
 gnus-directory "~/.gnus"
 gnus-agent-directory "~/.gnus/agent/"
 (defun my-w3m-view-url ()
 (interactive)
 (browse-url (w3m-anchor)))
 (my--eval-after-load w3m
-'(progn
+(define-key w3m-minor-mode-map (kbd "RET") #'my-w3m-view-url)
-(define-key w3m-minor-mode-map (kbd "RET") #'my-w3m-view-url)
+(define-key w3m-minor-mode-map (kbd "S-RET") #'w3m-safe-view-this-url)
-(define-key w3m-minor-mode-map (kbd "S-RET") #'w3m-safe-view-this-url)
+(define-key w3m-minor-mode-map (kbd "<left>") #'backward-char)
-(define-key w3m-minor-mode-map (kbd "<left>") #'backward-char)
+(define-key w3m-minor-mode-map (kbd "<right>") #'forward-char)
-(define-key w3m-minor-mode-map (kbd "<right>") #'forward-char)
+(define-key w3m-minor-mode-map (kbd "<up>") #'previous-line)
-(define-key w3m-minor-mode-map (kbd "<up>") #'previous-line)
+(define-key w3m-minor-mode-map (kbd "<down>") #'next-line))
-(define-key w3m-minor-mode-map (kbd "<down>") #'next-line)))
 (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
-(my--eval-after-load gnus '(progn (gnus-demon-add-handler 'gnus-demon-scan-news 10 t)))
+(my--eval-after-load gnus
+(gnus-demon-add-handler 'gnus-demon-scan-news 10 t))
 ;; Show prefix and 'To' field instead 'From' for my mails.
 (setq gnus-summary-to-prefix "==> ")
 (setq gnus-summary-newsgroup-prefix "==> ")
 (setq gnus-ignored-from-addresses (list (regexp-quote user-mail-address) (regexp-quote user-full-name)))
 (gnus-kill-file-mark (from -9999))
 ))
 ;; Increase the score for followups to a sent article.
 (my--eval-after-load gnus-score
-'(progn
+;; (add-hook 'message-sent-hook 'gnus-score-followup-article)
-;; (add-hook 'message-sent-hook 'gnus-score-followup-article)
+(add-hook 'message-sent-hook 'gnus-score-followup-thread))
-(add-hook 'message-sent-hook 'gnus-score-followup-thread)
-))
 (defvar my-gnus-summary-kill-same-subject-min-len 8
 "Minimal length of subject string to ignore this subject.")
 (defun my-gnus-summary-kill-same-subject (&optional unmark)
 "Add negative scores for all articles with same subject."
 (gnus-summary-score-entry
 "subject" subj
 's (- gnus-score-interactive-default-score) (current-time-string)))))
 (gnus-summary-kill-same-subject unmark))
 (my--eval-after-load gnus-sum
-'(define-key gnus-summary-mode-map (kbd "C-k") #'my-gnus-summary-kill-same-subject))
+(define-key gnus-summary-mode-map (kbd "C-k") #'my-gnus-summary-kill-same-subject))
 (defun my-gnus.mark-thread-as-read ()
 "Mark unmarked articles in current thread as read and move to
 next thread without selecting article."
 (interactive)
 (when (eq (gnus-summary-article-mark (gnus-summary-article-number)) gnus-unread-mark)
 (gnus-summary-mark-article (gnus-summary-article-number) gnus-del-mark))
 (when (or (not (gnus-summary-search-forward)) (eq (gnus-summary-thread-level) 0))
 (throw 'exit nil)) )))
 (my--eval-after-load gnus-sum
-'(define-key gnus-summary-mode-map (kbd "H-k") #'my-gnus.mark-thread-as-read))
+(define-key gnus-summary-mode-map (kbd "H-k") #'my-gnus.mark-thread-as-read))
 (defun my-gnus-thread-score-function (&rest scores)
 "If any followup have positive score assign greater available
 score to thread, else assign lesser available score."
 (let ( (max (apply 'max scores)) (min (apply 'min scores)) )
 (gnus-thread-total-score
 (gnus-id-to-thread (mail-header-id (gnus-summary-article-header)))))))
 ;; Especially highlight my message and replays to me.
 (my--eval-after-load gnus-sum
-'(progn
+(defface my-gnus-own-unread-face nil
-(defface my-gnus-own-unread-face nil
+"Use this face to display own postings in Summary Buffer")
-"Use this face to display own postings in Summary Buffer")
+(copy-face 'gnus-summary-high-unread-face 'my-gnus-own-unread-face)
-(copy-face 'gnus-summary-high-unread-face 'my-gnus-own-unread-face)
+(set-face-background 'my-gnus-own-unread-face "linen")
-(set-face-background 'my-gnus-own-unread-face "linen")
+(add-to-list 'gnus-summary-highlight
-(add-to-list 'gnus-summary-highlight
+'((and (> score 190) (eq mark gnus-unread-mark)) . my-gnus-own-unread-face))
-'((and (> score 190) (eq mark gnus-unread-mark)) . my-gnus-own-unread-face))
+(defface my-gnus-own-ancient-face nil
-(defface my-gnus-own-ancient-face nil
+"Use this face to display own postings in Summary Buffer")
-"Use this face to display own postings in Summary Buffer")
+(copy-face 'gnus-summary-high-ancient-face 'my-gnus-own-ancient-face)
-(copy-face 'gnus-summary-high-ancient-face 'my-gnus-own-ancient-face)
+(set-face-background 'my-gnus-own-ancient-face "linen")
-(set-face-background 'my-gnus-own-ancient-face "linen")
+(add-to-list 'gnus-summary-highlight
-(add-to-list 'gnus-summary-highlight
+'((and (> score 190) (eq mark gnus-ancient-mark)) . my-gnus-own-ancient-face))
-'((and (> score 190) (eq mark gnus-ancient-mark)) . my-gnus-own-ancient-face))
+(defface my-gnus-own-ticked-face nil
-(defface my-gnus-own-ticked-face nil
+"Use this face to display own postings in Summary Buffer")
-"Use this face to display own postings in Summary Buffer")
+(copy-face 'gnus-summary-high-ticked-face 'my-gnus-own-ticked-face)
-(copy-face 'gnus-summary-high-ticked-face 'my-gnus-own-ticked-face)
+(set-face-background 'my-gnus-own-ticked-face "linen")
-(set-face-background 'my-gnus-own-ticked-face "linen")
+(add-to-list 'gnus-summary-highlight
-(add-to-list 'gnus-summary-highlight
+'((and (> score 190) (or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark))) . my-gnus-own-ticked-face))
-'((and (> score 190) (or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark))) . my-gnus-own-ticked-face))
+(defface my-gnus-fup-face nil
-(defface my-gnus-fup-face nil
+"Use this face to display direct fups to my postings.")
-"Use this face to display direct fups to my postings.")
+(copy-face 'gnus-summary-high-unread-face 'my-gnus-fup-face)
-(copy-face 'gnus-summary-high-unread-face 'my-gnus-fup-face)
+(set-face-background 'my-gnus-fup-face "honeydew")
-(set-face-background 'my-gnus-fup-face "honeydew")
+(add-to-list 'gnus-summary-highlight
-(add-to-list 'gnus-summary-highlight
+'((and (<= 90 score) (<= score 110) (eq mark gnus-unread-mark)) . my-gnus-fup-face)) )
-'((and (<= 90 score) (<= score 110) (eq mark gnus-unread-mark)) . my-gnus-fup-face))
-))
 ;; (setq gnus-home-score-file
 ;;       ;; All groups that match the regexp `"\\.emacs"'
 ;;       '(("\\.emacs" "emacs.SCORE")
 ;;         ;; All the comp groups in one score file
 ;;         ("^comp" "comp.SCORE")))
 ;; Make C-Up, C-Down more like across paragraph moving.
 (my--eval-after-load gnus
-'(progn
+(define-key gnus-summary-mode-map [(meta up)] '(lambda() (interactive) (scroll-other-window -1)))
-(define-key gnus-summary-mode-map [(meta up)] '(lambda() (interactive) (scroll-other-window -1)))
+(define-key gnus-summary-mode-map [(meta down)] '(lambda() (interactive) (scroll-other-window 1)))
-(define-key gnus-summary-mode-map [(meta down)] '(lambda() (interactive) (scroll-other-window 1)))
+(define-key gnus-summary-mode-map [(control down)] 'gnus-summary-next-thread)
-(define-key gnus-summary-mode-map [(control down)] 'gnus-summary-next-thread)
+(define-key gnus-summary-mode-map [(control up)] 'gnus-summary-prev-thread))
-(define-key gnus-summary-mode-map [(control up)] 'gnus-summary-prev-thread)
-))
 ;; (setq imap-log t)
 ;; (setq mail-user-agent 'mh-e-user-agent)
 jabber-backlog-days 30
 jabber-alert-presence-message-function (lambda (who oldstatus newstatus statustext) nil)
 )
 (my--eval-after-load jabber
-'(progn
+;; Redefine standard binding for sending message form RET to C-RET.
-;; Redefine standard binding for sending message form RET to C-RET.
+(define-key jabber-chat-mode-map (kbd "RET") 'newline)
-(define-key jabber-chat-mode-map (kbd "RET") 'newline)
+(define-key jabber-chat-mode-map [C-return] 'jabber-chat-buffer-send)
-(define-key jabber-chat-mode-map [C-return] 'jabber-chat-buffer-send)
+;; fsm used in emacs jabber
-;; fsm used in emacs jabber
+(when (featurep 'fsm)
-(when (featurep 'fsm)
+(setq fsm-debug nil))               ; Disable *fsm-debug* buffer.
-(setq fsm-debug nil)                  ; Disable *fsm-debug* buffer.
+;; Handle Emacs exit.
-)
+(add-hook 'kill-emacs-hook 'jabber-disconnect))
-;; Handle Emacs exit.
-(add-hook 'kill-emacs-hook 'jabber-disconnect)
-))
 (setq my-chat-prompt "[%t] %n>\n")
 (setq
 jabber-chat-foreign-prompt-format my-chat-prompt
 jabber-chat-local-prompt-format my-chat-prompt
 jabber-groupchat-prompt-format my-chat-prompt
-jabber-muc-private-foreign-prompt-format "[%t] %g/%n>\n"
+jabber-muc-private-foreign-prompt-format "[%t] %g/%n>\n")
-)
 (let ( (mgs-list '("Я тутачки, а где Вы меня ожидали?"
 "Software Development == Church Development. Step 1. Build it. Step 2. Pray."
 "Great books aren't written – they're rewritten."
 "А любит Б, Б любит С, что делать A? Найти другую Б!")) )
 (setq
 erc-log-channels-directory "~/.emacs.d/.irc"
 erc-log-file-coding-system 'utf-8-unix)
 (my--eval-after-load erc
-(lambda ()
+(require 'erc-log)
-(require 'erc-log)
+(mkdir erc-log-channels-directory t))
-(mkdir erc-log-channels-directory t)))
 ;; Kill buffers for channels after /part
 ;; (setq erc-kill-buffer-on-part t)
 ;; Kill buffers for private queries after quitting the server
 ;; (setq erc-kill-queries-on-quit t)
 ;; (defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1))
 ;; (add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on)
 (when window-system
 (my--eval-after-load diff-mode
-'(progn
+(set-face-foreground 'diff-added-face "DarkGreen")
-(set-face-foreground 'diff-added-face "DarkGreen")
+(set-face-foreground 'diff-removed-face "DarkRed")
-(set-face-foreground 'diff-removed-face "DarkRed")
+(set-face-background 'diff-refine-change "LightBlue1")))
-(set-face-background 'diff-refine-change "LightBlue1")
-)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil")
 ;; `-b' switch to ignore changes in whitespaces.
 ;; Show error in EN locale to easy search how fix problem in docs and Internet.
 ;; (setq compilation-environment '("LANG=C"))
 (my--eval-after-load compile
-'(progn
+;; My funny error messages.
-;; My funny error messages.
+(add-to-list 'compilation-error-regexp-alist '("^\\( +\\[csc\\] \\|\\)\\(.*\\)(\\([0-9]*\\),\\([0-9]*\\)):" 2 3 4))
-(add-to-list 'compilation-error-regexp-alist '("^\\( +\\[csc\\] \\|\\)\\(.*\\)(\\([0-9]*\\),\\([0-9]*\\)):" 2 3 4))
+(add-to-list 'compilation-error-regexp-alist '("^ *\\(.*\\)(\\([0-9]*\\)) +:" 1 2))
-(add-to-list 'compilation-error-regexp-alist '("^ *\\(.*\\)(\\([0-9]*\\)) +:" 1 2))
+(add-to-list 'compilation-error-regexp-alist '("^\"?\\([^\"]*\\)\"?,\\([0-9]*\\) .*\\[.*\\]: " 1 2)) ; KEIL compiler
-(add-to-list 'compilation-error-regexp-alist '("^\"?\\([^\"]*\\)\"?,\\([0-9]*\\) .*\\[.*\\]: " 1 2)) ; KEIL compiler
+(add-to-list 'compilation-error-regexp-alist-alist '(maven "\\[ERROR\\] \\(.*\\.java\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\]" 1 2 3))
-(add-to-list 'compilation-error-regexp-alist-alist '(maven "\\[ERROR\\] \\(.*\\.java\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\]" 1 2 3))
+(add-to-list 'compilation-error-regexp-alist 'maven)
-(add-to-list 'compilation-error-regexp-alist 'maven)
+(when (boundp 'compilation-mode-font-lock-keywords)
-(when (boundp 'compilation-mode-font-lock-keywords)
+(add-to-list 'compilation-mode-font-lock-keywords '("\\(/[Oo][Uu][Tt]:[^[:blank:]]+\\)" . 1))
-(add-to-list 'compilation-mode-font-lock-keywords '("\\(/[Oo][Uu][Tt]:[^[:blank:]]+\\)" . 1))
+(add-to-list 'compilation-mode-font-lock-keywords '("[[:blank:]]\\(/F[oe][^[:blank:]]+\\)" . 1))))
-(add-to-list 'compilation-mode-font-lock-keywords '("[[:blank:]]\\(/F[oe][^[:blank:]]+\\)" . 1))
-)
-))
 (ignore-errors
 (require 'ansi-color)
 (defun my-colorize-compilation-buffer ()
 (when (eq major-mode 'compilation-mode)
 (list (read-input "Type string: " nil 'my-comint-send-hist-list))
 )
 (comint-send-string (get-buffer-process (current-buffer)) (concat string "\n"))
 )
 (my--eval-after-load compile
-'(progn
+(define-key compilation-mode-map [C-return] 'my-comint-send-string))
-(define-key compilation-mode-map [C-return] 'my-comint-send-string)
-))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "scons")
 (add-to-list 'auto-mode-alist '("SConstruct\\'" . python-mode))
 (message "python")
 (setq python-indent 4)
 (my--eval-after-load python-mode
-'(when (and (boundp 'py-version) (equal py-version "5.1.0"))
+(when (and (boundp 'py-version) (equal py-version "5.1.0"))
 (setq-default py-which-shell py-python-command)
 ;; (py-toggle-shells 'cpython)
 ))
 (my--eval-after-load python
-'(define-key inferior-python-mode-map "\C-c\C-f" 'python-describe-symbol))
+(define-key inferior-python-mode-map "\C-c\C-f" 'python-describe-symbol))
 ;; Enable "M-/", "C-c g", "C-c d", "C-c f" shortcuts.
 (setq ropemacs-enable-shortcuts t)
 (ignore-errors
 ;; (require 'pymacs)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "SML, Standard ML")
 (my--eval-after-load sml
-'(progn
+(define-key sml-mode-map (kbd "C-c C-p") 'sml-send-function))
-(define-key sml-mode-map (kbd "C-c C-p") 'sml-send-function)
-))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "javascript, js")
 (if (>= emacs-major-version 23)
 (add-to-list 'auto-mode-alist '("\\.js$" . js-mode))
 (add-to-list 'auto-mode-alist '("\\.js$" . javascript-generic-mode))
 )
-(my--eval-after-load js '(modify-syntax-entry ?$ "w" js-mode-syntax-table))
+(my--eval-after-load js
+(modify-syntax-entry ?$ "w" js-mode-syntax-table))
 (setq js-indent-level 4)
 ;; js-curly-indent-offset, js-expr-indent-offset, js-paren-indent-offset, 	js-square-indent-offset, js-switch-indent-offset
 ;; BUG: all single char comments do not stop highlighting on end of line but
 (add-to-list 'auto-mode-alist '("\.pom\\'" . nxml-mode))
 (add-to-list 'auto-mode-alist '("\.xsd\\'" . nxml-mode))
 (add-to-list 'auto-mode-alist '("\.rng\\'" . nxml-mode))
 (add-to-list 'auto-mode-alist '("\.xul\\'" . nxml-mode))
-(my--eval-after-load nxml-mode '(define-key nxml-mode-map [C-return] 'nxml-complete))
+(my--eval-after-load nxml-mode
+(define-key nxml-mode-map [C-return] 'nxml-complete))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "relax ng, rng")
-(my--eval-after-load rng-loc '(add-to-list 'rng-schema-locating-files "~/.emacs.d/rnc/schemas.xml"))
+(my--eval-after-load rng-loc
+(add-to-list 'rng-schema-locating-files "~/.emacs.d/rnc/schemas.xml"))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "web-mode")
 (setq web-mode-markup-indent-offset 2
 ))
 )
 (setq sgml-set-face t)                  ; for highlighting in sgml
 (my--eval-after-load sgml-mode
-'(progn
+(unless (featurep 'psgml)
-(unless (featurep 'psgml)
+(setq html-tag-alist
-(setq html-tag-alist
+(cons
-(cons
+my-html-template
-my-html-template
+(my-filter
-(my-filter
+(lambda (item) (not (equal (car item) "html")))
-(lambda (item) (not (equal (car item) "html")))
+html-tag-alist)))
-html-tag-alist)))
+(add-to-list 'html-tag-alist '("script" (\n) ("type" "text/javascript") ))
-(add-to-list 'html-tag-alist '("script" (\n) ("type" "text/javascript") ))
+(add-to-list 'html-tag-alist '("style" (\n) ("type" "text/css") )) ))
-(add-to-list 'html-tag-alist '("style" (\n) ("type" "text/css") ))
-)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "jsp")
 (define-derived-mode jsp-mode html-mode "JSP"
 ;; Too many output, so commented:
 ;; isar-display:show-consts t
 )
 (my--eval-after-load proof
-'(progn
+;; (proof-maths-menu-toggle 1)
-;; (proof-maths-menu-toggle 1)
+;; (unicode-tokens-mode 1)
-;; (unicode-tokens-mode 1)
+;; (proof-imenu-toggle 1)
-;; (proof-imenu-toggle 1)
+)
-))
 (my--eval-after-load isar
-'(progn
+(define-key isar-mode-map (kbd "C-c C-m") 'proof-goto-point))
-(define-key isar-mode-map (kbd "C-c C-m") 'proof-goto-point)
-))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "printing")
 (setq ps-paper-type 'a4)

changeset 1278	8e47e801be9d
parent 1277	ae5c2b9ab4bd
child 1279	4738798c1eda