dot-emacs: comparison .emacs-my

equal deleted inserted replaced

-:77fcd3f63d60
+:6a740def74e8
 (recentf-cleanup) ))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "revert buffer, auto-revert")
-(eval-when 'compile (require 'autorevert))
+(cl-eval-when (compile) (require 'autorevert))
 (global-set-key [f5]    'revert-buffer)
 (setq revert-without-query (quote (".*")))
 (setq auto-revert-interval 2)
 (my-debug nil)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "user info")
-(eval-when 'compile (require 'info))
+(cl-eval-when (compile) (require 'info))
 ;; Set in ~/.emacs.d/.emacs-auth:
 ;; (setq user-full-name "Oleksandr Gavenko")
 ;; (setq user-mail-address "gavenkoa@gmail.com")
 ;; (setq user-nick "gavenkoa")
 (remove-if-not 'identity result) ))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "lisp, elisp")
-(eval-when 'compile (require 'chistory))
+(cl-eval-when (compile) (require 'chistory))
 (setq list-command-history-max 256)
 (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
 (add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode)
 ;; To maximize frame on full screen, not work with Windows Emacs 21.4.
 ;; And maked different height with Emacs 22.3 and 23.1.
 ;; (setq initial-frame-alist '((fullscreen . fullboth)))
-(eval-when 'compile (load-library "window"))
+(cl-eval-when (compile) (load-library "window"))
 (setq display-buffer-reuse-frames t)
 (defun my-maximize ()
 ;; Next code work with Emacs 21.4, 22.3, 23.1.
 ("Asia/Tokyo" "Tokyo")))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "shell, bash, Cygwin, MSYS")
-(eval-when 'compile (require 'shell))
+(cl-eval-when (compile) (require 'shell))
 (defvar my-use-windows-shell nil
 "If t 'cmdproxy.exe' will be used as shell.
 Affect on \\[shell] like commands. If nil, 'sh' will be used." )
 (setq explicit-bash-args '("-i"))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "term")
-(eval-when 'compile (require 'term))
+(cl-eval-when (compile) (require 'term))
 (when (eq system-type 'cygwin)
 (setq explicit-shell-file-name "bash"))
 (setq term-buffer-maximum-size (lsh 1 14))
 (setq-default proced-format 'medium)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "whitespaces")
-(eval-when 'compile (require 'whitespace))
+(cl-eval-when (compile) (require 'whitespace))
 (setq-default indicate-empty-lines t)
 (setq-default indicate-buffer-boundaries 'left)
 ;; Old trailing whitespace highlighter built-in into Emacs engine, until global-whitespace-mode is fixed.
 (global-set-key (kbd "M-SPC") 'cycle-spacing))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "server")
-(eval-when 'compile (require 'server))
+(cl-eval-when (compile) (require 'server))
 (when (equal window-system 'w32)
 ;; including cygwin here as socket in /tmp directory is a subject of cleanup...
 (setq server-use-tcp t))
 (when (and (>= emacs-major-version 22))
 )
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "grep, find, ack, ag")
-(eval-when 'compile (require 'find-dired))
+(cl-eval-when (compile) (require 'find-dired))
 ;; -ls produce very noisy output:
 ;; (setq find-ls-option '("-ls" . ""))
 ;; So I use next expression, which work with GNU find, I replace %s with '0'
 ;; to avoid unnecessary sys calls and this make output aligned by column:
 (setq find-ls-option '("-printf ' -rw-rw-rw- %9s %AY-%Am-%Ad %AH:%AM %p\n'" . ""))
-(eval-when 'compile (require 'grep))
+(cl-eval-when (compile) (require 'grep))
 ;; Do not set t because some grep do not has --color options.
 (setq grep-highlight-matches nil)
 (setq grep-use-null-device nil)
 (message "ivy, ido, ffap")
 ;; (add-hook 'find-file-hook #'make-frame-visible)
 (require 'ffap)
-(eval-when 'compile (require 'ido nil t))
+(cl-eval-when (compile) (require 'ido nil t))
 ;; Ido makes appropriate binding.
 ;(ffap-bindings)
 ;; C-u C-x C-f finds the file at point
 ;(setq ffap-require-prefix t)
 (add-to-list 'magic-mode-alist (cons #'my--large-file-p #'my-large-file-mode))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "helm")
-(eval-when 'compile
+(cl-eval-when (compile)
 (require 'helm-locate nil t))
 (setq helm-locate-command "locate %s -e %s")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (define-key global-map [?\s-i] 'ide-idea-open-this-buffer)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "calendar")
-(eval-when 'compile (require 'calendar))
+(cl-eval-when (compile) (require 'calendar))
 ;; (setq mark-holidays-in-calendar t)
 ;; (setq all-christian-calendar-holidays t)
 ;; (setq calendar-date-display-form (quote ((format "%04s-%02d-%02d" year (string-to-number month) (string-to-number day)))))
 ;; (setq calendar-time-display-form (quote (24-hours ":" minutes (if time-zone " (") time-zone (if time-zone ")"))))
 :other-modes '(makefile-mode)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "man, woman")
-(eval-when 'compile (require 'woman))
+(cl-eval-when (compile) (require 'woman))
 (when (featurep 'cygwin-mount)
 (let ( (path (expand-file-name "~")) )
 (when (string-match "\\([c-z]\\):/" path)
 (setenv "MANPATH" (concat "/cygdrive/" (substring path 0 1) "/" (substring path 3) "/usr/share/man/:"))
 (message "org-mode, GTD, PIM, organize, todo")
 (require 'org)
 (require 'org-capture nil t)
-(eval-when 'compile
+(cl-eval-when (compile)
 (require 'org-agenda)
 (require 'org-archive))
 ;; XXX org-todo-keywords '((sequence "TODO" "START" "|" "DONE")) for org-version 4.67c
 (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
 (mapc (lambda (mode) (add-hook (intern (concat mode "-hook")) 'my-todo)) generic-mode-list))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "mail, message")
-(eval-when 'compile (require 'message))
+(cl-eval-when (compile) (require 'message))
 (setq mail-user-agent 'message-user-agent)
 (defun my-compose-mail ()
 (interactive)
 (defun my--message-refine-filename (filename)
 (mapconcat
 (lambda (ch) (or (when (string-match my--message-safe-filename-regex (char-to-string ch)) (char-to-string ch)) "-"))
 filename "") )
-(eval-when 'compile (require 'gnus))
+(cl-eval-when (compile) (require 'gnus))
 (defun my--message-save ()
 "Store message in `gnus-article-save-directory' after
 successful sending. It is possible that mail rejected and I lost
 it completely, this func save it for me."
 ;; (setq smtpmail-debug-info t)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "gnus, mh-e")
-(eval-when 'compile
+(cl-eval-when (compile)
 (require 'gnus)
 (require 'gnus-agent)
 (require 'gnus-start)
 (require 'gnus-score)
 (require 'gnus-topic)
 (setq mm-discouraged-alternatives '("text/richtext"))
 (setq gnus-buttonized-mime-types '("text/html"))
 (setq mm-text-html-renderer 'shr)
-(eval-when-compile
+(cl-eval-when (compile)
 (ignore-errors
 ;; w3m-anchor is macros in newer Emacs, need definition during byte-compilation.
 (require 'w3m-util)))
 (defun my-w3m-view-url ()
 )
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "jabber")
-(eval-when 'compile (require 'jabber nil t))
+(cl-eval-when (compile) (require 'jabber nil t))
 (setq jabber-history-dir (concat user-emacs-directory ".jabber"))
 (autoload 'jabber-connect-all "jabber")
 (global-set-key (kbd "C-x C-j C-s") 'my-jabber-send)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "erc")
-(eval-when 'compile
+(cl-eval-when (compile)
 (require 'erc)
 (require 'erc-log))
 ;; (add-to-list 'erc-modules 'notify)
 ;; (setq erc-notify-list '(""))
 (add-hook 'prog-mode-hook #'my-company-prog-mode-setup))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "diff, patch, ediff, emerge")
-(eval-when 'compile (require 'ediff))
+(cl-eval-when (compile) (require 'ediff))
 (setq diff-switches "-u")
 (setq ediff-diff-options "")
 (setq ediff-custom-diff-options "-u")
 (set-face-background 'diff-refine-changed "LightBlue1")))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil")
-(eval-when 'compile
+(cl-eval-when (compile)
 (require 'vc)
 (require 'vc-hooks)
 (require 'vc-annotate)
 (require 'vc-svn))
 (remove-hook 'after-change-major-mode-hook 'git-commit-setup-font-lock-in-buffer))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "indenting")
-(eval-when 'compile (require 'cc-mode))
+(cl-eval-when (compile) (require 'cc-mode))
 (setq standard-indent 4)
 (setq c-basic-offset 4)
 (when (fboundp 'electric-indent-mode)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "gdb, gud")
 ;; Use C-x SPACE to set breakpoint in source file.
-(eval-when 'compile (require 'gdb-mi nil t))
+(cl-eval-when (compile) (require 'gdb-mi nil t))
 (setq gdb-show-main t)                  ; See also (gdb-many-windows)
 (setq gud-pdb-command-name "python3 -m pdb")
 )
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "c-mode, cc-mode, c++-mode")
-(eval-when 'compile (require 'cc-mode))
+(cl-eval-when (compile) (require 'cc-mode))
 ;; Minor mode that highlights suspicious C and C++ constructions.
 (global-cwarn-mode 1)
 (setq c-echo-syntactic-information-p t)
 (add-hook 'c-mode-common-hook 'my-c-mode-style-hook)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "python, python-mode")
-(eval-when 'compile
+(cl-eval-when (compile)
 (require 'python))
 (setq python-shell-interpreter "python3")
 (setq python-indent-offset 4)
 (add-to-list 'auto-mode-alist '("/requirements.txt\\'" . conf-mode))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "perl, cperl")
-(eval-when 'compile (require 'cperl-mode))
+(cl-eval-when (compile) (require 'cperl-mode))
 ;; Use cperl instead perl mode.
 (mapc
 (lambda (pair)
 (if (eq (cdr pair) 'perl-mode)
 ;;       ("=>"  . ?⇛))))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "Pascal")
-(eval-when 'compile (require 'pascal))
+(cl-eval-when (compile) (require 'pascal))
 (setq
 pascal-indent-level 4
 pascal-case-indent 2
 pascal-auto-newline t
 (setq wesnoth-base-indent 2)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "css")
-(eval-when 'compile (require 'css-mode))
+(cl-eval-when (compile) (require 'css-mode))
 (setq css-indent-offset 4)
 ;; (package-install 'css-eldoc)
 (css-eldoc-enable)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "htmlize")
-(eval-when 'compile (require 'htmlize nil t))
+(cl-eval-when (compile) (require 'htmlize nil t))
 (setq
 htmlize-html-charset "utf-8"
 htmlize-output-type 'inline-css
 htmlize-html-major-mode 'html-mode
 ))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "nxml")
-(eval-when 'compile (require 'nxml-mode))
+(cl-eval-when (compile) (require 'nxml-mode))
 (setq nxml-sexp-element-flag t)
 (setq nxml-child-indent 2)
 (setq nxml-attribute-indent 4)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "web-mode")
 (require 'web-mode nil t)
-(eval-when 'compile (require 'web-mode nil t))
+(cl-eval-when (compile) (require 'web-mode nil t))
 (setq web-mode-markup-indent-offset 2
 web-mode-css-indent-offset 2
 web-mode-code-indent-offset 2
 web-mode-script-padding 2
 (copy-face 'web-mode-html-tag-bracket-face 'web-mode-html-attr-equal-face)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "sgml")
-(eval-when 'compile (require 'sgml-mode))
+(cl-eval-when (compile) (require 'sgml-mode))
 (setq sgml-basic-offset 4)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "psgml")
-(eval-when 'compile (require 'psgml nil t))
+(cl-eval-when (compile) (require 'psgml nil t))
 (defvar my-html-template
 '("html"
 (nil
 "\n<head>" \n
 (add-to-list 'auto-mode-alist '("\\.jspf?\\'" . jsp-mode)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "emmet")
-(eval-when (compile) (require 'emmet-mode nil t))
+(cl-eval-when (compile) (require 'emmet-mode nil t))
 (when (featurep 'emmet-mode)
 (add-hook 'sgml-mode-hook 'emmet-mode))
 (when (featurep 'web-mode)
 (setq emmet-move-cursor-after-expanding t)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "sh, bash")
-(eval-when 'compile (require 'sh-script))
+(cl-eval-when (compile) (require 'sh-script))
 (setq sh-basic-offset 2)
 (add-to-list 'auto-mode-alist '("\\.cygport\\'" . shell-script-mode))
 (add-hook 'sh-mode-hook #'my-sh-company-setup))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "pg, Proof General")
-(eval-when 'compile (require 'proof nil t))
+(cl-eval-when (compile) (require 'proof nil t))
 (setq proof-splash-enable nil)
 ;; (setq proof-toolbar-enable nil)
 (setq
 ;(setq ps-print-header nil)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "SQL")
-(eval-when 'compile (require 'sql))
+(cl-eval-when (compile) (require 'sql))
 (setq sql-password "")
 (add-to-list 'auto-mode-alist '("\\.plsql\\'" . sql-mode))
 ;; Disable placeholders substitution in Oracle SQLi by Emacs itself.

changeset 1685	6a740def74e8
parent 1684	77fcd3f63d60
child 1686	bedbd1cd366d