From: Karl Heuer Date: Thu, 4 Jan 1996 23:33:39 +0000 (+0000) Subject: (ediff-keep-variants): Doc fix. X-Git-Tag: emacs-19.34~1883 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ceb0ea8ba63637edcb18735c31770c2c103332db;p=emacs.git (ediff-keep-variants): Doc fix. --- diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 41900194b6a..c48a042d3f0 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -519,7 +519,7 @@ Actually, Ediff restores the scope of visibility that existed at startup.") (defvar ediff-keep-variants t "*Nil means that non-modified variant buffers should be removed after some interrogation. -Supplying a prefix agument to the quit command `q' temporarily reverses the +Supplying a prefix argument to the quit command `q' temporarily reverses the meaning of this variable.") (ediff-defvar-local ediff-highlight-all-diffs t @@ -1283,7 +1283,7 @@ More precisely, a regexp to match any one such character.") ;; If ediff-grab-mouse = t, then mouse won't be grabbed for ;; sessions that are not part of a group (this is done in ;; ediff-recenter). The condition below affects only terminating - ;; sessions in session groups (in whhich case mouse is warped into + ;; sessions in session groups (in which case mouse is warped into ;; a meta buffer). (and (eq ediff-grab-mouse 'maybe) (memq this-command '(ediff-quit ediff-update-diffs))) @@ -1307,10 +1307,10 @@ More precisely, a regexp to match any one such character.") (cdr (cdr (mouse-pixel-position)))) (not (and (< (abs (- (car (cdr ediff-mouse-pixel-position)) (car (cdr (mouse-pixel-position))))) - ediff-mouse-pixel-threshhold) + ediff-mouse-pixel-threshold) (< (abs (- (cdr (cdr ediff-mouse-pixel-position)) (cdr (cdr (mouse-pixel-position))))) - ediff-mouse-pixel-threshhold)))) + ediff-mouse-pixel-threshold)))) (t nil)))) (defsubst ediff-frame-char-height (frame)