[Emacs-diffs] Changes to emacs/lisp/time.el

[Dave Love]

Index: emacs/lisp/time.el
diff -c emacs/lisp/time.el:1.77 emacs/lisp/time.el:1.78
*** emacs/lisp/time.el:1.77     Fri Feb 14 02:01:28 2003
--- emacs/lisp/time.el  Tue Apr  1 13:03:13 2003
***************
*** 1,6 ****
! ;;; time.el --- display time, load and mail indicator in mode line of Emacs
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 96, 2000, 2001, 2002
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,6 ----
! ;;; time.el --- display time, load and mail indicator in mode line of Emacs 
-*-coding: utf-8 -*-
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 96, 2000, 2001, 2002, 2003
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 62,68 ****
    :group 'display-time)
  
  (defcustom display-time-default-load-average 0
!   "*Which load-average value will be shown in the mode line.
  Almost every system can provide values of load for past 1 minute, past 5 or
  past 15 minutes.  The default is to display 1 minute load average."
    :type '(choice (const :tag "1 minute load" 0)
--- 62,68 ----
    :group 'display-time)
  
  (defcustom display-time-default-load-average 0
!   "*Which load average value will be shown in the mode line.
  Almost every system can provide values of load for past 1 minute, past 5 or
  past 15 minutes.  The default is to display 1 minute load average."
    :type '(choice (const :tag "1 minute load" 0)
***************
*** 72,78 ****
    :group 'display-time)
  
  (defvar display-time-load-average nil
!   "Load average currently being shown in mode line")
  
  (defcustom display-time-load-average-threshold 0.1
    "*Load-average values below this value won't be shown in the mode line."
--- 72,78 ----
    :group 'display-time)
  
  (defvar display-time-load-average nil
!   "Load average currently being shown in mode line.")
  
  (defcustom display-time-load-average-threshold 0.1
    "*Load-average values below this value won't be shown in the mode line."
***************
*** 119,148 ****
    (interactive)
    (display-time-mode 1))
  
! (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 xpm :file "letter.xpm" :ascent center)
!               (: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.
  See the function `format-time-string' for an explanation of
--- 119,165 ----
    (interactive)
    (display-time-mode 1))
  
! ;; This business used to be simpler when all mode lines had the same
! ;; face and the image could just be pbm.  Now we try to rely on an xpm
! ;; image with a transparent background.  Otherwise, set the background
! ;; for pbm.
! 
! (defcustom display-time-mail-face nil
    "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
! make the mail indicator stand out on a colour display."
    :group 'faces
    :group 'display-time
!   :version "21.4"
!   :type '(choice (const :tag "None" nil) face))
  
  (defvar display-time-mail-icon
    (find-image '((:type xpm :file "letter.xpm" :ascent center)
!               (:type pbm :file "letter.pbm" :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'.")
  
+ ;; Fixme: Default to icon on graphical display?
  (defcustom display-time-use-mail-icon nil
    "Non-nil means use an icon as the mail indicator on a graphic display.
! Otherwise use `display-time-mail-string'.  The icon may consume less
! of the mode line.  It is specified by `display-time-mail-icon'."
    :group 'display-time
    :type 'boolean)
  
+ ;; Fixme: maybe default to the character if we can display Unicode.
+ (defcustom display-time-mail-string "Mail"
+   "String to use as the mail indicator in `display-time-string-forms'.
+ This can use the Unicode letter character if you can display it."
+   :group 'display-time
+   :version "21.4"
+   :type '(choice (const "Mail")
+                ;; Use :tag here because the Lucid menu won't display
+                ;; multibyte text.
+                (const :tag "Unicode letter character" "✉")
+                string))
+ 
  (defcustom display-time-format nil
    "*A string specifying the format for displaying the time in the mode line.
  See the function `format-time-string' for an explanation of
***************
*** 162,180 ****
      load
      (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)))
!                  'face display-time-mail-face
!                'help-echo "You have new mail; mouse-2: Read mail"
!                'local-map (make-mode-line-mouse-map 'mouse-2
!                                                     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'
--- 179,205 ----
      load
      (if mail
        ;; Build the string every time to act on customization.
!       ;; :set-after doesn't help for `customize-option'.  I think it
!       ;; should.
!       (concat
!        " "
!        (propertize
!         display-time-mail-string
!         'display `(when (and display-time-use-mail-icon
!                              (display-graphic-p))
!                     ,@display-time-mail-icon
!                     ,@(if (and display-time-mail-face
!                                (memq (plist-get (cdr display-time-mail-icon)
!                                                 :type)
!                                      '(pbm xbm)))
!                           (let ((bg (face-attribute display-time-mail-face
!                                                     :background)))
!                             (if (stringp bg)
!                                 (list :background bg)))))
!         'face display-time-mail-face
!         'help-echo "You have new mail; mouse-2: Read mail"
!         'local-map (make-mode-line-mouse-map 'mouse-2
!                                              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'
***************
*** 241,251 ****
        size
        nil)))
  
- ;; 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 (if (null display-time-load-average)
--- 266,277 ----
        size
        nil)))
  
  (defun display-time-update ()
+   "Update the display-time info for the mode line.
+ However, 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."
    (let* ((now (current-time))
         (time (current-time-string now))
           (load (if (null display-time-load-average)
***************
*** 258,274 ****
                         ""
                       ;; The load average number is mysterious, so
                       ;; provide some help.
!                      (let ((str (format " %03d" (nth 
display-time-load-average (load-average)))))
                         (propertize
                          (concat (substring str 0 -2) "." (substring str -2))
!                         'local-map (make-mode-line-mouse-map 'mouse-2
!                                                              
'display-time-next-load-average)
!                         'help-echo (concat "System load average for past "
!                                            (if (= 0 display-time-load-average)
!                                                "1 minute"
!                                              (if (= 1 
display-time-load-average)
!                                                  "5 minutes"
!                                                "15 minutes")) "; mouse-2: 
next" ))))
                   (error ""))))
           (mail-spool-file (or display-time-mail-file
                                (getenv "MAIL")
--- 284,304 ----
                         ""
                       ;; The load average number is mysterious, so
                       ;; provide some help.
!                      (let ((str (format " %03d"
!                                         (nth display-time-load-average
!                                              (load-average)))))
                         (propertize
                          (concat (substring str 0 -2) "." (substring str -2))
!                         'local-map (make-mode-line-mouse-map
!                                     'mouse-2 'display-time-next-load-average)
!                         'help-echo (concat
!                                     "System load average for past "
!                                     (if (= 0 display-time-load-average)
!                                         "1 minute"
!                                       (if (= 1 display-time-load-average)
!                                           "5 minutes"
!                                         "15 minutes"))
!                                     "; mouse-2: next"))))
                   (error ""))))
           (mail-spool-file (or display-time-mail-file
                                (getenv "MAIL")
***************
*** 284,295 ****
                            (> (- (nth 1 now) display-time-server-down-time)
                               1200)
                            (and (< (nth 1 now) display-time-server-down-time)
!                                (> (- (nth 1 now) 
display-time-server-down-time)
                                    -64336)))
                        (let ((start-time (current-time)))
                          (prog1
                              (display-time-file-nonempty-p mail-spool-file)
!                           (if (> (- (nth 1 (current-time)) (nth 1 start-time))
                                   20)
                                ;; Record that mail file is not accessible.
                                (setq display-time-server-down-time
--- 314,327 ----
                            (> (- (nth 1 now) display-time-server-down-time)
                               1200)
                            (and (< (nth 1 now) display-time-server-down-time)
!                                (> (- (nth 1 now)
!                                      display-time-server-down-time)
                                    -64336)))
                        (let ((start-time (current-time)))
                          (prog1
                              (display-time-file-nonempty-p mail-spool-file)
!                           (if (> (- (nth 1 (current-time))
!                                     (nth 1 start-time))
                                   20)
                                ;; Record that mail file is not accessible.
                                (setq display-time-server-down-time