summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1994-05-11 04:51:02 +0000
committerKarl Heuer <kwzh@gnu.org>1994-05-11 04:51:02 +0000
commit6c8e7870c9d05830f0ebd6f4afc2140eceba725a (patch)
tree188e5397d5977855aac73bf018e501f661218e51 /lisp/ediff.el
parentb89a58f79d9fbd0f749f134e5756ce806aad52b5 (diff)
downloademacs-6c8e7870c9d05830f0ebd6f4afc2140eceba725a.tar.gz
(ediff-no-help-in-control-buffer): Renamed from
ediff-nix-help-in-control-buffer, to match doc and usage.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index e7846035858..871af29acd4 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1417,8 +1417,8 @@ these buffers.")
(defvar ediff-use-last-dir nil
"*If t, Ediff uses previous directory as default when reading file name.")
-(defvar ediff-nix-help-in-control-buffer nil
- "*Non-nil mean C-h should not to invoke Emacs help.
+(defvar ediff-no-help-in-control-buffer nil
+ "*Non-nil mean C-h should not invoke Emacs help.
Instead, C-h jumps to previous difference.")
(defvar ediff-temp-file-prefix