Put actual key bindings back in magit.el.
This commit is contained in:
Phil Jackson
parent
bdebdfcf8d
commit
536dde9f35
2 changed files with 179 additions and 181 deletions
|
|
@ -1,176 +1,5 @@
|
|||
(require 'assoc)
|
||||
|
||||
(defvar magit-mode-map
|
||||
(let ((map (make-keymap)))
|
||||
(suppress-keymap map t)
|
||||
(define-key map (kbd "n") 'magit-goto-next-section)
|
||||
(define-key map (kbd "p") 'magit-goto-previous-section)
|
||||
(define-key map (kbd "TAB") 'magit-toggle-section)
|
||||
(define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
|
||||
(define-key map (kbd "1") 'magit-show-level-1)
|
||||
(define-key map (kbd "2") 'magit-show-level-2)
|
||||
(define-key map (kbd "3") 'magit-show-level-3)
|
||||
(define-key map (kbd "4") 'magit-show-level-4)
|
||||
(define-key map (kbd "M-1") 'magit-show-level-1-all)
|
||||
(define-key map (kbd "M-2") 'magit-show-level-2-all)
|
||||
(define-key map (kbd "M-3") 'magit-show-level-3-all)
|
||||
(define-key map (kbd "M-4") 'magit-show-level-4-all)
|
||||
(define-key map (kbd "M-h") 'magit-show-only-files)
|
||||
(define-key map (kbd "M-H") 'magit-show-only-files-all)
|
||||
(define-key map (kbd "M-s") 'magit-show-level-4)
|
||||
(define-key map (kbd "M-S") 'magit-show-level-4-all)
|
||||
(define-key map (kbd "<M-left>") 'magit-goto-parent-section)
|
||||
(define-key map (kbd "g") 'magit-refresh)
|
||||
(define-key map (kbd "G") 'magit-refresh-all)
|
||||
(define-key map (kbd "?") 'magit-describe-item)
|
||||
(define-key map (kbd "!") 'magit-shell-command)
|
||||
(define-key map (kbd ":") 'magit-git-command)
|
||||
(define-key map (kbd "RET") 'magit-visit-item)
|
||||
(define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
|
||||
(define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
|
||||
(define-key map (kbd "C-w") 'magit-copy-item-as-kill)
|
||||
(define-key map (kbd "R") 'magit-rebase-step)
|
||||
(define-key map (kbd "t") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'tagging)))
|
||||
(define-key map (kbd "r") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'rewriting)))
|
||||
(define-key map (kbd "P") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'pushing)))
|
||||
(define-key map (kbd "f") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'fetching)))
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "F") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'pulling)))
|
||||
(define-key map (kbd "l") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'logging)))
|
||||
(define-key map (kbd "$") 'magit-display-process)
|
||||
(define-key map (kbd "c") 'magit-log-edit)
|
||||
(define-key map (kbd "E") 'magit-interactive-rebase)
|
||||
(define-key map (kbd "q") 'quit-window)
|
||||
map))
|
||||
|
||||
(defvar magit-commit-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
map))
|
||||
|
||||
(defvar magit-status-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "-") 'magit-diff-smaller-hunks)
|
||||
(define-key map (kbd "+") 'magit-diff-larger-hunks)
|
||||
(define-key map (kbd "0") 'magit-diff-default-hunks)
|
||||
(define-key map (kbd "s") 'magit-stage-item)
|
||||
(define-key map (kbd "S") 'magit-stage-all)
|
||||
(define-key map (kbd "u") 'magit-unstage-item)
|
||||
(define-key map (kbd "U") 'magit-unstage-all)
|
||||
(define-key map (kbd "i") 'magit-ignore-item)
|
||||
(define-key map (kbd "I") 'magit-ignore-item-locally)
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "m") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'merging)))
|
||||
(define-key map (kbd "k") 'magit-discard-item)
|
||||
(define-key map (kbd "e") 'magit-interactive-resolve-item)
|
||||
(define-key map (kbd "C") 'magit-add-log)
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
(define-key map (kbd "X") 'magit-reset-working-tree)
|
||||
(define-key map (kbd "z") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'stashing)))
|
||||
map))
|
||||
|
||||
(defvar magit-stash-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "-") 'magit-diff-smaller-hunks)
|
||||
(define-key map (kbd "+") 'magit-diff-larger-hunks)
|
||||
(define-key map (kbd "0") 'magit-diff-default-hunks)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
map))
|
||||
|
||||
(defvar magit-log-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "m") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'merging)))
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
(define-key map (kbd "e") 'magit-log-show-more-entries)
|
||||
(define-key map (kbd "l") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'logging)))
|
||||
map))
|
||||
|
||||
(defvar magit-reflog-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
map))
|
||||
|
||||
(defvar magit-diff-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "-") 'magit-diff-smaller-hunks)
|
||||
(define-key map (kbd "+") 'magit-diff-larger-hunks)
|
||||
(define-key map (kbd "0") 'magit-diff-default-hunks)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
map))
|
||||
|
||||
(defvar magit-wazzup-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "m") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'merging)))
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
(define-key map (kbd "i") 'magit-ignore-item)
|
||||
map))
|
||||
|
||||
(defvar magit-key-mode-key-maps '()
|
||||
"This will be filled lazily with proper `define-key' built
|
||||
keymaps as they're reqeusted.")
|
||||
|
|
|
|||
189
magit.el
189
magit.el
|
|
@ -349,6 +349,177 @@ Many Magit faces inherit from this one by default."
|
|||
"Face for selected options on magit's menu"
|
||||
:group 'magit)
|
||||
|
||||
(defvar magit-mode-map
|
||||
(let ((map (make-keymap)))
|
||||
(suppress-keymap map t)
|
||||
(define-key map (kbd "n") 'magit-goto-next-section)
|
||||
(define-key map (kbd "p") 'magit-goto-previous-section)
|
||||
(define-key map (kbd "TAB") 'magit-toggle-section)
|
||||
(define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
|
||||
(define-key map (kbd "1") 'magit-show-level-1)
|
||||
(define-key map (kbd "2") 'magit-show-level-2)
|
||||
(define-key map (kbd "3") 'magit-show-level-3)
|
||||
(define-key map (kbd "4") 'magit-show-level-4)
|
||||
(define-key map (kbd "M-1") 'magit-show-level-1-all)
|
||||
(define-key map (kbd "M-2") 'magit-show-level-2-all)
|
||||
(define-key map (kbd "M-3") 'magit-show-level-3-all)
|
||||
(define-key map (kbd "M-4") 'magit-show-level-4-all)
|
||||
(define-key map (kbd "M-h") 'magit-show-only-files)
|
||||
(define-key map (kbd "M-H") 'magit-show-only-files-all)
|
||||
(define-key map (kbd "M-s") 'magit-show-level-4)
|
||||
(define-key map (kbd "M-S") 'magit-show-level-4-all)
|
||||
(define-key map (kbd "<M-left>") 'magit-goto-parent-section)
|
||||
(define-key map (kbd "g") 'magit-refresh)
|
||||
(define-key map (kbd "G") 'magit-refresh-all)
|
||||
(define-key map (kbd "?") 'magit-describe-item)
|
||||
(define-key map (kbd "!") 'magit-shell-command)
|
||||
(define-key map (kbd ":") 'magit-git-command)
|
||||
(define-key map (kbd "RET") 'magit-visit-item)
|
||||
(define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
|
||||
(define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
|
||||
(define-key map (kbd "C-w") 'magit-copy-item-as-kill)
|
||||
(define-key map (kbd "R") 'magit-rebase-step)
|
||||
(define-key map (kbd "t") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'tagging)))
|
||||
(define-key map (kbd "r") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'rewriting)))
|
||||
(define-key map (kbd "P") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'pushing)))
|
||||
(define-key map (kbd "f") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'fetching)))
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "F") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'pulling)))
|
||||
(define-key map (kbd "l") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'logging)))
|
||||
(define-key map (kbd "$") 'magit-display-process)
|
||||
(define-key map (kbd "c") 'magit-log-edit)
|
||||
(define-key map (kbd "E") 'magit-interactive-rebase)
|
||||
(define-key map (kbd "q") 'quit-window)
|
||||
map))
|
||||
|
||||
(defvar magit-commit-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
map))
|
||||
|
||||
(defvar magit-status-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "-") 'magit-diff-smaller-hunks)
|
||||
(define-key map (kbd "+") 'magit-diff-larger-hunks)
|
||||
(define-key map (kbd "0") 'magit-diff-default-hunks)
|
||||
(define-key map (kbd "s") 'magit-stage-item)
|
||||
(define-key map (kbd "S") 'magit-stage-all)
|
||||
(define-key map (kbd "u") 'magit-unstage-item)
|
||||
(define-key map (kbd "U") 'magit-unstage-all)
|
||||
(define-key map (kbd "i") 'magit-ignore-item)
|
||||
(define-key map (kbd "I") 'magit-ignore-item-locally)
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "m") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'merging)))
|
||||
(define-key map (kbd "k") 'magit-discard-item)
|
||||
(define-key map (kbd "e") 'magit-interactive-resolve-item)
|
||||
(define-key map (kbd "C") 'magit-add-log)
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
(define-key map (kbd "X") 'magit-reset-working-tree)
|
||||
(define-key map (kbd "z") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'stashing)))
|
||||
map))
|
||||
|
||||
(defvar magit-stash-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "-") 'magit-diff-smaller-hunks)
|
||||
(define-key map (kbd "+") 'magit-diff-larger-hunks)
|
||||
(define-key map (kbd "0") 'magit-diff-default-hunks)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
map))
|
||||
|
||||
(defvar magit-log-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "m") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'merging)))
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
(define-key map (kbd "e") 'magit-log-show-more-entries)
|
||||
(define-key map (kbd "l") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'logging)))
|
||||
map))
|
||||
|
||||
(defvar magit-reflog-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
map))
|
||||
|
||||
(defvar magit-diff-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd "-") 'magit-diff-smaller-hunks)
|
||||
(define-key map (kbd "+") 'magit-diff-larger-hunks)
|
||||
(define-key map (kbd "0") 'magit-diff-default-hunks)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
map))
|
||||
|
||||
(defvar magit-wazzup-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(define-key map (kbd ".") 'magit-mark-item)
|
||||
(define-key map (kbd "=") 'magit-diff-with-mark)
|
||||
(define-key map (kbd "d") 'magit-diff-working-tree)
|
||||
(define-key map (kbd "D") 'magit-diff)
|
||||
(define-key map (kbd "a") 'magit-apply-item)
|
||||
(define-key map (kbd "A") 'magit-cherry-pick-item)
|
||||
(define-key map (kbd "v") 'magit-revert-item)
|
||||
(define-key map (kbd "b") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'branching)))
|
||||
(define-key map (kbd "m") (lambda ()
|
||||
(interactive)
|
||||
(magit-key-mode 'merging)))
|
||||
(define-key map (kbd "x") 'magit-reset-head)
|
||||
(define-key map (kbd "i") 'magit-ignore-item)
|
||||
map))
|
||||
|
||||
;;; Macros
|
||||
|
||||
(defmacro magit-with-refresh (&rest body)
|
||||
|
|
@ -3144,16 +3315,14 @@ Prefix arg means justify as well."
|
|||
(magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
|
||||
(magit-run-git "tag" name rev))
|
||||
|
||||
;; (magit-define-command annotated-tag (name rev)
|
||||
;; "Start composing an annotated tag with the given NAME.
|
||||
;; Tag will point to the current 'HEAD'."
|
||||
;; (interactive
|
||||
;; (list
|
||||
;; (read-string "Tag name: ")
|
||||
;; (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
|
||||
;; (magit-log-edit-set-field 'tag-name name)
|
||||
;; (magit-log-edit-set-field 'tag-rev rev)
|
||||
;; (magit-pop-to-log-edit "tag"))
|
||||
(magit-define-command annotated-tag (name rev)
|
||||
"Start composing an annotated tag with the given NAME.
|
||||
Tag will point to the current 'HEAD'."
|
||||
(interactive
|
||||
(list
|
||||
(read-string "Tag name: ")
|
||||
(magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
|
||||
(magit-pop-to-log-edit 'tag))
|
||||
|
||||
;;; Stashing
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue