Merge from emacs-24; up to 2013-01-02T16:37:04Z!eggert@cs.ucla.edu

[gnu-emacs] / lisp / time.el

diff --git a/lisp/time.el b/lisp/time.el
index a3bbee0c893fce4e67e1d82f9fc8b696dd1f6684..7e558746c6ad49a5a939f1be1d8a35424b8c4763 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,7 +1,7 @@
 ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
 
-;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2013 Free Software
+;; Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -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))