;;; 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-2014 Free Software
+;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
;; This file is part of GNU Emacs.
(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.
(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))
;; 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))
+ (force-mode-line-update 'all))
(defun display-time-file-nonempty-p (file)
(let ((remote-file-name-inhibit-cache (- display-time-interval 5)))
(setenv "TZ" old-tz))
(setq fmt (concat "%-" (int-to-string max-width) "s %s\n"))
(dolist (timedata (nreverse result))
- (insert (format fmt (car timedata) (cdr timedata)))))
- (delete-char -1))
+ (insert (format fmt (car timedata) (cdr timedata))))
+ (delete-char -1)))
;;;###autoload
(defun display-time-world ()
(run-at-time t display-time-world-timer-second 'display-time-world-timer))
(with-current-buffer (get-buffer-create display-time-world-buffer-name)
(display-time-world-display display-time-world-list)
- (display-buffer display-time-world-buffer-name)
+ (display-buffer display-time-world-buffer-name
+ (cons nil '((window-height . fit-window-to-buffer))))
(display-time-world-mode)))
(defun display-time-world-timer ()