From c6980622025e9100de767b4600a47524f38b5db0 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 16 Oct 2017 23:52:50 +0100 Subject: [PATCH] Emacs: Normalize binding syntax Without modifiers, use simple string. With modifiers, use 'kbd'. Use "<>" syntax for special keys. --- .emacs.d/lisp/functions.el | 2 +- .emacs.d/lisp/init-bbcode.el | 2 +- .emacs.d/lisp/init-cc.el | 4 +-- .emacs.d/lisp/init-evil-debbugs.el | 8 ++--- .emacs.d/lisp/init-evil-elfeed.el | 4 +-- .emacs.d/lisp/init-evil-emms.el | 20 +++++------ .emacs.d/lisp/init-evil-gnus.el | 10 +++--- .emacs.d/lisp/init-evil-helm.el | 4 +-- .emacs.d/lisp/init-evil-leader.el | 12 +++---- .emacs.d/lisp/init-evil-org.el | 44 +++++++++++------------ .emacs.d/lisp/init-evil-pdf.el | 44 +++++++++++------------ .emacs.d/lisp/init-evil-transmission.el | 2 +- .emacs.d/lisp/init-evil-ztree.el | 6 ++-- .emacs.d/lisp/init-evil.el | 47 ++++++++++++------------- .emacs.d/lisp/init-go.el | 2 +- .emacs.d/lisp/init-helm.el | 6 ++-- .emacs.d/lisp/init-latex.el | 2 +- .emacs.d/lisp/main.el | 6 ++-- 18 files changed, 112 insertions(+), 113 deletions(-) diff --git a/.emacs.d/lisp/functions.el b/.emacs.d/lisp/functions.el index f07b44de..1e60dca3 100644 --- a/.emacs.d/lisp/functions.el +++ b/.emacs.d/lisp/functions.el @@ -404,7 +404,7 @@ from acting on it." "Window '%s' is dedicated" "Window '%s' is normal") (current-buffer))) -(global-set-key [pause] 'toggle-window-dedicated) +(global-set-key (kbd "") 'toggle-window-dedicated) (defun toggle-window-split () "Switch between vertical and horizontal split. diff --git a/.emacs.d/lisp/init-bbcode.el b/.emacs.d/lisp/init-bbcode.el index cfbfce9f..e2a3d491 100644 --- a/.emacs.d/lisp/init-bbcode.el +++ b/.emacs.d/lisp/init-bbcode.el @@ -1,7 +1,7 @@ ;;; BBcode ;;; For new tags use `bbcode/make-key-binding'. -(define-key bbcode-mode-map (kbd "M-RET") 'bbcode/insert-tag-*) +(define-key bbcode-mode-map (kbd "M-") 'bbcode/insert-tag-*) (font-lock-add-keywords nil `((,(bbcode/make-tag-regex "h") . 'font-lock-builtin-face))) (font-lock-add-keywords nil `((,(bbcode/make-tag-regex "\\*") . 'font-lock-string-face))) diff --git a/.emacs.d/lisp/init-cc.el b/.emacs.d/lisp/init-cc.el index e610d691..3aa1b95d 100644 --- a/.emacs.d/lisp/init-cc.el +++ b/.emacs.d/lisp/init-cc.el @@ -7,9 +7,9 @@ "" 'cc-clean "M-." 'semantic-ia-fast-jump "C-c C-d" 'semantic-ia-show-summary - "M-TAB" 'semantic-complete-analyze-inline) + "M-" 'semantic-complete-analyze-inline) (when (require 'company nil t) - (define-key map (kbd "M-TAB") (if (require 'helm-company nil t) 'helm-company 'company-complete)))) + (define-key map (kbd "M-") (if (require 'helm-company nil t) 'helm-company 'company-complete)))) ;; (define-key map (kbd "C-c o") 'ff-find-other-file) (defvaralias 'c-basic-offset 'tab-width) diff --git a/.emacs.d/lisp/init-evil-debbugs.el b/.emacs.d/lisp/init-evil-debbugs.el index 98e45680..d111443d 100644 --- a/.emacs.d/lisp/init-evil-debbugs.el +++ b/.emacs.d/lisp/init-evil-debbugs.el @@ -3,11 +3,11 @@ (evil-set-initial-state 'debbugs-gnu-mode 'motion) (evil-define-key 'motion debbugs-gnu-mode-map - (kbd "TAB") 'forward-button + (kbd "") 'forward-button (kbd "") 'backward-button - (kbd "RET") 'debbugs-gnu-select-report - (kbd "SPC") 'scroll-up-command - "\M-sf" 'debbugs-gnu-narrow-to-status + (kbd "") 'debbugs-gnu-select-report + (kbd "") 'scroll-up-command + (kbd "M-s f") 'debbugs-gnu-narrow-to-status "gB" 'debbugs-gnu-show-blocking-reports "c" 'debbugs-gnu-send-control-message "r" 'debbugs-gnu-show-all-blocking-reports diff --git a/.emacs.d/lisp/init-evil-elfeed.el b/.emacs.d/lisp/init-evil-elfeed.el index dfa19616..17fa3e70 100644 --- a/.emacs.d/lisp/init-evil-elfeed.el +++ b/.emacs.d/lisp/init-evil-elfeed.el @@ -30,8 +30,8 @@ "r" 'elfeed-show-refresh "]" 'elfeed-show-next "[" 'elfeed-show-prev - "\M-j" 'elfeed-show-next - "\M-k" 'elfeed-show-prev + (kbd "C-j") 'elfeed-show-next + (kbd "C-k") 'elfeed-show-prev "q" 'elfeed-kill-buffer "s" 'elfeed-show-new-live-search "y" 'elfeed-show-yank) diff --git a/.emacs.d/lisp/init-evil-emms.el b/.emacs.d/lisp/init-evil-emms.el index 7b0dc603..d3f60c26 100644 --- a/.emacs.d/lisp/init-evil-emms.el +++ b/.emacs.d/lisp/init-evil-emms.el @@ -49,7 +49,7 @@ The return value is the yanked text." (kbd "C-") 'emms-browser-add-tracks-and-play (kbd "") 'emms-browser-add-tracks (kbd "") 'emms-browser-toggle-subitems - (kbd "SPC") 'emms-browser-toggle-subitems + (kbd "") 'emms-browser-toggle-subitems "/" 'emms-isearch-buffer ; This shows hidden items during search. "g1" 'emms-browser-collapse-all "g2" 'emms-browser-expand-to-level-2 @@ -61,10 +61,10 @@ The return value is the yanked text." "D" 'emms-browser-delete-files "g0" 'emms-browser-expand-all "d" 'emms-browser-view-in-dired - "\C-j" 'emms-browser-next-non-track - "\C-k" 'emms-browser-prev-non-track - "\M-j" 'emms-browser-next-non-track ; Custom - "\M-k" 'emms-browser-prev-non-track ; Custom + (kbd "C-j") 'emms-browser-next-non-track + (kbd "C-k") 'emms-browser-prev-non-track + (kbd "M-j") 'emms-browser-next-non-track ; Custom + (kbd "M-k") 'emms-browser-prev-non-track ; Custom "[" 'emms-browser-prev-non-track "]" 'emms-browser-next-non-track "{" 'emms-browser-prev-non-track @@ -100,10 +100,10 @@ The return value is the yanked text." "c" 'emms-playlist-mode-center-current "gd" 'emms-playlist-mode-goto-dired-at-point "zs" 'emms-show - "\C-j" 'emms-next - "\C-k" 'emms-previous - "\M-j" 'emms-next ; Custom - "\M-k" 'emms-previous ; Custom + (kbd "C-j") 'emms-next + (kbd "C-k") 'emms-previous + (kbd "M-j") 'emms-next ; Custom + (kbd "M-k") 'emms-previous ; Custom "r" 'emms-random "s" 'emms-stop "S" (lookup-key emms-playlist-mode-map (kbd "S")) @@ -113,7 +113,7 @@ The return value is the yanked text." "G" 'emms-playlist-mode-last "]" 'emms-playlist-mode-next "[" 'emms-playlist-mode-previous - "M-y" 'emms-playlist-mode-yank-pop) + (kbd "M-y") 'emms-playlist-mode-yank-pop) (evil-define-key 'visual emms-playlist-mode-map "d" 'emms-playlist-mode-kill diff --git a/.emacs.d/lisp/init-evil-gnus.el b/.emacs.d/lisp/init-evil-gnus.el index 4dfd50d2..55fd3f1e 100644 --- a/.emacs.d/lisp/init-evil-gnus.el +++ b/.emacs.d/lisp/init-evil-gnus.el @@ -2,12 +2,12 @@ (evil-set-initial-state 'gnus-summary-mode 'motion) (evil-define-key 'motion gnus-summary-mode-map - (kbd "TAB") 'gnus-summary-widget-forward + (kbd "") 'gnus-summary-widget-forward (kbd "") 'gnus-summary-widget-backward - (kbd "DEL") 'gnus-summary-prev-page - (kbd "S-SPC") 'gnus-summary-prev-page - (kbd "SPC") 'gnus-summary-next-page - (kbd "RET") 'gnus-summary-scroll-up + (kbd "") 'gnus-summary-prev-page + (kbd "S-") 'gnus-summary-prev-page + (kbd "") 'gnus-summary-next-page + (kbd "") 'gnus-summary-scroll-up "zz" 'gnus-recenter "z#" 'gnus-summary-mark-as-processable "!" 'gnus-summary-execute-command diff --git a/.emacs.d/lisp/init-evil-helm.el b/.emacs.d/lisp/init-evil-helm.el index fbb3a2a2..3d2c5b86 100644 --- a/.emacs.d/lisp/init-evil-helm.el +++ b/.emacs.d/lisp/init-evil-helm.el @@ -22,8 +22,8 @@ (evil-define-key 'normal helm-map "g" 'helm-beginning-of-buffer "G" 'helm-end-of-buffer - "\C-f" 'helm-next-page - "\C-b" 'helm-previous-page) + (kbd "C-f") 'helm-next-page + (kbd "C-b") 'helm-previous-page) (define-key helm-generic-files-map (kbd "M-o") 'helm-ff-run-switch-other-window) (define-key helm-buffer-map (kbd "M-o") 'helm-buffer-switch-other-window) diff --git a/.emacs.d/lisp/init-evil-leader.el b/.emacs.d/lisp/init-evil-leader.el index 2056ba94..d8552fe7 100644 --- a/.emacs.d/lisp/init-evil-leader.el +++ b/.emacs.d/lisp/init-evil-leader.el @@ -1,11 +1,11 @@ ;;; Evil leader ;;; Leader mode and its key must be set before evil-mode. -(evil-leader/set-leader "") +(evil-leader/set-leader "") (global-evil-leader-mode) (evil-leader/set-key - "RET" 'eshell-or-new-session + "" 'eshell-or-new-session "\\" 'toggle-window-split ;; "a" 'org-agenda "b" 'buffer-menu @@ -15,7 +15,7 @@ "|" 'swap-windows) (when (fboundp 'magit-status) ;; Since it is an autoload, we cannot use `with-eval-after-load'. - ;; Use S-SPC instead of SPC to browse commit details. + ;; Use S- instead of to browse commit details. (evil-leader/set-key "v" 'magit-status)) (when (fboundp 'emms-smart-browse) (evil-leader/set-key "A" 'helm-emms) @@ -38,8 +38,8 @@ (evil-leader/set-key "m" 'mu4e-headers-unread)) ;;; Since is no longer available, as some replacements: -(evil-define-key 'motion Info-mode-map (kbd "C-SPC") 'Info-scroll-up) -(evil-define-key 'motion help-mode-map (kbd "C-SPC") 'scroll-up-command) -(evil-define-key 'motion pdf-view-mode-map (kbd "C-SPC") 'pdf-view-scroll-up-or-next-page) +(evil-define-key 'motion Info-mode-map (kbd "C-") 'Info-scroll-up) +(evil-define-key 'motion help-mode-map (kbd "C-") 'scroll-up-command) +(evil-define-key 'motion pdf-view-mode-map (kbd "C-") 'pdf-view-scroll-up-or-next-page) (provide 'init-evil-leader) diff --git a/.emacs.d/lisp/init-evil-org.el b/.emacs.d/lisp/init-evil-org.el index 1eb3b21a..e18c8c06 100644 --- a/.emacs.d/lisp/init-evil-org.el +++ b/.emacs.d/lisp/init-evil-org.el @@ -13,22 +13,22 @@ "J" 'org-shiftdown "K" 'org-shiftup "L" 'org-shiftright - "\M-h" 'org-metaleft - "\M-j" 'org-metadown - "\M-k" 'org-metaup - "\M-l" 'org-metaright - "\M-H" 'org-shiftmetaleft - "\M-J" 'org-shiftmetadown - "\M-K" 'org-shiftmetaup - "\M-L" 'org-shiftmetaright + (kbd "M-h") 'org-metaleft + (kbd "M-j") 'org-metadown + (kbd "M-k") 'org-metaup + (kbd "M-l") 'org-metaright + (kbd "M-H") 'org-shiftmetaleft + (kbd "M-J") 'org-shiftmetadown + (kbd "M-K") 'org-shiftmetaup + (kbd "M-L") 'org-shiftmetaright "<" 'org-up-element) (evil-set-initial-state 'org-agenda-mode 'motion) (evil-define-key 'motion org-agenda-mode-map - (kbd "TAB") 'org-agenda-goto - (kbd "RET") 'org-agenda-switch-to - (kbd "SPC") 'org-agenda-show-and-scroll-up - (kbd "DEL") 'org-agenda-show-scroll-down + (kbd "") 'org-agenda-goto + (kbd "") 'org-agenda-switch-to + (kbd "") 'org-agenda-show-and-scroll-up + (kbd "") 'org-agenda-show-scroll-down (kbd "") 'org-agenda-show-scroll-down "dd" 'org-agenda-kill "u" 'org-agenda-undo @@ -41,7 +41,7 @@ "-" 'org-agenda-priority-down ;; "," 'org-agenda-priority "." 'org-agenda-goto-today - "\M-sf." 'org-agenda-filter-by-tag + (kbd "M-s f") 'org-agenda-filter-by-tag "s" 'org-agenda-set-tags "S" 'org-agenda-set-timer "<" 'org-agenda-filter-by-category @@ -61,8 +61,8 @@ "J" 'org-agenda-clock-goto ;; "L" 'org-agenda-recenter "gm" 'org-agenda-phases-of-moon - "\C-j" 'org-agenda-next-item - "\C-k" 'org-agenda-previous-item + (kbd "C-j") 'org-agenda-next-item + (kbd "C-k") 'org-agenda-previous-item ;; "Q" 'org-agenda-quit "q" 'org-agenda-quit "R" 'org-agenda-clockreport-mode @@ -75,13 +75,13 @@ "z^" 'org-agenda-filter-by-top-headline "z_" 'org-agenda-filter-by-effort "a" 'org-agenda-archive-default-with-confirmation - "\M-h" 'org-agenda-earlier - "\M-l" 'org-agenda-later + (kbd "M-h") 'org-agenda-earlier + (kbd "M-l") 'org-agenda-later "c" 'org-agenda-goto-calendar ;; "d" 'org-agenda-day-view ;; "se" 'org-agenda-set-effort "gr" 'org-agenda-redo-all - "\C-r" 'org-agenda-redo + (kbd "C-r") 'org-agenda-redo "i" 'org-agenda-diary-entry "gd" 'org-agenda-goto-date "zk" 'org-agenda-capture @@ -105,9 +105,9 @@ "J" 'org-agenda-priority-down "K" 'org-agenda-priority-up "L" 'org-agenda-do-date-later - "\M-H" 'org-agenda-todo-previousset - "\M-J" 'org-agenda-drag-line-forward - "\M-K" 'org-agenda-drag-line-backward - "\M-L" 'org-agenda-todo-nextset) + (kbd "M-H") 'org-agenda-todo-previousset + (kbd "M-J") 'org-agenda-drag-line-forward + (kbd "M-K") 'org-agenda-drag-line-backward + (kbd "M-L") 'org-agenda-todo-nextset) (provide 'init-evil-org) diff --git a/.emacs.d/lisp/init-evil-pdf.el b/.emacs.d/lisp/init-evil-pdf.el index 89cc9afe..9486dfd5 100644 --- a/.emacs.d/lisp/init-evil-pdf.el +++ b/.emacs.d/lisp/init-evil-pdf.el @@ -17,7 +17,7 @@ (kbd "") 'image-next-line "j" 'pdf-view-next-line-or-next-page "k" 'pdf-view-previous-line-or-previous-page - (kbd "SPC") 'pdf-view-scroll-up-or-next-page + (kbd "") 'pdf-view-scroll-up-or-next-page "'" 'pdf-view-jump-to-register "+" 'pdf-view-enlarge "-" 'pdf-view-shrink @@ -31,14 +31,14 @@ "b" 'image-previous-frame "f" 'image-next-frame "m" 'pdf-view-position-to-register - "\C-j" 'pdf-view-next-page-command - "\C-k" 'pdf-view-previous-page-command - "\M-j" 'pdf-view-next-page-command ; Custom - "\M-k" 'pdf-view-previous-page-command ; Custom + (kbd "C-j") 'pdf-view-next-page-command + (kbd "C-k") 'pdf-view-previous-page-command + (kbd "M-j") 'pdf-view-next-page-command ; Custom + (kbd "M-k") 'pdf-view-previous-page-command ; Custom "q" 'quit-window "r" 'revert-buffer - (kbd "DEL") 'pdf-view-scroll-down-or-previous-page - (kbd "S-SPC") 'pdf-view-scroll-down-or-previous-page + (kbd "") 'pdf-view-scroll-down-or-previous-page + (kbd "S-") 'pdf-view-scroll-down-or-previous-page (kbd "") 'pdf-view-mouse-extend-region (kbd "") 'pdf-view-mouse-set-region-rectangle (kbd "") 'pdf-view-next-line-or-next-page @@ -46,9 +46,9 @@ (kbd "") 'forward-page (kbd "") 'backward-page (kbd "") 'pdf-view-previous-line-or-previous-page - "\C-c\C-c" 'docview-mode + (kbd "C-c C-c") 'docview-mode "zd" 'pdf-view-dark-minor-mode - (kbd "C-c TAB") 'pdf-view-extract-region-image + (kbd "C-c ") 'pdf-view-extract-region-image "sb" 'pdf-view-set-slice-from-bounding-box "sm" 'pdf-view-set-slice-using-mouse @@ -63,36 +63,36 @@ "^" 'image-bol "$" 'image-eol "l" 'image-forward-hscroll - "\C-f" 'pdf-view-scroll-up-or-next-page - "\C-b" 'pdf-view-scroll-down-or-previous-page + (kbd "C-f") 'pdf-view-scroll-up-or-next-page + (kbd "C-b") 'pdf-view-scroll-down-or-previous-page "a+" 'image-increase-speed "a-" 'image-decrease-speed "a0" 'image-reset-speed "ar" 'image-reverse-speed - "\M-so" 'pdf-occur ; Custom + (kbd "M-s o") 'pdf-occur ; Custom "zm" 'pdf-view-midnight-minor-mode "zp" 'pdf-view-printer-minor-mode) (evil-set-initial-state 'pdf-outline-buffer-mode 'motion) (evil-define-key 'motion pdf-outline-buffer-mode-map - (kbd "RET") 'pdf-outline-follow-link - (kbd "M-RET") 'pdf-outline-follow-link-and-quit - (kbd "SPC") 'pdf-outline-display-link + (kbd "") 'pdf-outline-follow-link + (kbd "M-") 'pdf-outline-follow-link-and-quit + (kbd "") 'pdf-outline-display-link "." 'pdf-outline-move-to-current-page "G" 'pdf-outline-end-of-buffer "o" 'pdf-outline-select-pdf-window "<" 'pdf-outline-up-heading "^" 'pdf-outline-up-heading "zf" 'pdf-outline-follow-mode - "\C-wq" 'pdf-outline-quit-and-kill) + (kbd "C-w q") 'pdf-outline-quit-and-kill) (evil-define-key 'motion pdf-occur-buffer-mode-map - (kbd "RET") 'pdf-occur-goto-occurrence - "\C-o" 'pdf-occur-view-occurrence - (kbd "SPC") 'pdf-occur-view-occurrence + (kbd "") 'pdf-occur-goto-occurrence + (kbd "C-o") 'pdf-occur-view-occurrence + (kbd "") 'pdf-occur-view-occurrence "A" 'pdf-occur-tablist-gather-documents "D" 'pdf-occur-tablist-do-delete "G" 'tablist-revert @@ -109,10 +109,10 @@ "t" 'tablist-toggle-marks "u" 'tablist-unmark-forward "x" 'pdf-occur-tablist-do-flagged-delete - (kbd "DEL") 'tablist-unmark-backward - (kbd "S-SPC") 'scroll-down-command + (kbd "") 'tablist-unmark-backward + (kbd "S-") 'scroll-down-command (kbd "") 'tablist-backward-column - "\C-c\C-e" 'tablist-export-csv + (kbd "C-c C-e") 'tablist-export-csv [remap evil-first-non-blank] 'tablist-move-to-major-columnj [remap evil-next-line] 'tablist-next-line diff --git a/.emacs.d/lisp/init-evil-transmission.el b/.emacs.d/lisp/init-evil-transmission.el index 0cda6148..7fa8b416 100644 --- a/.emacs.d/lisp/init-evil-transmission.el +++ b/.emacs.d/lisp/init-evil-transmission.el @@ -22,7 +22,7 @@ (evil-set-initial-state 'transmission-files-mode 'motion) (evil-define-key 'motion transmission-files-mode-map (kbd "") 'transmission-find-file - "\M-l" 'transmission-display-file + (kbd "M-l") 'transmission-display-file "!" 'transmission-files-command "S" 'tabulated-list-sort "A" 'transmission-browse-url-of-file diff --git a/.emacs.d/lisp/init-evil-ztree.el b/.emacs.d/lisp/init-evil-ztree.el index da4e204e..bc208db0 100644 --- a/.emacs.d/lisp/init-evil-ztree.el +++ b/.emacs.d/lisp/init-evil-ztree.el @@ -3,9 +3,9 @@ (evil-set-initial-state 'ztree-mode 'motion) (evil-define-key 'motion ztree-mode-map - (kbd "TAB") 'ztree-jump-side - (kbd "RET") 'ztree-perform-action - (kbd "SPC") 'ztree-perform-soft-action + (kbd "") 'ztree-jump-side + (kbd "") 'ztree-perform-action + (kbd "") 'ztree-perform-soft-action "gr" 'ztree-refresh-buffer "q" 'quit-window "x" 'ztree-toggle-expand-subtree) diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el index f6e8f60a..dca15009 100644 --- a/.emacs.d/lisp/init-evil.el +++ b/.emacs.d/lisp/init-evil.el @@ -61,7 +61,7 @@ (when (require 'with-editor nil t) (add-hook 'with-editor-mode-hook 'evil-insert-state)) -;;; Allow for evil states in minibuffer. Double exits. +;;; Allow for evil states in minibuffer. Double exits. (dolist (keymap ;; https://www.gnu.org/software/emacs/manual/html_node/elisp/ @@ -71,8 +71,8 @@ minibuffer-local-completion-map minibuffer-local-must-match-map minibuffer-local-isearch-map)) - (evil-define-key 'normal (eval keymap) [escape] 'abort-recursive-edit) - (evil-define-key 'normal (eval keymap) [return] 'exit-minibuffer)) + (evil-define-key 'normal (eval keymap) (kbd "") 'abort-recursive-edit) + (evil-define-key 'normal (eval keymap) (kbd "") 'exit-minibuffer)) (defun evil-minibuffer-setup () (set (make-local-variable 'evil-echo-state) nil) @@ -83,12 +83,12 @@ (evil-insert 1)) (add-hook 'minibuffer-setup-hook 'evil-minibuffer-setup) ;;; Because of the above minibuffer-setup-hook, some bindings need be reset. -(evil-define-key 'normal evil-ex-completion-map [escape] 'abort-recursive-edit) -(evil-define-key 'insert evil-ex-completion-map "\M-p" 'previous-complete-history-element) -(evil-define-key 'insert evil-ex-completion-map "\M-n" 'next-complete-history-element) +(evil-define-key 'normal evil-ex-completion-map (kbd "") 'abort-recursive-edit) +(evil-define-key 'insert evil-ex-completion-map (kbd "M-p") 'previous-complete-history-element) +(evil-define-key 'insert evil-ex-completion-map (kbd "M-n") 'next-complete-history-element) ;;; TODO: evil-ex history binding in normal mode do not work. -(evil-define-key 'normal evil-ex-completion-map "\M-p" 'previous-history-element) -(evil-define-key 'normal evil-ex-completion-map "\M-n" 'next-history-element) +(evil-define-key 'normal evil-ex-completion-map (kbd "M-p") 'previous-history-element) +(evil-define-key 'normal evil-ex-completion-map (kbd "M-n") 'next-history-element) (define-keys evil-ex-completion-map "M-p" 'previous-history-element "M-n" 'next-history-element) @@ -144,22 +144,21 @@ ;;; Emacs special modes (when (require 'evil-special-modes nil t) (evil-special-modes-init)) -;; TODO: Copy extra term code. ;;; nXML -;;; TODO: Add to Emacs special modes +;;; TODO: Add to Emacs special modes? (evil-define-key 'normal nxml-mode-map - "\C-j" 'nxml-forward-element - "\C-k" 'nxml-backward-element - "\M-j" 'nxml-forward-element ; Custom - "\M-k" 'nxml-backward-element ; Custom + (kbd "C-j") 'nxml-forward-element + (kbd "C-k") 'nxml-backward-element + (kbd "M-j") 'nxml-forward-element ; Custom + (kbd "M-k") 'nxml-backward-element ; Custom ">" 'nxml-down-element "<" 'nxml-backward-up-element) (evil-define-key 'visual nxml-mode-map - "\C-j" 'nxml-forward-element - "\C-k" 'nxml-backward-element - "\M-j" 'nxml-forward-element ; Custom - "\M-k" 'nxml-backward-element ; Custom + (kbd "C-j") 'nxml-forward-element + (kbd "C-k") 'nxml-backward-element + (kbd "M-j") 'nxml-forward-element ; Custom + (kbd "M-k") 'nxml-backward-element ; Custom ">" 'nxml-down-element "<" 'nxml-backward-up-element) @@ -183,17 +182,17 @@ (evil-define-key 'visual mu4e-headers-mode-map "u" 'mu4e-headers-mark-for-unmark) (evil-define-key 'motion mu4e-view-mode-map - (kbd "SPC") 'mu4e-view-scroll-up-or-next - (kbd "TAB") 'shr-next-link + (kbd "") 'mu4e-view-scroll-up-or-next + (kbd "") 'shr-next-link "i" 'mu4e-view-mark-for-flag "I" 'mu4e-view-mark-for-unflag ;; "R" 'mu4e-view-mark-for-refile "r" 'mu4e-compose-reply "za" 'mu4e-view-save-attachment-multi - "\C-j" 'mu4e-view-headers-next - "\C-k" 'mu4e-view-headers-prev - "\M-j" 'mu4e-view-headers-next ; Custom - "\M-k" 'mu4e-view-headers-prev ; Custom + (kbd "C-j") 'mu4e-view-headers-next + (kbd "C-k") 'mu4e-view-headers-prev + (kbd "M-j") 'mu4e-view-headers-next ; Custom + (kbd "M-k") 'mu4e-view-headers-prev ; Custom "h" 'evil-backward-char "zh" 'mu4e-view-toggle-html "gu" 'mu4e-view-go-to-url) diff --git a/.emacs.d/lisp/init-go.el b/.emacs.d/lisp/init-go.el index e06aef8c..ec2d6b1b 100644 --- a/.emacs.d/lisp/init-go.el +++ b/.emacs.d/lisp/init-go.el @@ -17,7 +17,7 @@ (when (require 'company-go nil t) (add-hook 'go-mode-hook 'company-mode) (add-to-list 'company-backends 'company-go) - (local-set-key (kbd "M-TAB") (if (require 'helm-company nil t) 'helm-company 'company-complete))) + (local-set-key (kbd "M-") (if (require 'helm-company nil t) 'helm-company 'company-complete))) (setq gofmt-command "goimports") (setq godoc-command "godoc -ex") diff --git a/.emacs.d/lisp/init-helm.el b/.emacs.d/lisp/init-helm.el index d81fd5e6..05ee23b5 100644 --- a/.emacs.d/lisp/init-helm.el +++ b/.emacs.d/lisp/init-helm.el @@ -150,11 +150,11 @@ Requires `call-process-to-string' from `functions'." "C-x M-G" 'helm-do-grep-ag) ;;; Use the M-s prefix just like `occur'. -(define-key prog-mode-map "\M-sf" 'helm-semantic-or-imenu) +(define-key prog-mode-map (kbd "M-s f") 'helm-semantic-or-imenu) ;;; The text-mode-map binding targets structured text modes like Markdown. -(define-key text-mode-map "\M-sf" 'helm-semantic-or-imenu) +(define-key text-mode-map (kbd "M-s f") 'helm-semantic-or-imenu) (with-eval-after-load 'org - (define-key org-mode-map "\M-sf" 'helm-org-in-buffer-headings)) + (define-key org-mode-map (kbd "M-s f") 'helm-org-in-buffer-headings)) (set-face-attribute 'helm-source-header nil :inherit 'header-line :height 'unspecified :background 'unspecified :foreground 'unspecified) (set-face-background 'helm-selection "#4f4f4f") diff --git a/.emacs.d/lisp/init-latex.el b/.emacs.d/lisp/init-latex.el index cb654ab3..be9ae6d9 100644 --- a/.emacs.d/lisp/init-latex.el +++ b/.emacs.d/lisp/init-latex.el @@ -19,7 +19,7 @@ "C-c l" 'latex-lstinline "C-c o" 'latex-orgtbl "C-c u" 'latex-package - "M-RET" 'latex-itemize) + "M-" 'latex-itemize) ;;; Needs dvipng. ;;; With TeXlive, the following packages are needed: psnfss, symbol, zapfding diff --git a/.emacs.d/lisp/main.el b/.emacs.d/lisp/main.el index 4e2cb5bb..e44c2997 100644 --- a/.emacs.d/lisp/main.el +++ b/.emacs.d/lisp/main.el @@ -194,8 +194,8 @@ ;;; Electric Pairs to auto-complete () [] {} "" etc. It works on regions. ;; (electric-pair-mode) -;;; Spawn terminal shortcut: WM's binding is s+RET. -(global-set-key (kbd "C-x M-RET") 'spawn-terminal) +;;; Spawn terminal shortcut: WM's binding is s+. +(global-set-key (kbd "C-x M-") 'spawn-terminal) ;;; Calendar ISO display. (setq calendar-week-start-day 1) @@ -305,7 +305,7 @@ (setq sort-fold-case t) ;;; Replace not-so-useful comment-dwim binding. -(global-set-key "\M-;" 'comment-line) +(global-set-key (kbd "M-;") 'comment-line) ;;; Eldoc: Disable if too distracting. ;; (global-eldoc-mode 0)