Rename 'display-time-time-and-date-indicator' to 'display-time-date-and-time' (bug...

* etc/NEWS:
* lisp/time.el (display-time-time-and-date-indicator)
(display-time-date-and-time, display-time-string-forms): Update symbol.

diff --git a/etc/NEWS b/etc/NEWS
index db42041ec6dd1cdb1d6517fedf67096428c1f7a1..bcce416ebc1f93271fb1660d4df7ff5ed268c64b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -57,7 +57,7 @@ This allows the user to customize the prompt that is appended by
 "(yes or no) ".
 
 ---
-** New face 'display-time-time-and-date-indicator'.
+** New face 'display-time-date-and-time'.
 This is used for displaying the time and date components of
 'display-time-mode'.
 

diff --git a/lisp/time.el b/lisp/time.el
index 030aef9d49b8cff59532c8ce167958213eb4f671..522bec46ac65f833dceb0ac2d65c182586ba6eb5 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -139,7 +139,7 @@ make the mail indicator stand out on a color display."
   :version "22.1"
   :type '(choice (const :tag "None" nil) face))
 
-(defface display-time-time-and-date-indicator nil
+(defface display-time-date-and-time nil
   "Face for `display-time-format'."
   :group 'mode-line-faces
   :version "30.1")
@@ -184,7 +184,7 @@ depend on `display-time-day-and-date' and `display-time-24hr-format'."
      (format-time-string (or display-time-format
                             (if display-time-24hr-format "%H:%M" "%-I:%M%p"))
                         now)
-     'face 'display-time-time-and-date-indicator
+     'face 'display-time-date-and-time
      'help-echo (format-time-string "%a %b %e, %Y" now))
     load
     (if mail