aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/foldout.el6
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7000437615..bdec771f6e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
12009-10-17 Glenn Morris <rgm@gnu.org> 12009-10-17 Glenn Morris <rgm@gnu.org>
2 2
3 * foldout.el (foldout-mouse-swallow-events):
3 * gs.el (gs-load-image): Replace obsolete forms of sit-for, sleep-for. 4 * gs.el (gs-load-image): Replace obsolete forms of sit-for, sleep-for.
4 5
5 * dired.el (dired-ls-F-marks-symlinks, dired-keep-marker-rename) 6 * dired.el (dired-ls-F-marks-symlinks, dired-keep-marker-rename)
diff --git a/lisp/foldout.el b/lisp/foldout.el
index e09a693c631..f56d0d42067 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -1,7 +1,7 @@
1;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode 1;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
2 2
3;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 3;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk> 6;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
7;; Maintainer: FSF 7;; Maintainer: FSF
@@ -495,7 +495,7 @@ What happens depends on the number of mouse clicks:-
495 "Swallow intervening mouse events so we only get the final click-count. 495 "Swallow intervening mouse events so we only get the final click-count.
496Signal an error if the final event isn't the same type as the first one." 496Signal an error if the final event isn't the same type as the first one."
497 (let ((initial-event-type (event-basic-type event))) 497 (let ((initial-event-type (event-basic-type event)))
498 (while (null (sit-for 0 double-click-time 'nodisplay)) 498 (while (null (sit-for (/ double-click-time 1000.0) 'nodisplay))
499 (setq event (read-event))) 499 (setq event (read-event)))
500 (or (eq initial-event-type (event-basic-type event)) 500 (or (eq initial-event-type (event-basic-type event))
501 (error ""))) 501 (error "")))