(quail-update-leim-list-file): Fix message syntax.

[gnu-emacs] / lisp / time.el

diff --git a/lisp/time.el b/lisp/time.el
index ad94c2c4fab56b124594c937160092ad112e541e..d03b033884ad0ad144e1f5e96275510909119906 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -34,6 +34,18 @@
   :group 'mail)
 
 
+(defcustom display-time-mode nil
+  "Toggle display of time, load level, and mail flag in mode lines.
+You must modify via \\[customize] for this variable to have an effect."
+  :set (lambda (symbol value)
+        (display-time-mode (or value 0)))
+  :initialize 'custom-initialize-default
+  :type 'boolean
+  :group 'display-time
+  :require 'time
+  :version "20.3")
+
+
 (defcustom display-time-mail-file nil
   "*File name of mail inbox file, for indicating existence of new mail.
 Non-nil and not a string means don't check for mail.  nil means use
@@ -95,6 +107,7 @@ This runs the normal hook `display-time-hook' after each update."
   (let ((on (if (null arg)
                (not display-time-timer)
              (> (prefix-numeric-value arg) 0))))
+    (setq display-time-mode on)
     (and display-time-timer (cancel-timer display-time-timer))
     (setq display-time-timer nil)
     (setq display-time-string "")
@@ -241,6 +254,9 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
   (and (file-exists-p file)
        (< 0 (nth 7 (file-attributes (file-chase-links file))))))
 
+(if display-time-mode
+    (display-time-mode t))
+
 (provide 'time)
 
 ;;; time.el ends here