diff -r ae5c2b9ab4bd -r 8e47e801be9d .emacs-my
--- a/.emacs-my	Wed Apr 01 14:53:04 2015 +0300
+++ b/.emacs-my	Thu Apr 02 19:51:29 2015 +0300
@@ -498,20 +498,18 @@
 (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-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-backspace] 'my-term-send-delete-word-backward)
-    (defun my-term-send-forward-word () (interactive) (term-send-raw-string "\ef"))
-    (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-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-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-left] 'my-term-send-m-left)
-    ))
+  (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"))
+  (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)
+  (defun my-term-send-forward-word () (interactive) (term-send-raw-string "\ef"))
+  (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-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-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-left] 'my-term-send-m-left) )
 
 (defun my-term-mode-hook ()
   (goto-address-mode 1))
@@ -687,19 +685,16 @@
 (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 "dist" 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 "_dist" t)
-     (add-to-list 'grep-find-ignored-directories "_lib" t)
-
-     (when (boundp 'grep-find-ignored-files)
-       (add-to-list 'grep-find-ignored-files "*TAGS")
-       (add-to-list 'grep-find-ignored-files "GPATH")
-       )
-     ))
+  (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 "lib" 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 "_lib" t)
+  (when (boundp 'grep-find-ignored-files)
+    (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)
 
@@ -1006,12 +1001,11 @@
 (setq yas/ignore-filenames-as-triggers t)
 
 ;; (my--eval-after-load yasnippet
-;;   '(progn
-;;      (cond
-;;       ((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)))
-;;       (t (error "I expect that yas/root-directory is a list of string")) )
-;;      (mapc 'yas/load-directory yas/root-directory)))
+;;   (cond
+;;    ((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)))
+;;    (t (error "I expect that yas/root-directory is a list of string")) )
+;;   (mapc 'yas/load-directory yas/root-directory))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "dired")
@@ -1122,13 +1116,11 @@
 (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
-     ;; with SVG shared library.
-     (setq image-file-name-extensions (remove "svg" image-file-name-extensions))
-     ;; Re-initialize the image-file handler.
-     (auto-image-file-mode t)
-     ))
+  ;; Exclude .svg image from supported image list, as Emacs doesn't come
+  ;; with SVG shared library.
+  (setq image-file-name-extensions (remove "svg" image-file-name-extensions))
+  ;; Re-initialize the image-file handler.
+  (auto-image-file-mode t) )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "url")
@@ -1288,15 +1280,14 @@
 
 (unless window-system
   (my--eval-after-load rst
-    '(progn
-       (custom-set-faces
-        '(rst-level-1-face ((t (:background "yellow"))) t)
-        '(rst-level-2-face ((t (:background "yellow"))) t)
-        '(rst-level-3-face ((t (:background "yellow"))) t)
-        '(rst-level-4-face ((t (:background "yellow"))) t)
-        '(rst-level-5-face ((t (:background "yellow"))) t)
-        '(rst-level-6face ((t (:background "yellow"))) t)
-        ) ) ) )
+    (custom-set-faces
+     '(rst-level-1-face ((t (:background "yellow"))) t)
+     '(rst-level-2-face ((t (:background "yellow"))) t)
+     '(rst-level-3-face ((t (:background "yellow"))) t)
+     '(rst-level-4-face ((t (:background "yellow"))) t)
+     '(rst-level-5-face ((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)
@@ -1332,16 +1323,15 @@
         ;%r (TeX-style-check TeX-print-style)
         ;%s master-file-name without extention
         ;%v yap command view line
-;(my--eval-after-load "tex"
-;  '(progn
-;     (add-to-list 'TeX-command-list
-;         (list "->PS landscape for pdf"
-;           "dvips %d -N0 -Ppdf -G0 -T 297mm,210mm -o %f "
-;           'TeX-run-command nil t))
-;     (add-to-list 'TeX-command-list
-;         (list "All Texify run-viewer"
-;           "texify --tex-opt=--src --run-viewer --clean %s.tex"
-;           'TeX-run-command nil t))))
+;; (my--eval-after-load tex
+;;   (add-to-list 'TeX-command-list
+;;                (list "->PS landscape for pdf"
+;;                      "dvips %d -N0 -Ppdf -G0 -T 297mm,210mm -o %f "
+;;                      'TeX-run-command nil t))
+;;   (add-to-list 'TeX-command-list
+;;                (list "All Texify run-viewer"
+;;                      "texify --tex-opt=--src --run-viewer --clean %s.tex"
+;;                      'TeX-run-command nil t)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "reftex")
@@ -1393,19 +1383,17 @@
 ;; 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
-      (lambda (mode)
-        (let ( (doc-spec (info-lookup->doc-spec 'symbol mode)) )
-          (mapc
-           (lambda (doc-spec-item)
-             (setcdr (last doc-spec) (list doc-spec-item)))
-           my-fix-for-automake-info-lookup)))
-      '(makefile-mode autoconf-mode))
-     (info-lookup-maybe-add-help
-      :mode 'makefile-gmake-mode
-      :other-modes '(makefile-mode))
-     ))
+  (mapc
+   (lambda (mode)
+     (let ( (doc-spec (info-lookup->doc-spec 'symbol mode)) )
+       (mapc
+        (lambda (doc-spec-item)
+          (setcdr (last doc-spec) (list doc-spec-item)))
+        my-fix-for-automake-info-lookup)))
+   '(makefile-mode autoconf-mode))
+  (info-lookup-maybe-add-help
+   :mode 'makefile-gmake-mode
+   :other-modes '(makefile-mode)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "man, woman")
@@ -1645,10 +1633,8 @@
 (setq message-mail-alias-type '(abbrev ecomplete))
 
 (my--eval-after-load message
-  '(progn
-     (require 'mailabbrev)
-     (define-key message-mode-map "\e\t" 'mail-abbrev-complete-alias)
-     ))
+  (require 'mailabbrev)
+  (define-key message-mode-map "\e\t" 'mail-abbrev-complete-alias))
 
 (defun my-message-mode-hook ()
   (setq fill-column 78)
@@ -1725,12 +1711,11 @@
   (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
@@ -1804,17 +1789,17 @@
   (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 "S-RET") #'w3m-safe-view-this-url)
-     (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 "<up>") #'previous-line)
-     (define-key w3m-minor-mode-map (kbd "<down>") #'next-line)))
+  (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 "<left>") #'backward-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 "<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 "==> ")
@@ -1929,10 +1914,8 @@
 
 ;; 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-thread)
-     ))
+  ;; (add-hook 'message-sent-hook 'gnus-score-followup-article)
+  (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.")
@@ -1947,7 +1930,7 @@
          '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
@@ -1961,7 +1944,7 @@
       (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
@@ -1979,32 +1962,30 @@
 
 ;; Especially highlight my message and replays to me.
 (my--eval-after-load gnus-sum
-  '(progn
-     (defface my-gnus-own-unread-face nil
-       "Use this face to display own postings in Summary Buffer")
-     (copy-face 'gnus-summary-high-unread-face 'my-gnus-own-unread-face)
-     (set-face-background 'my-gnus-own-unread-face "linen")
-     (add-to-list 'gnus-summary-highlight
-                  '((and (> score 190) (eq mark gnus-unread-mark)) . my-gnus-own-unread-face))
-     (defface my-gnus-own-ancient-face nil
-       "Use this face to display own postings in Summary Buffer")
-     (copy-face 'gnus-summary-high-ancient-face 'my-gnus-own-ancient-face)
-     (set-face-background 'my-gnus-own-ancient-face "linen")
-     (add-to-list 'gnus-summary-highlight
-                  '((and (> score 190) (eq mark gnus-ancient-mark)) . my-gnus-own-ancient-face))
-     (defface my-gnus-own-ticked-face nil
-       "Use this face to display own postings in Summary Buffer")
-     (copy-face 'gnus-summary-high-ticked-face 'my-gnus-own-ticked-face)
-     (set-face-background 'my-gnus-own-ticked-face "linen")
-     (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))
-     (defface my-gnus-fup-face nil
-       "Use this face to display direct fups to my postings.")
-     (copy-face 'gnus-summary-high-unread-face 'my-gnus-fup-face)
-     (set-face-background 'my-gnus-fup-face "honeydew")
-     (add-to-list 'gnus-summary-highlight
-                  '((and (<= 90 score) (<= score 110) (eq mark gnus-unread-mark)) . my-gnus-fup-face))
-     ))
+  (defface my-gnus-own-unread-face nil
+    "Use this face to display own postings in Summary Buffer")
+  (copy-face 'gnus-summary-high-unread-face 'my-gnus-own-unread-face)
+  (set-face-background 'my-gnus-own-unread-face "linen")
+  (add-to-list 'gnus-summary-highlight
+               '((and (> score 190) (eq mark gnus-unread-mark)) . my-gnus-own-unread-face))
+  (defface my-gnus-own-ancient-face nil
+    "Use this face to display own postings in Summary Buffer")
+  (copy-face 'gnus-summary-high-ancient-face 'my-gnus-own-ancient-face)
+  (set-face-background 'my-gnus-own-ancient-face "linen")
+  (add-to-list 'gnus-summary-highlight
+               '((and (> score 190) (eq mark gnus-ancient-mark)) . my-gnus-own-ancient-face))
+  (defface my-gnus-own-ticked-face nil
+    "Use this face to display own postings in Summary Buffer")
+  (copy-face 'gnus-summary-high-ticked-face 'my-gnus-own-ticked-face)
+  (set-face-background 'my-gnus-own-ticked-face "linen")
+  (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))
+  (defface my-gnus-fup-face nil
+    "Use this face to display direct fups to my postings.")
+  (copy-face 'gnus-summary-high-unread-face 'my-gnus-fup-face)
+  (set-face-background 'my-gnus-fup-face "honeydew")
+  (add-to-list 'gnus-summary-highlight
+               '((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"'
@@ -2014,12 +1995,10 @@
 
 ;; 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 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 up)] 'gnus-summary-prev-thread)
-     ))
+  (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 [(control down)] 'gnus-summary-next-thread)
+  (define-key gnus-summary-mode-map [(control up)] 'gnus-summary-prev-thread))
 
 ;; (setq imap-log t)
 
@@ -2068,25 +2047,21 @@
  )
 
 (my--eval-after-load jabber
-  '(progn
-    ;; 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 [C-return] 'jabber-chat-buffer-send)
-    ;; fsm used in emacs jabber
-    (when (featurep 'fsm)
-      (setq fsm-debug nil)                  ; Disable *fsm-debug* buffer.
-      )
-    ;; Handle Emacs exit.
-    (add-hook 'kill-emacs-hook 'jabber-disconnect)
-    ))
+  ;; 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 [C-return] 'jabber-chat-buffer-send)
+  ;; fsm used in emacs jabber
+  (when (featurep 'fsm)
+    (setq fsm-debug nil))               ; Disable *fsm-debug* buffer.
+  ;; 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."
@@ -2169,9 +2144,8 @@
  erc-log-channels-directory "~/.emacs.d/.irc"
  erc-log-file-coding-system 'utf-8-unix)
 (my--eval-after-load erc
-  (lambda ()
-    (require 'erc-log)
-    (mkdir erc-log-channels-directory t)))
+  (require 'erc-log)
+  (mkdir erc-log-channels-directory t))
 
 ;; Kill buffers for channels after /part
 ;; (setq erc-kill-buffer-on-part t)
@@ -2226,11 +2200,9 @@
 
 (when window-system
   (my--eval-after-load diff-mode
-    '(progn
-       (set-face-foreground 'diff-added-face "DarkGreen")
-       (set-face-foreground 'diff-removed-face "DarkRed")
-       (set-face-background 'diff-refine-change "LightBlue1")
-       )))
+    (set-face-foreground 'diff-added-face "DarkGreen")
+    (set-face-foreground 'diff-removed-face "DarkRed")
+    (set-face-background 'diff-refine-change "LightBlue1")))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil")
@@ -2349,18 +2321,15 @@
 ;; (setq compilation-environment '("LANG=C"))
 
 (my--eval-after-load compile
-  '(progn
-     ;; 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 '("^ *\\(.*\\)(\\([0-9]*\\)) +:" 1 2))
-     (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 'maven)
-     (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 '("[[:blank:]]\\(/F[oe][^[:blank:]]+\\)" . 1))
-       )
-     ))
+  ;; 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 '("^ *\\(.*\\)(\\([0-9]*\\)) +:" 1 2))
+  (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 'maven)
+  (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 '("[[:blank:]]\\(/F[oe][^[:blank:]]+\\)" . 1))))
 
 (ignore-errors
   (require 'ansi-color)
@@ -2381,9 +2350,7 @@
   (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")
@@ -2680,13 +2647,13 @@
 (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)
@@ -2754,9 +2721,7 @@
 (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")
@@ -2766,7 +2731,8 @@
   (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
@@ -2915,12 +2881,14 @@
 (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")
@@ -2969,18 +2937,15 @@
 
 (setq sgml-set-face t)                  ; for highlighting in sgml
 (my--eval-after-load sgml-mode
-  '(progn
-     (unless (featurep 'psgml)
-       (setq html-tag-alist
-             (cons
-              my-html-template
-              (my-filter
-               (lambda (item) (not (equal (car item) "html")))
-               html-tag-alist)))
-       (add-to-list 'html-tag-alist '("script" (\n) ("type" "text/javascript") ))
-       (add-to-list 'html-tag-alist '("style" (\n) ("type" "text/css") ))
-       )))
-
+  (unless (featurep 'psgml)
+    (setq html-tag-alist
+          (cons
+           my-html-template
+           (my-filter
+            (lambda (item) (not (equal (car item) "html")))
+            html-tag-alist)))
+    (add-to-list 'html-tag-alist '("script" (\n) ("type" "text/javascript") ))
+    (add-to-list 'html-tag-alist '("style" (\n) ("type" "text/css") )) ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "jsp")
@@ -3020,15 +2985,12 @@
  )
 
 (my--eval-after-load proof
-  '(progn
-     ;; (proof-maths-menu-toggle 1)
-     ;; (unicode-tokens-mode 1)
-     ;; (proof-imenu-toggle 1)
-     ))
+  ;; (proof-maths-menu-toggle 1)
+  ;; (unicode-tokens-mode 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")