aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShengHuo ZHU2000-11-04 17:02:02 +0000
committerShengHuo ZHU2000-11-04 17:02:02 +0000
commitad88b950fecfbee5b34800e3d3ce60c2c5993be5 (patch)
treed3df9b4974aaf806f6ff84a67cb34903a9e40e43
parent546790cb86f111943d57627ca6049a033e2cff7e (diff)
downloademacs-ad88b950fecfbee5b34800e3d3ce60c2c5993be5.tar.gz
emacs-ad88b950fecfbee5b34800e3d3ce60c2c5993be5.zip
* calendar/calendar.el (diary-face, holiday-face): Fix typo.
* info.el (info-menu-header): Fix typo.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/calendar.el12
-rw-r--r--lisp/info.el6
3 files changed, 13 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5901c31cab..86e6ae469b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12000-11-04 11:48:02 ShengHuo ZHU <zsh@cs.rochester.edu>
2
3 * calendar/calendar.el (diary-face, holiday-face): Fix typo.
4 * info.el (info-menu-header): Fix typo.
5
12000-11-04 Jason Rumney <jasonr@gnu.org> 62000-11-04 Jason Rumney <jasonr@gnu.org>
2 7
3 * language/european.el (decode-mac-roman): Test against r1 not r0. 8 * language/european.el (decode-mac-roman): Test against r1 not r0.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 8773cc8746b..38b2b13a4ca 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."
207(add-to-list 'facemenu-unlisted-faces 'diary-face) 207(add-to-list 'facemenu-unlisted-faces 'diary-face)
208(defface diary-face 208(defface diary-face
209 '((((class color) (background light)) 209 '((((class color) (background light))
210 :foreground "red") 210 (:foreground "red"))
211 (((class color) (background dark)) 211 (((class color) (background dark))
212 :foreground "yellow") 212 (:foreground "yellow"))
213 (t 213 (t
214 :bold t)) 214 (:bold t)))
215 "Face for highlighting diary entries." 215 "Face for highlighting diary entries."
216 :group 'diary) 216 :group 'diary)
217 217
@@ -224,11 +224,11 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
224(add-to-list 'facemenu-unlisted-faces 'holiday-face) 224(add-to-list 'facemenu-unlisted-faces 'holiday-face)
225(defface holiday-face 225(defface holiday-face
226 '((((class color) (background light)) 226 '((((class color) (background light))
227 :background "pink") 227 (:background "pink"))
228 (((class color) (background dark)) 228 (((class color) (background dark))
229 :background "chocolate4") 229 (:background "chocolate4"))
230 (t 230 (t
231 :inverse-video t)) 231 (:inverse-video t)))
232 "Face for indicating dates that have holidays." 232 "Face for indicating dates that have holidays."
233 :group 'diary) 233 :group 'diary)
234 234
diff --git a/lisp/info.el b/lisp/info.el
index 9676dcf4ff0..c97d8bcc0af 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2387,11 +2387,9 @@ the variable `Info-file-list-for-emacs'."
2387 2387
2388(defface info-menu-header 2388(defface info-menu-header
2389 '((((type tty pc)) 2389 '((((type tty pc))
2390 :underline t 2390 (:underline t :weight bold))
2391 :weight bold)
2392 (t 2391 (t
2393 :inherit variable-pitch 2392 (:inherit variable-pitch :weight bold)))
2394 :weight bold))
2395 "Face for headers in Info menus." 2393 "Face for headers in Info menus."
2396 :group 'info) 2394 :group 'info)
2397 2395