aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-util.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index a3822016d68..d12d19f1f02 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -105,6 +105,10 @@ to invocation.")
105 (define-key ediff-mode-map [delete] 'ediff-previous-difference) 105 (define-key ediff-mode-map [delete] 'ediff-previous-difference)
106 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer 106 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer
107 'ediff-previous-difference nil)) 107 'ediff-previous-difference nil))
108 (define-key ediff-mode-map [f1] (if ediff-no-emacs-help-in-control-buffer
109 'ediff-previous-difference nil))
110 (define-key ediff-mode-map [help] (if ediff-no-emacs-help-in-control-buffer
111 'ediff-previous-difference nil))
108 (define-key ediff-mode-map "n" 'ediff-next-difference) 112 (define-key ediff-mode-map "n" 'ediff-next-difference)
109 (define-key ediff-mode-map " " 'ediff-next-difference) 113 (define-key ediff-mode-map " " 'ediff-next-difference)
110 (define-key ediff-mode-map "j" 'ediff-jump-to-difference) 114 (define-key ediff-mode-map "j" 'ediff-jump-to-difference)