diff options
| author | Roland McGrath <roland@gnu.org> | 1991-05-09 21:50:34 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1991-05-09 21:50:34 +0000 |
| commit | fbd81ad3176ea1e701b1bd0dcec4efe763249353 (patch) | |
| tree | d43014b01a2cc445a662f0353e0dc684c2438c31 /lisp/time.el | |
| parent | 082a12c3e1ef948e767ef5e705f752e4ff22aeda (diff) | |
| download | emacs-fbd81ad3176ea1e701b1bd0dcec4efe763249353.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/time.el')
| -rw-r--r-- | lisp/time.el | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/lisp/time.el b/lisp/time.el index 8a1f37f8e18..fe29ca567df 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -22,6 +22,10 @@ "*File name of mail inbox file, for indicating existence of new mail. Default is system-dependent, and is the same as used by Rmail.") +;;;###autoload +(defconst display-time-day-and-date nil "\ +*Non-nil means \\[display-time] should display day and date as well as time.") + (defvar display-time-process nil) (defvar display-time-interval 60 @@ -32,6 +36,7 @@ Default is system-dependent, and is the same as used by Rmail.") (defvar display-time-hook nil "* List of functions to be called when the time is updated on the mode line.") +;;;###autoload (defun display-time () "Display current time and load level in mode line of each buffer. Updates automatically every minute. @@ -52,7 +57,7 @@ After each update, `display-time-hook' is run with `run-hooks'." (setq display-time-string "") (setq display-time-process (start-process "display-time" nil - "wakeup" + (concat exec-directory "wakeup") (int-to-string display-time-interval))) (process-kill-without-query display-time-process) (set-process-sentinel display-time-process 'display-time-sentinel) @@ -68,7 +73,10 @@ After each update, `display-time-hook' is run with `run-hooks'." (defun display-time-filter (proc string) (let ((time (current-time-string)) - (load (format "%03d" (car (load-average)))) + (load (condition-case () + (if (zerop (car (load-average))) "" + (format "%03d" (car (load-average)))) + (error ""))) (mail-spool-file (or display-time-mail-file (getenv "MAIL") (concat rmail-spool-directory @@ -88,7 +96,7 @@ After each update, `display-time-hook' is run with `run-hooks'." (substring load 0 -2) "." (substring load -2) (if (and (file-exists-p mail-spool-file) ;; file not empty? - (> (nth 7 (file-attributes mail-spool-file)) 0)) + (display-time-file-nonempty-p mail-spool-file)) " Mail" ""))) ;; Append the date if desired. @@ -101,3 +109,8 @@ After each update, `display-time-hook' is run with `run-hooks'." (set-buffer-modified-p (buffer-modified-p)) ;; Do redisplay right now, if no input pending. (sit-for 0)) + +(defun display-time-file-nonempty-p (file) + (while (file-symlink-p file) + (setq file (file-symlink-p file))) + (> (nth 7 (file-attributes file)) 0)) |