summaryrefslogtreecommitdiff
path: root/lisp/ediff-wind.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-01-04 23:07:38 +0000
committerKarl Heuer <kwzh@gnu.org>1996-01-04 23:07:38 +0000
commit33a153d427f34d09f9f190dd96224375348c3186 (patch)
treed74950ab0a4ee741b2f579f2f8dc5c40770454d6 /lisp/ediff-wind.el
parent31e1c3398cda86b2a340b212dfc4483397c70a20 (diff)
downloademacs-33a153d427f34d09f9f190dd96224375348c3186.tar.gz
(ediff-mouse-pixel-threshold): Renamed from
ediff-mouse-pixel-threshhold.
Diffstat (limited to 'lisp/ediff-wind.el')
-rw-r--r--lisp/ediff-wind.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 749ca89a4f5..733de52fdac 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -113,7 +113,7 @@ Do not specify width and height here. These are computed automatically.")
(ediff-defvar-local ediff-mouse-pixel-position nil "")
;; not used for now
-(defvar ediff-mouse-pixel-threshhold 30
+(defvar ediff-mouse-pixel-threshold 30
"If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.")
(defvar ediff-grab-mouse t
@@ -176,7 +176,7 @@ the frame used for the wide display.")
(defvar ediff-prefer-iconified-control-frame nil
"*If t, keep control panel iconified when help message is off.
This has effect only on a windowing system.
-If t, hiting `?' to toggle control panel off iconifies it.
+If t, hitting `?' to toggle control panel off iconifies it.
This is only useful in Emacs and only for certain kinds of window managers,
such as TWM and its derivatives, since the window manager must permit