From 632878283393f22adc6aa645116c311375c58c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Vanicat?= Date: Fri, 9 Apr 2010 13:25:50 +0200 Subject: [PATCH] Moving apply, cherry-pick and revert function. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They all apply to hunk, commit and diff that are in status, stash, log, reflog, diff and wazzup buffers. Signed-off-by: Rémi Vanicat --- magit.el | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/magit.el b/magit.el index a7261f7d..fa6e8108 100644 --- a/magit.el +++ b/magit.el @@ -1365,9 +1365,6 @@ FUNC should leave point at the end of the modified region" (define-key map (kbd "L") 'magit-log-long) (define-key map (kbd "h") 'magit-reflog-head) (define-key map (kbd "H") 'magit-reflog) - (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) (define-key map (kbd "X") 'magit-reset-working-tree) (define-key map (kbd "k") 'magit-discard-item) @@ -1426,6 +1423,9 @@ FUNC should leave point at the end of the modified region" (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) map)) (defvar magit-stash-mode-map @@ -1433,6 +1433,9 @@ FUNC should leave point at the end of the modified region" (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 @@ -1441,6 +1444,9 @@ FUNC should leave point at the end of the modified region" (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) map)) (defvar magit-reflog-mode-map @@ -1449,6 +1455,9 @@ FUNC should leave point at the end of the modified region" (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) map)) (defvar magit-diff-mode-map @@ -1456,6 +1465,9 @@ FUNC should leave point at the end of the modified region" (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 @@ -1464,6 +1476,9 @@ FUNC should leave point at the end of the modified region" (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) map)) (easy-menu-define magit-mode-menu magit-mode-map