(mouse-show-mark): Use temporary highlighting if possible instead of a pause.

[gnu-emacs] / lisp / time.el

diff --git a/lisp/time.el b/lisp/time.el
index af5cb03c347d01e8908984078bb4af92204c6e6f..473135d570020152c595b6bde1deb0cc14a6dd25 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,6 +1,6 @@
 ;;; time.el --- display time and load in mode line of Emacs.
 
-;; Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 87, 93, 94, 1996 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -63,18 +63,17 @@ If `display-time-day-and-date' is non-nil, the current day and date
 are displayed as well.
 After each update, `display-time-hook' is run with `run-hooks'."
   (interactive)
-  (require 'timer)
-  (if (timerp display-time-timer)
-      (cancel-timer display-time-timer)
-    (setq display-time-timer (timer-create)))
   (setq display-time-string "")
   (or global-mode-string (setq global-mode-string '("")))
   (or (memq 'display-time-string global-mode-string)
       (setq global-mode-string
            (append global-mode-string '(display-time-string))))
-  (timer-set-time display-time-timer (current-time) display-time-interval)
-  (timer-set-function display-time-timer 'display-time-event-handler)
-  (timer-activate display-time-timer))
+  ;; Setup the time timer.
+  (and display-time-timer (cancel-timer display-time-timer))
+  (setq display-time-timer
+       (run-at-time nil display-time-interval 'display-time-event-handler))
+  ;; When you get new mail, clear "Mail" from the mode line.
+  (add-hook 'rmail-after-get-new-mail-hook 'display-time-event-handler))
 
 (defvar display-time-string-forms
   '((if display-time-day-and-date
@@ -102,6 +101,15 @@ For example, the form
 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))
+
+;; Update the display-time info for the mode line
+;; but don't redisplay right now.  This is used for
+;; things like Rmail `g' that want to force an update
+;; which can wait for the next redisplay.
+(defun display-time-update ()
   (let* ((now (current-time))
         (time (current-time-string now))
          (load (condition-case ()
@@ -152,9 +160,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'.")
     ;; This is inside the let binding, but we are not going to document
     ;; what variables are available.
     (run-hooks 'display-time-hook))
-  (force-mode-line-update)
-  ;; Do redisplay right now, if no input pending.
-  (sit-for 0))
+  (force-mode-line-update))
 
 (defun display-time-file-nonempty-p (file)
   (and (file-exists-p file)