emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/diff-hl 40c89a7: Revert "Make diff-hl-show-hunk's key b


From: ELPA Syncer
Subject: [elpa] externals/diff-hl 40c89a7: Revert "Make diff-hl-show-hunk's key bindings more consistent with the base set"
Date: Wed, 8 Sep 2021 22:57:10 -0400 (EDT)

branch: externals/diff-hl
commit 40c89a7b0d2590b1e094128f3f1d6dc87bf14ce9
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Revert "Make diff-hl-show-hunk's key bindings more consistent with the base 
set"
    
    This reverts commit 983366cb40923df23dd26ab38f616a1791094653.
---
 diff-hl-show-hunk-posframe.el | 4 +++-
 diff-hl-show-hunk.el          | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/diff-hl-show-hunk-posframe.el b/diff-hl-show-hunk-posframe.el
index 16de180..ba77151 100644
--- a/diff-hl-show-hunk-posframe.el
+++ b/diff-hl-show-hunk-posframe.el
@@ -91,8 +91,10 @@ Customize it to change the base properties of the text.")
     (define-key map [escape]    #'diff-hl-show-hunk-hide)
     (define-key map (kbd "q")   #'diff-hl-show-hunk-hide)
     (define-key map (kbd "C-g") #'diff-hl-show-hunk-hide)
+    (define-key map (kbd "p")   #'diff-hl-show-hunk-previous)
+    (define-key map (kbd "n")   #'diff-hl-show-hunk-next)
     (define-key map (kbd "c")   #'diff-hl-show-hunk-copy-original-text)
-    (define-key map (kbd "n")   #'diff-hl-show-hunk-revert-hunk)
+    (define-key map (kbd "r")   #'diff-hl-show-hunk-revert-hunk)
     (define-key map (kbd "[")   #'diff-hl-show-hunk-previous)
     (define-key map (kbd "]")   #'diff-hl-show-hunk-next)
     (define-key map (kbd "{")   #'diff-hl-show-hunk-previous)
diff --git a/diff-hl-show-hunk.el b/diff-hl-show-hunk.el
index 10473da..d9b76ac 100644
--- a/diff-hl-show-hunk.el
+++ b/diff-hl-show-hunk.el
@@ -212,8 +212,10 @@ Returns a list with the buffer and the line number of the 
clicked line."
 
 (defvar diff-hl-show-hunk--inline-popup-map
   (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "p") #'diff-hl-show-hunk-previous)
+    (define-key map (kbd "n") #'diff-hl-show-hunk-next)
     (define-key map (kbd "c") #'diff-hl-show-hunk-copy-original-text)
-    (define-key map (kbd "n") #'diff-hl-show-hunk-revert-hunk)
+    (define-key map (kbd "r") #'diff-hl-show-hunk-revert-hunk)
     (define-key map (kbd "[") #'diff-hl-show-hunk-previous)
     (define-key map (kbd "]") #'diff-hl-show-hunk-next)
     (define-key map (kbd "{") #'diff-hl-show-hunk-previous)
@@ -271,7 +273,7 @@ BUFFER is a buffer with the hunk."
          (if (and (boundp 'diff-hl-reference-revision) 
diff-hl-reference-revision)
              (concat "Diff with " diff-hl-reference-revision)
            "Diff with HEAD")
-         "(q)Quit  (\[)Previous  (\])Next  (n)Revert  (c)Copy original"
+         "(q)Quit  (p)Previous  (n)Next  (r)Revert  (c)Copy original"
          diff-hl-show-hunk--inline-popup-map
          #'diff-hl-show-hunk-hide
          point



reply via email to

[Prev in Thread] Current Thread [Next in Thread]