diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/time.el | 5 |
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 @@ 2013-08-09 Stefan Monnier <monnier@iro.umontreal.ca> + * time.el (display-time-event-handler) + (display-time-next-load-average): Don't call sit-for since it seems + unnecessary (bug#15045). + * emacs-lisp/checkdoc.el: Remove redundant :group keywords. Use #' instead of ' to quote functions. (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)'." (defun display-time-event-handler () (display-time-update) - ;; Do redisplay right now, if no input pending. - (sit-for 0) (let* ((current (current-time)) (timer display-time-timer) ;; 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." (interactive) (if (= 3 (setq display-time-load-average (1+ display-time-load-average))) (setq display-time-load-average 0)) - (display-time-update) - (sit-for 0)) + (display-time-update)) (defun display-time-mail-check-directory () (let ((mail-files (directory-files display-time-mail-directory t)) |