(menu-bar-help-menu): Add menu item for non-English

[gnu-emacs] / lisp / time.el

diff --git a/lisp/time.el b/lisp/time.el
index 9bb6dece6fb5a6efe24ff84cc830dfc856960980..de8b2ce06b53570a0269d23a27ee64cb08835dda 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,4 +1,4 @@
-;;; time.el --- display time and load in mode line of Emacs.
+;;; time.el --- display time, load and mail indicator in mode line of Emacs.
 
 ;; Copyright (C) 1985, 86, 87, 93, 94, 96, 2000 Free Software Foundation, Inc.
 
@@ -52,7 +52,8 @@ use either \\[customize] or the function `display-time-mode'."
   "*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
 default, which is system-dependent, and is the same as used by Rmail."
-  :type '(choice (const :tag "Default" nil)
+  :type '(choice (const :tag "(None)" none)
+                (const :tag "Default" nil)
                 (file :format "%v"))
   :group 'display-time)
 
@@ -131,6 +132,28 @@ This runs the normal hook `display-time-hook' after each update."
       (remove-hook 'rmail-after-get-new-mail-hook
                   'display-time-event-handler))))
 
+(defcustom display-time-mail-face 'mode-line
+  "Face to use for `display-time-mail-string'.
+If `display-time-use-mail-icon' is non-nil, the image's background
+colour is the background of this face.  Set this to a face other than
+`mode-line' to make the mail indicator stand out on a suitable
+display."
+  :group 'faces
+  :group 'display-time
+  :type 'face)
+
+(defvar display-time-mail-icon
+  (find-image '((:type xbm :file "letter.xbm" :ascent center)))
+  "Image specification to offer as the mail indicator on a graphic
+display.  See `display-time-use-mail-icon' and
+`display-time-mail-face'.")
+
+(defcustom display-time-use-mail-icon nil
+  "Non-nil means use an icon as the mail indicator on a graphic display.
+Otherwise use the string \"Mail\".  The icon may consume less of the
+mode line.  It is specified by `display-time-mail-icon'."
+  :group 'display-time
+  :type 'boolean)
 
 (defcustom display-time-format nil
   "*A string specifying the format for displaying the time in the mode line.
@@ -142,19 +165,26 @@ depend on `display-time-day-and-date' and `display-time-24hr-format'."
   :group 'display-time)
 
 (defcustom display-time-string-forms
-  `((if (and (not display-time-format) display-time-day-and-date)
+  '((if (and (not display-time-format) display-time-day-and-date)
        (format-time-string "%a %b %e " now)
       "")
     (format-time-string (or display-time-format
                            (if display-time-24hr-format "%H:%M" "%-I:%M%p"))
                        now)
     load
-    (if mail ,(propertize " Mail"
-                         'help-echo "mouse-2: Read mail"
-                         'local-map (make-mode-line-mouse2-map
-                                     (lambda (e)
-                                       (interactive "e")
-                                       (funcall read-mail-command))))
+    (if mail
+       ;; Build the string every time to act on customization.
+       (concat " "
+               (propertize
+                "Mail"
+                'display `(when (and display-time-use-mail-icon
+                                     (display-graphic-p))
+                            ,@display-time-mail-icon
+                            ,@(list :background (face-attribute
+                                                 display-time-mail-face
+                                                 :background)))
+                'help-echo "mouse-2: Read mail"
+                'local-map (make-mode-line-mouse2-map read-mail-command)))
       ""))
   "*A list of expressions governing display of the time in the mode line.
 For most purposes, you can control the time format using `display-time-format'
@@ -210,7 +240,7 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
         (time (current-time-string now))
          (load (condition-case ()
                    (if (zerop (car (load-average))) ""
-                    ;; The load average number is myterious, so
+                    ;; The load average number is mysterious, so
                     ;; propvide some help.
                      (let ((str (format " %03d" (car (load-average)))))
                       (propertize