(ediff-setup-keymap): Bind f1 and help like C-h.

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index a3822016d68d9ac17d8af1eaa75817952555c2c2..d12d19f1f02fac6c0da858bac7ad32c9c7a88b91 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -105,6 +105,10 @@ to invocation.")
   (define-key ediff-mode-map [delete] 'ediff-previous-difference)
   (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer
                                        'ediff-previous-difference nil))
+  (define-key ediff-mode-map [f1] (if ediff-no-emacs-help-in-control-buffer
+                                     'ediff-previous-difference nil))
+  (define-key ediff-mode-map [help] (if ediff-no-emacs-help-in-control-buffer
+                                       'ediff-previous-difference nil))
   (define-key ediff-mode-map "n" 'ediff-next-difference)
   (define-key ediff-mode-map " " 'ediff-next-difference)
   (define-key ediff-mode-map "j" 'ediff-jump-to-difference)