From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Sun, 5 Nov 2000 03:49:38 +0000 (+0000)
Subject: Revoke the change.
X-Git-Tag: emacs-pretest-21.0.90~306
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42121c23099e579c536fc74c959849023a30b0ce;p=emacs.git

Revoke the change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0d440a672c..58ef859de26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,11 +3,6 @@
 	* vc-hooks.el (vc-insert-file): Rewritten.  Don't bother about
 	auto-save-mode.
 
-2000-11-04 11:48:02  ShengHuo ZHU  <zsh@cs.rochester.edu>
-
-	* calendar/calendar.el (diary-face, holiday-face): Fix typo.
-	* info.el (info-menu-header): Fix typo.
-
 2000-11-04  Jason Rumney  <jasonr@gnu.org>
 
 	* language/european.el (decode-mac-roman): Test against r1 not r0.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 38b2b13a4ca..8773cc8746b 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -207,11 +207,11 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
 (add-to-list 'facemenu-unlisted-faces 'diary-face)
 (defface diary-face
   '((((class color) (background light))
-     (:foreground "red"))
+     :foreground "red")
     (((class color) (background dark))
-     (:foreground "yellow"))
+     :foreground "yellow")
     (t
-     (:bold t)))
+     :bold t))
   "Face for highlighting diary entries."
   :group 'diary)
 
@@ -224,11 +224,11 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
 (add-to-list 'facemenu-unlisted-faces 'holiday-face)
 (defface holiday-face
   '((((class color) (background light))
-     (:background "pink"))
+     :background "pink")
     (((class color) (background dark))
-     (:background "chocolate4"))
+     :background "chocolate4")
     (t
-     (:inverse-video t)))
+     :inverse-video t))
   "Face for indicating dates that have holidays."
   :group 'diary)
 
diff --git a/lisp/info.el b/lisp/info.el
index c97d8bcc0af..9676dcf4ff0 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2387,9 +2387,11 @@ the variable `Info-file-list-for-emacs'."
 
 (defface info-menu-header
   '((((type tty pc))
-     (:underline t :weight bold))
+     :underline t
+     :weight bold)
     (t
-     (:inherit variable-pitch :weight bold)))
+     :inherit variable-pitch
+     :weight bold))
   "Face for headers in Info menus."
   :group 'info)