aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-08-09 14:49:36 -0400
committerStefan Monnier2013-08-09 14:49:36 -0400
commit0ea9e53aa950f9cd88d0350deec813036fa33f6c (patch)
tree75368e84636431f22382d68b2f7fa5638d4f1371
parent309f24d1ec07646fb1a090ee10fe456e79aea097 (diff)
downloademacs-0ea9e53aa950f9cd88d0350deec813036fa33f6c.tar.gz
emacs-0ea9e53aa950f9cd88d0350deec813036fa33f6c.zip
* lisp/time.el (display-time-event-handler)
(display-time-next-load-average): Don't call sit-for since it seems unnecessary. Fixes: debbugs:15045
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/time.el5
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 717deedcee4..122634d144c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12013-08-09 Stefan Monnier <monnier@iro.umontreal.ca> 12013-08-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * time.el (display-time-event-handler)
4 (display-time-next-load-average): Don't call sit-for since it seems
5 unnecessary (bug#15045).
6
3 * emacs-lisp/checkdoc.el: Remove redundant :group keywords. 7 * emacs-lisp/checkdoc.el: Remove redundant :group keywords.
4 Use #' instead of ' to quote functions. 8 Use #' instead of ' to quote functions.
5 (checkdoc-output-mode): Use setq-local. 9 (checkdoc-output-mode): Use setq-local.
diff --git a/lisp/time.el b/lisp/time.el
index 4b5ecf16be1..7e558746c6a 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -323,8 +323,6 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
323 323
324(defun display-time-event-handler () 324(defun display-time-event-handler ()
325 (display-time-update) 325 (display-time-update)
326 ;; Do redisplay right now, if no input pending.
327 (sit-for 0)
328 (let* ((current (current-time)) 326 (let* ((current (current-time))
329 (timer display-time-timer) 327 (timer display-time-timer)
330 ;; Compute the time when this timer will run again, next. 328 ;; Compute the time when this timer will run again, next.
@@ -352,8 +350,7 @@ Switches from the 1 to 5 to 15 minute load average, and then back to 1."
352 (interactive) 350 (interactive)
353 (if (= 3 (setq display-time-load-average (1+ display-time-load-average))) 351 (if (= 3 (setq display-time-load-average (1+ display-time-load-average)))
354 (setq display-time-load-average 0)) 352 (setq display-time-load-average 0))
355 (display-time-update) 353 (display-time-update))
356 (sit-for 0))
357 354
358(defun display-time-mail-check-directory () 355(defun display-time-mail-check-directory ()
359 (let ((mail-files (directory-files display-time-mail-directory t)) 356 (let ((mail-files (directory-files display-time-mail-directory t))