--- a/lisp/packages/time.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/packages/time.el	Mon Aug 13 09:02:59 2007 +0200
@@ -2,9 +2,7 @@
 
 ;; Copyright (C) 1985, 86, 87, 93, 94, 1996 Free Software Foundation, Inc.
 
-;; Maintainer: FSF,     XEmacs add-ons (C) by Jens T. Lautenbacher
-;;                      mail <jens@lemming0.lem.uni-karlsruhe.de>
-;;                      for comments/fixes about the enhancements.
+;; Maintainer: FSF
 
 ;; This file is part of XEmacs.
 
@@ -23,10 +21,6 @@
 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ;; 02111-1307, USA.
 
-;;; Version: 1.6   (I choose the version number starting at 1.1
-;;;                to indicate that 1.0 was the old version
-;;;                before I hacked away on it -JTL)
-
 ;;; Synched up with: Not synched with FSF.
 
 ;;; Commentary:
@@ -38,74 +32,38 @@
 ;; This uses the XEmacs timeout-event mechanism, via a version
 ;; of Kyle Jones' itimer package.
 
-;;; JTL: This is in a wide part reworked for XEmacs so it won't use
-;;;      the old mechanism for specifying what is to be displayed.
-;;;      The starting variable to look at is `display-time-form-list'
-
-;;; Thanks to Mike Scheidler for the idea to make the time led's fore- and
-;;; background color customizable
-
 ;;; Code:
 
 (require 'itimer)
 
-(defgroup display-time nil
-  "Facilities to display the current time/date/load and a new-mail indicator
-in the XEmacs mode line or echo area."
-  :group 'applications)
-
-(defcustom display-time-mail-file nil
+(defvar 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
-default, which is system-dependent, and is the same as used by Rmail."
-  :group 'display-time)
+default, which is system-dependent, and is the same as used by Rmail.")
 
 ;;;###autoload
-(defcustom display-time-day-and-date nil
-  "*Non-nil means \\[display-time] should display day,date and time.
-This affects the spec 'date in the variable display-time-form-list."
-  :group 'display-time
-  :type 'boolean)
+(defvar display-time-day-and-date nil "\
+*Non-nil means \\[display-time] should display day and date as well as time.")
 
-(defcustom display-time-interval 20
-  "*Seconds between updates of time in the mode line."
-  :group 'display-time
-  :type 'integer)
+(defvar display-time-interval 60
+  "*Seconds between updates of time in the mode line.")
 
-(defcustom display-time-24hr-format nil
+(defvar display-time-24hr-format nil
   "*Non-nil indicates time should be displayed as hh:mm, 0 <= hh <= 23.
-Nil means 1 <= hh <= 12, and an AM/PM suffix is used.
-This affects the spec 'time in the variable display-time-form-list."
-  :group 'display-time
-  :type 'boolean)
+Nil means 1 <= hh <= 12, and an AM/PM suffix is used.")
 
-(defcustom display-time-echo-area nil
-  "*If non-nil, display-time will use the echo area instead of the mode line."
-  :group 'display-time
-  :type 'boolean)
+(defvar display-time-echo-area nil
+  "*If non-nil, display-time will use the echo area instead of the mode line.")
 
 (defvar display-time-string nil)
 
-(defcustom display-time-hook nil
-  "*List of functions to be called when the time is updated on the mode line."
-  :group 'display-time
-  :type 'hook)
+(defvar display-time-hook nil
+  "*List of functions to be called when the time is updated on the mode line.")
 
 (defvar display-time-server-down-time nil
    "Time when mail file's file system was recorded to be down.
 If that file system seems to be up, the value is nil.")
 
-(defcustom display-time-ignore-read-mail t
-  "*Non-nil means displays the mail icon on any non-empty mailbox."
-  :group 'display-time
-  :type 'boolean)
-
-(defcustom display-time-balloon-show-mail-from t
-  "*Non-nil means displays the `From' lines of your new mail in the help balloon.
-This feature needs `balloon-help' to be loaded."
-  :group 'display-time
-  :type 'boolean)
-
 ;;;###autoload
 (defun display-time ()
   "Display current time, load level, and mail flag in mode line of each buffer.
@@ -119,10 +77,6 @@
   ;; if the "display-time" itimer already exists, nuke it first.
   (let ((old (get-itimer "display-time")))
     (if old (delete-itimer old)))
-
-  (if (memq 'display-time-string global-mode-string)
-      (setq global-mode-string
-	    (remove 'display-time-string global-mode-string)))
   ;; If we're not displaying the time in the echo area
   ;; and the global mode string does not have a non-nil value
   ;; then initialize the global mode string's value.
@@ -130,11 +84,13 @@
       global-mode-string
       (setq global-mode-string '("")))
   ;; If we're not displaying the time in the echo area
-  ;; then we add our variable to the list.  This will make the time
+  ;; and our display variable is not part of the global-mode-string list
+  ;; the we add our variable to the list.  This will make the time
   ;; appear on the modeline.
   (or display-time-echo-area
+      (memq 'display-time-string global-mode-string)
       (setq global-mode-string
-		(append global-mode-string '(display-time-string))))
+	    (append global-mode-string '(display-time-string))))
   ;; Display the time initially...
   (display-time-function)
   ;; ... and start an itimer to do it automatically thereafter.
@@ -147,488 +103,6 @@
   (start-itimer "display-time" 'display-time-function
 		display-time-interval display-time-interval))
 
-(defun display-time-stop ()
-  (interactive)
-  (delete-itimer "display-time")
-  (setq display-time-string nil))
-
-(defcustom display-time-show-icons-maybe t
-  "Use icons for time, load and mail status if possible
-and not specified different explicitely"
-  :group 'display-time
-  :type 'boolean)  
-
-(defvar display-time-icons-dir (concat data-directory "time/"))  
-
-(defcustom display-time-mail-sign-string " Mail" 
-  "The string used as mail indicator in the echo area 
-(and in the modeline if display-time-show-icons-maybe is nil)
-if display-time-echo-area is t"
-:group 'display-time
-:type 'string)
-
-(defcustom display-time-no-mail-sign-string ""    
-  "The string used as no-mail indicator in the echo area
-(and in the modeline if display-time-show-icons-maybe is nil)
-if display-time-echo-area is t"
-:group 'display-time
-:type 'string)
-
-(defcustom display-time-display-pad  "grey35"
-  "How the load indicator's trapezoidal \"pad\" is to be displayed.
-This can be 'transparent or a string describing the color it should have"
-  :group 'display-time
-  :type '(choice :tag "Value"
-		 (const transparent)
-		 (string :tag "Color")))
-
-(defcustom display-time-display-time-foreground  "firebrick"
-  "How the time LEDs foreground is to be displayed.
-This can be 'modeline (foreground color of the Modeline)
-or a string describing the color it should have"
-  :group 'display-time
-  :type '(choice :tag "Value"
-		 (const modline)
-		 (string :tag "Color")))
-
-(defcustom display-time-display-time-background  'transparent
-  "How the time LEDs background is to be displayed.
-This can be 'transparent or a string describing the color it should have"
-  :group 'display-time
-  :type '(choice :tag "Value"
-		 (const transparent)
-		 (string :tag "Color")))
-
-(defvar display-time-balloon-date-string nil)
-
-(defvar display-time-spool-file-modification nil)
-
-(defvar display-time-mail-header nil)
-
-(defvar display-time-display-pad-old nil)
-
-(defvar display-time-display-time-fg-old nil)
-
-(defvar display-time-display-time-bg-old nil)
-
-(defcustom display-time-load-list
-  (list 0.2 0.5 0.8 1.1 1.8 2.6)
-  "*A list giving six thresholds for the load
-which correspond to the six different icons to be displayed
-as a load indicator"
-  :group 'display-time
-  :type '(list (number :tag "Threshold 1")
-	       (number :tag "Threshold 2")
-	       (number :tag "Threshold 3")
-	       (number :tag "Threshold 4")
-	       (number :tag "Threshold 5")
-	       (number :tag "Threshold 6")))
-
-(defcustom display-time-compatible nil 
-  "*This variable may be set to t to get the old behaviour of display-time.
-It should be considered obsolete and only be used if you really want the
-old behaviour (eq. you made extensive customizations yourself).
-This means no display of a spiffy mail icon or use of the
-display-time-form-list instead of the old display-time-string-form."
-  :group 'display-time
-  :type 'boolean)
-
-(defun display-time-string-to-char-list (str)
-  (mapcar (function identity) str))
-
-(defun display-time-generate-load-glyphs (&optional force)
-  (let* ((pad-color (if (symbolp display-time-display-pad)
-			(list "pad-color" '(face-background 'modeline))
-		      (list "pad-color" display-time-display-pad)))
-	 (xpm-color-symbols (append (list pad-color) xpm-color-symbols)))
-    (if (and (featurep 'xpm)
-	     (or force (not (equal display-time-display-pad
-				   display-time-display-pad-old))))
-	(progn
-	  (setq display-time-load-0.0-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph
-		       (concat display-time-icons-dir "l-0.0.xpm"))))
-	  (setq display-time-load-0.5-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph
-		       (concat display-time-icons-dir "l-0.5.xpm"))))
-	  (setq display-time-load-1.0-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph
-		       (concat display-time-icons-dir "l-1.0.xpm"))))
-	  (setq display-time-load-1.5-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph
-		       (concat display-time-icons-dir "l-1.5.xpm"))))
-	  (setq display-time-load-2.0-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph
-		       (concat display-time-icons-dir "l-2.0.xpm"))))
-	  (setq display-time-load-2.5-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph
-		       (concat display-time-icons-dir "l-2.5.xpm"))))
-	  (setq display-time-load-3.0-glyph
-	  (cons (make-extent nil nil)
-		(make-glyph
-		 (concat display-time-icons-dir "l-3.0.xpm"))))
-	  (setq display-time-display-pad-old display-time-display-pad)
-	  ))))
-
-
-(defun display-time-generate-time-glyphs (&optional force)
-  (let* ((ledbg (if (symbolp display-time-display-time-background)
-		    (list "ledbg" '(face-background 'modeline))
-		  (list "ledbg" display-time-display-time-background)))
-	 (ledfg (if (symbolp display-time-display-time-foreground)
-		    (list "ledfg" '(face-foreground 'modeline))
-		  (list "ledfg" display-time-display-time-foreground)))
-	 (xpm-color-symbols (append (list ledbg)
-				    (list ledfg) xpm-color-symbols)))
-    (if (and (featurep 'xpm)
-	     (or force (not (equal display-time-display-time-background
-				   display-time-display-time-bg-old))
-		 (not (equal display-time-display-time-foreground
-			     display-time-display-time-fg-old))))
-	(progn
-	  (setq display-time-1-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "1.xpm"))))
-	  (setq display-time-2-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "2.xpm"))))
-	  (setq display-time-3-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "3.xpm"))))
-	  (setq display-time-4-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "4.xpm"))))
-	  (setq display-time-5-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "5.xpm"))))
-	  (setq display-time-6-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "6.xpm"))))
-	  (setq display-time-7-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "7.xpm"))))
-	  (setq display-time-8-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "8.xpm"))))
-	  (setq display-time-9-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "9.xpm"))))
-	  (setq display-time-0-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "0.xpm"))))
-	  (setq display-time-:-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "dp.xpm"))))
-	  (setq display-time-am-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "am.xpm"))))
-	  (setq display-time-pm-glyph
-		(cons (make-extent nil nil)
-		      (make-glyph (concat display-time-icons-dir "pm.xpm"))))
-	  (setq display-time-display-time-fg-old
-		display-time-display-time-foreground
-		display-time-display-time-bg-old
-		display-time-display-time-background)
-	  ))))
-
-  (if (featurep 'xpm)
-    (progn
-      (defvar display-time-mail-sign
-	(cons (make-extent nil nil)
-	      (make-glyph  (concat display-time-icons-dir "letter.xpm"))))
-      (defvar display-time-no-mail-sign
-	(cons (make-extent nil nil)
-	      (make-glyph  (concat display-time-icons-dir "no-letter.xpm"))))
-      (defvar display-time-1-glyph  nil)
-      (defvar display-time-2-glyph  nil)
-      (defvar display-time-3-glyph  nil)
-      (defvar display-time-4-glyph  nil)
-      (defvar display-time-5-glyph  nil)
-      (defvar display-time-6-glyph  nil)
-      (defvar display-time-7-glyph  nil)
-      (defvar display-time-8-glyph  nil)
-      (defvar display-time-9-glyph  nil)
-      (defvar display-time-0-glyph  nil)
-      (defvar display-time-:-glyph  nil)
-      (defvar display-time-am-glyph nil)
-      (defvar display-time-pm-glyph nil)
-      (defvar display-time-load-0.0-glyph nil)
-      (defvar display-time-load-0.5-glyph nil)
-      (defvar display-time-load-1.0-glyph nil)
-      (defvar display-time-load-1.5-glyph nil)
-      (defvar display-time-load-2.0-glyph nil)
-      (defvar display-time-load-2.5-glyph nil)
-      (defvar display-time-load-3.0-glyph nil)
-      (display-time-generate-time-glyphs 'force)
-      (display-time-generate-load-glyphs 'force)  
-      ))
-
-(defun display-time-can-do-graphical-display (&optional textual)
-  (and display-time-show-icons-maybe
-       (not textual)
-       (eq (console-type) 'x)
-       (featurep 'xpm)
-       (not display-time-echo-area)))
-       
-       
-(defun display-time-convert-num (time-string &optional textual)
-  (let ((list (display-time-string-to-char-list time-string))
-	elem tmp)
-    (if (not (display-time-can-do-graphical-display textual)) time-string 
-      (display-time-generate-time-glyphs)
-      (setq display-time-balloon-date-string
-	    (format "%s, %s %s %s %s" dayname day monthname year
-		    (if (not (equal load ""))
-			(concat "-- Average load: " load)
-		      "")))
-      (while (setq elem (pop list))
-	(setq elem (eval (intern-soft (concat "display-time-"
-					 (char-to-string elem)
-					 "-glyph"))))
-	(set-extent-property (car elem) 'balloon-help 'display-time-balloon)
-	(push elem tmp))
-      (reverse tmp))))
-
-(defun display-time-balloon (&rest ciao)
-  (let ((header display-time-balloon-date-string)
-	header-ext)
-    (setq header-ext
-	  (make-extent 0 (length display-time-balloon-date-string)
-		       header))
-    (set-extent-property header-ext 'face 'red)
-    (set-extent-property header-ext 'duplicable t)
-    (concat header
-	    (if display-time-balloon-show-mail-from
-		(display-time-scan-spool-file)))))
-
-
-(defun display-time-scan-spool-file ()
-  (let* ((mail-spool-file (or display-time-mail-file
-			     (getenv "MAIL")
-			     (concat rmail-spool-directory
-				     (user-login-name))))
-	 (mod (nth 5 (file-attributes mail-spool-file))))
-    (if (equal mod display-time-spool-file-modification)
-	display-time-mail-header
-      (setq tmp  (exec-to-string
-		 (concat "grep \"^From \" " mail-spool-file)))
-      (if (equal tmp "") ()
-	(setq tmp (concat "\n\nYou have mail:\n-------------\n" tmp))
-	(setq tmp (substring tmp 0 (1- (length tmp)))))
-      (setq display-time-spool-file-modification mod)
-      (setq display-time-mail-header tmp))))
-
-
-(defun display-time-convert-load (load-string &optional textual)
-  (let ((load-number (string-to-number load-string))
-	(alist (list (cons 0.0 0.0)
-		    (cons 0.5 (car display-time-load-list))
-		    (cons 1.0 (cadr display-time-load-list))
-		    (cons 1.5 (caddr display-time-load-list))
-		    (cons 2.0 (cadddr display-time-load-list))
-		    (cons 2.5 (cadr (cdddr display-time-load-list)))
-		    (cons 3.0 (caddr (cdddr display-time-load-list)))
-		    (cons 100000 100000)))
-	elem load-elem)
-    (if (not (display-time-can-do-graphical-display textual))
-	load-string
-      (display-time-generate-load-glyphs)
-      (while (>= load-number (cdr (setq elem (pop alist))))
-	(setq load-elem elem))
-      (eval (intern-soft (concat "display-time-load-"
-				 (number-to-string (car load-elem)) "-glyph"))))))
-
-(defun display-time-convert-am-pm (ampm-string &optional textual)
-  (if (not (display-time-can-do-graphical-display textual))
-      ampm-string
-    (cond ((equal ampm-string "am") display-time-am-glyph)
-	  ((equal ampm-string "pm") display-time-pm-glyph))))
-
-
-(defun display-time-mail-sign (&optional textual)
-  "*A function giving back the object indicating 'mail' which
-is the value of display-time-mail-sign when running under X,
-display-time-echo-area is nil and display-time-show-icons-maybe is t.
-It is the value of display-time-mail-sign-string otherwise." 
-  (if (not (display-time-can-do-graphical-display textual))
-      display-time-mail-sign-string
-    display-time-mail-sign))
-
-(defun display-time-no-mail-sign (&optional textual)
-  "*A function giving back the object indicating 'no mail' which
-is the value of display-time-no-mail-sign when running under X,
-display-time-echo-area is nil and display-time-show-icons-maybe is t.
-It is the value of display-time-no-mail-sign-string otherwise." 
-  (if (not (display-time-can-do-graphical-display textual))
-      display-time-no-mail-sign-string
-    display-time-no-mail-sign))
-
-(defcustom display-time-form-list
-  (list 'date 'time 'load 'mail)
-  "*This list describes the format of the strings/glyphs
-which are to be displayed by display-time.
-The old variable display-time-string-forms is only used if
-display-time-compatible is non-nil. It is a list consisting of
-strings or any of the following symbols:
-
-There are three complex specs whose behaviour is changed via
-the setting of various variables 
-
-date:          This prints out the date in a manner compatible to
-               the default value of the obsolete variable
-               display-time-string-forms. It respects the variable
-               display-time-day-and-date. If this is t it will print
-               out the current date in the form DAYNAME MONTH DAY
-               otherwise it will print nothing.
-	      
-time:          This prints out the time in a manner compatible to 
-               the default value of the obsolete variable
-               display-time-string-forms. It respects the variable
-               display-time-24hr-format. If this is t it will print
-               out the current hours in 24-hour format, if nil the
-               hours will be printed in 12-hour format and the
-               minutes will be followed by 'AM' or 'PM'.
-	      
-time-text:     The same as above, but will not use a glyph
-	      
-The other specs are simpler, as their meaning is not changed via
-variables.
-
-24-hours:      This prints the hours in 24-hours format
-	      
-24-hours-text: The same as above, but will not use a glyph
-	      
-12-hours:      This prints the hours in 12-hours format
-	      
-12-hours-text: The same as above, but will not use a glyph
-	      
-am-pm:         This prints am or pm.
-
-Timezone:      This prints out the local timezone
-	      
-am-pm-text:    The same as above, but will not use a glyph
-	      
-minutes:       This prints the minutes.
-	      
-minutes-text:  The same as above, but will not use a glyph
-	      
-day:           This prints out the current day as a number. 
-	      
-dayname:       This prints out today's name.
-	      
-month:         This prints out the current month as a number
-	      
-monthname:     This prints out the current month's name
-
-year:          This prints out the current year.
-	      
-load:          This prints out the system's load.
-	      
-load-text:     The same as above, but will not use a glyph
-	      
-mail:          This displays a mail indicator. Under X this will 
-               normally be a small icon which changes depending if 
-               there is new mail or not.
-	      
-mail-text:     The same as above, but will not use a glyph"
-  :group 'display-time
-  :type '(repeat (choice :tag "Symbol/String"
-			 (const :tag "Date" date)
-			 (const :tag "Time" time)
-			 (const :tag "Time (text)" time-text)
-			 (const :tag "24 hour format" 24-hours)
-			 (const :tag "24 hour format (text)" 24-hours-text)
-			 (const :tag "12 hour format" 12-hours)
-			 (const :tag "12 hour format (text)" 12-hours-text)
-			 (const :tag "AM/PM indicator" am-pm)
-			 (const :tag "AM/PM indicator (text)" am-pm-text)
-			 (const :tag "Timezone" timezone)
-			 (const :tag "Minutes" minutes)
-			 (const :tag "Minutes (text)" minutes-text)
-			 (const :tag "Day" day)
-			 (const :tag "Dayname" dayname)
-			 (const :tag "Month" month)
-			 (const :tag "Monthname" monthname)
-			 (const :tag "Year" year)
-			 (const :tag "Load" load)
-			 (const :tag "Load (text)" load-text)
-			 (const :tag "Mail sign" mail)
-			 (const :tag "Mail sign (text)" mail-text)
-			 (string :tag "String"))))
-
-(defun display-time-evaluate-list ()
-  "Evalute the variable display-time-form-list"
-  (let ((list display-time-form-list) elem tmp result)
-    (while (setq elem (pop list))
-      (cond ((stringp elem) (push elem tmp))
-	    ((eq elem 'date)
-	     (push (if display-time-day-and-date
-		       (format "%s %s %s " dayname monthname day) "") tmp))
-	    ((eq elem 'time)
-	     (progn
-	       (push (display-time-convert-num
-		      (format "%s:%s"
-			      (if display-time-24hr-format 24-hours 12-hours)
-			      minutes)) tmp) 
-	       (if (not display-time-24hr-format)
-		   (push (display-time-convert-am-pm am-pm) tmp))))
-	    ((eq elem 'time-text)
-	     (push (display-time-convert-num
-		    (format "%s:%s"
-			   (if display-time-24hr-format 24-hours 12-hours)
-			   minutes) t) tmp)
-	     (if (not display-time-24hr-format)
-		 (push (display-time-convert-am-pm am-pm t) tmp)))
-	    ((eq elem 'day) (push day tmp))
-	    ((eq elem 'dayname) (push dayname tmp))
-	    ((eq elem 'month) (push month tmp))
-	    ((eq elem 'monthname) (push monthname tmp))
-	    ((eq elem '24-hours)
-	     (push (display-time-convert-num 24-hours) tmp))
-	    ((eq elem 'year)
-	     (push year tmp))
-	    ((eq elem '24-hours-text)
-	     (push (display-time-convert-num 24-hours t) tmp))
-	    ((eq elem '12-hours)
-	     (push (display-time-convert-num 12-hours) tmp))
-	    ((eq elem '12-hours-text)
-	     (push (display-time-convert-num 12-hours t) tmp))
-	    ((eq elem 'minutes)
-	     (push (display-time-convert-num minutes) tmp))
-	    ((eq elem 'minutes-text)
-	     (push (display-time-convert-num minutes t) tmp))
-	    ((eq elem 'am-pm)
-	     (push (display-time-convert-am-pm am-pm) tmp))
-	    ((eq elem 'am-pm-text)
-	     (push (display-time-convert-am-pm am-pm t) tmp))
-	    ((eq elem 'timezone)
-	     (push time-zone tmp))
-	    ((eq elem 'load)
-	     (push (display-time-convert-load load) tmp))
-	    ((eq elem 'load-text)
-	     (push (display-time-convert-load load t) tmp))
-	    ((eq elem 'mail)
-	     (push (if mail (display-time-mail-sign)
-		     (display-time-no-mail-sign)) tmp))
-	    ((eq elem 'mail-text)
-	     (push (if mail (display-time-mail-sign t)
-		     (display-time-no-mail-sign t)) tmp))
-	    ))
-    ;; We know that we have a list containing only of strings if
-    ;; display-time-echo-area is t. So we construct this string from
-    ;; the list. Else we just reverse the list and give it as result.
-    (if (not display-time-echo-area) (setq result (reverse tmp))
-      (while (setq elem (pop tmp))
-	(setq result (concat elem result))))
-    result))
-    
-	    
 (defvar display-time-string-forms
   '((if display-time-day-and-date
         (format "%s %s %s " dayname monthname day)
@@ -639,18 +113,18 @@
             (if display-time-24hr-format "" am-pm))
     load
     (if mail " Mail" ""))
-    "*THIS IS OBSOLETE! It will only be used if display-time-compatible is t.
-A list of expressions governing display of the time in the mode line.
+  "*A list of expressions governing display of the time in the mode line.
 This expression is a list of expressions that can involve the keywords
 `load', `day', `month', and `year', `12-hours', `24-hours', `minutes',
 `seconds', all numbers in string form, and `monthname', `dayname', `am-pm',
-and `time-zone' all alphabetic strings and `mail' a true/nil string value.
+and `time-zone' all alphabetic strings, and `mail' a true/nil value.
 
 For example, the form
 
   '((substring year -2) \"/\" month \"/\" day
     \" \" 24-hours \":\" minutes \":\" seconds
-    (if time-zone \" (\") time-zone (if time-zone \")\"))
+    (if time-zone \" (\") time-zone (if time-zone \")\")
+    (if mail \" Mail\" \"\"))
 
 would give mode line times like `94/12/30 21:07:48 (UTC)'.")
 
@@ -701,9 +175,7 @@
               ("Sep" . "9") ("Oct" . "10") ("Nov" . "11") ("Dec" . "12")))))
          (dayname (substring time 0 3)))
     (setq display-time-string
-	  (if display-time-compatible
-	      (mapconcat 'eval display-time-string-forms "")
-	    (display-time-evaluate-list)))
+          (mapconcat 'eval display-time-string-forms ""))
     ;; This is inside the let binding, but we are not going to document
     ;; what variables are available.
     (run-hooks 'display-time-hook))
@@ -714,7 +186,7 @@
 	    (save-window-excursion
 	      (select-window (minibuffer-window))
 	      (erase-buffer)
-	      (indent-to (- (frame-width) (length display-time-string) 1))
+	      (indent-to (- (screen-width) (length display-time-string) 1))
 	      (insert display-time-string)
 	      (message (buffer-string)))))
     (force-mode-line-update)
@@ -722,13 +194,8 @@
     (sit-for 0)))
 
 (defun display-time-file-nonempty-p (file)
-  (let ((attributes (file-attributes (file-chase-links file))))
-    (and attributes
-	 (< 0 (nth 7 attributes))
-	 (or display-time-ignore-read-mail
-	     (> (car (nth 5 attributes)) (car (nth 4 attributes)))
-	     (and (= (car (nth 5 attributes)) (car (nth 4 attributes)))
-		  (> (cadr (nth 5 attributes)) (cadr (nth 4 attributes))))))))
+  (and (file-exists-p file)
+       (< 0 (nth 7 (file-attributes (file-chase-links file))))))
 
 (provide 'time)