branch: elpa/git-commit
commit 413a98f7ec50eb418f560d21766f528cc89653d1
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Use kbd function more when defining key bindings
Use `kbd' instead of quoting. This makes searching easier because
we only have to look for one form. Continue to avoid `kbd' when
it would return its argument unchanged. Make exceptions to avoid
placing definitions that use `kbd' next to definitions that don't.
---
lisp/magit-log.el | 20 ++++++++++----------
lisp/magit-process.el | 2 +-
lisp/magit-reflog.el | 4 ++--
lisp/magit-refs.el | 4 ++--
lisp/magit-section.el | 8 ++++----
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index ea4100a..f83907e 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -951,9 +951,9 @@ of the current repository first; creating it if necessary."
(defvar magit-log-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map magit-mode-map)
- (define-key map "\C-c\C-b" 'magit-go-backward)
- (define-key map "\C-c\C-f" 'magit-go-forward)
- (define-key map "\C-c\C-n" 'magit-log-move-to-parent)
+ (define-key map (kbd "C-c C-b") 'magit-go-backward)
+ (define-key map (kbd "C-c C-f") 'magit-go-forward)
+ (define-key map (kbd "C-c C-n") 'magit-log-move-to-parent)
(define-key map "j" 'magit-log-move-to-revision)
(define-key map "=" 'magit-log-toggle-commit-limit)
(define-key map "+" 'magit-log-double-commit-limit)
@@ -1529,13 +1529,13 @@ The shortstat style is experimental and rather slow."
(defvar magit-log-select-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map magit-log-mode-map)
- (define-key map "\C-c\C-b" 'undefined)
- (define-key map "\C-c\C-f" 'undefined)
- (define-key map "." 'magit-log-select-pick)
- (define-key map "e" 'magit-log-select-pick)
- (define-key map "\C-c\C-c" 'magit-log-select-pick)
- (define-key map "q" 'magit-log-select-quit)
- (define-key map "\C-c\C-k" 'magit-log-select-quit)
+ (define-key map (kbd "C-c C-b") 'undefined)
+ (define-key map (kbd "C-c C-f") 'undefined)
+ (define-key map (kbd ".") 'magit-log-select-pick)
+ (define-key map (kbd "e") 'magit-log-select-pick)
+ (define-key map (kbd "C-c C-c") 'magit-log-select-pick)
+ (define-key map (kbd "q") 'magit-log-select-quit)
+ (define-key map (kbd "C-c C-k") 'magit-log-select-quit)
map)
"Keymap for `magit-log-select-mode'.")
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 7fef19f..845129e 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -772,7 +772,7 @@ Magit status buffer."
(let ((map (cl-gensym)))
`(let ((,map (make-sparse-keymap)))
(set-keymap-parent ,map minibuffer-local-map)
- (define-key ,map "\C-g"
+ (define-key ,map (kbd "C-g")
(lambda ()
(interactive)
(ignore-errors (kill-process ,proc))
diff --git a/lisp/magit-reflog.el b/lisp/magit-reflog.el
index 384cfa4..a001dfc 100644
--- a/lisp/magit-reflog.el
+++ b/lisp/magit-reflog.el
@@ -136,8 +136,8 @@ If `HEAD' is detached, then show the reflog for that
instead."
(defvar magit-reflog-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map magit-log-mode-map)
- (define-key map "\C-c\C-n" 'undefined)
- (define-key map "L" 'magit-margin-settings)
+ (define-key map (kbd "C-c C-n") 'undefined)
+ (define-key map (kbd "L") 'magit-margin-settings)
map)
"Keymap for `magit-reflog-mode'.")
diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el
index 13ceec7..d3895ea 100644
--- a/lisp/magit-refs.el
+++ b/lisp/magit-refs.el
@@ -277,8 +277,8 @@ the outcome.
(defvar magit-refs-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map magit-mode-map)
- (define-key map "\C-y" 'magit-refs-set-show-commit-count)
- (define-key map "L" 'magit-margin-settings)
+ (define-key map (kbd "C-y") 'magit-refs-set-show-commit-count)
+ (define-key map (kbd "L") 'magit-margin-settings)
map)
"Keymap for `magit-refs-mode'.")
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 428e30b..d44074e 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -328,10 +328,10 @@ but that ship has sailed, thus this option."
(define-key map (kbd "n") 'magit-section-forward)
(define-key map (kbd "M-p") 'magit-section-backward-sibling)
(define-key map (kbd "M-n") 'magit-section-forward-sibling)
- (define-key map "1" 'magit-section-show-level-1)
- (define-key map "2" 'magit-section-show-level-2)
- (define-key map "3" 'magit-section-show-level-3)
- (define-key map "4" 'magit-section-show-level-4)
+ (define-key map (kbd "1") 'magit-section-show-level-1)
+ (define-key map (kbd "2") 'magit-section-show-level-2)
+ (define-key map (kbd "3") 'magit-section-show-level-3)
+ (define-key map (kbd "4") 'magit-section-show-level-4)
(define-key map (kbd "M-1") 'magit-section-show-level-1-all)
(define-key map (kbd "M-2") 'magit-section-show-level-2-all)
(define-key map (kbd "M-3") 'magit-section-show-level-3-all)
