aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1996-01-04 23:07:38 +0000
committerKarl Heuer1996-01-04 23:07:38 +0000
commit50893fe933d7a289ce2b89368a6daa1940202c2d (patch)
tree031344ecb3c6332ad9a9891af733c6269f5243a9
parentb31a42188c124748f03d73837c59949cd72083ba (diff)
downloademacs-50893fe933d7a289ce2b89368a6daa1940202c2d.tar.gz
emacs-50893fe933d7a289ce2b89368a6daa1940202c2d.zip
(ediff-mouse-pixel-threshold): Renamed from
ediff-mouse-pixel-threshhold.
-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.")
113(ediff-defvar-local ediff-mouse-pixel-position nil "") 113(ediff-defvar-local ediff-mouse-pixel-position nil "")
114 114
115;; not used for now 115;; not used for now
116(defvar ediff-mouse-pixel-threshhold 30 116(defvar ediff-mouse-pixel-threshold 30
117 "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.") 117 "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.")
118 118
119(defvar ediff-grab-mouse t 119(defvar ediff-grab-mouse t
@@ -176,7 +176,7 @@ the frame used for the wide display.")
176(defvar ediff-prefer-iconified-control-frame nil 176(defvar ediff-prefer-iconified-control-frame nil
177 "*If t, keep control panel iconified when help message is off. 177 "*If t, keep control panel iconified when help message is off.
178This has effect only on a windowing system. 178This has effect only on a windowing system.
179If t, hiting `?' to toggle control panel off iconifies it. 179If t, hitting `?' to toggle control panel off iconifies it.
180 180
181This is only useful in Emacs and only for certain kinds of window managers, 181This is only useful in Emacs and only for certain kinds of window managers,
182such as TWM and its derivatives, since the window manager must permit 182such as TWM and its derivatives, since the window manager must permit