summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-01-04 23:33:39 +0000
committerKarl Heuer <kwzh@gnu.org>1996-01-04 23:33:39 +0000
commitceb0ea8ba63637edcb18735c31770c2c103332db (patch)
tree4e5e8bc20aec5163ffca9899b9848857fdac58c2 /lisp/ediff-init.el
parent48cd5ae92d35b8934533ae921e3c1979c6b60854 (diff)
downloademacs-ceb0ea8ba63637edcb18735c31770c2c103332db.tar.gz
(ediff-keep-variants): Doc fix.
Diffstat (limited to 'lisp/ediff-init.el')
-rw-r--r--lisp/ediff-init.el8
1 files changed, 4 insertions, 4 deletions
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)