Mercurial > emacs
diff lisp/calendar/calendar.el @ 90519:138ce2701550
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Jul 2006 08:59:39 +0000 |
parents | a5812696f7bf deb64e2d79af |
children | bb0e318b7c53 |
line wrap: on
line diff
--- a/lisp/calendar/calendar.el Wed Jul 05 17:38:31 2006 +0000 +++ b/lisp/calendar/calendar.el Thu Jul 06 08:59:39 2006 +0000 @@ -213,12 +213,6 @@ ;; backward-compatibility alias (put 'holiday-face 'face-alias 'holiday) -(eval-after-load "facemenu" - '(progn - (add-to-list 'facemenu-unlisted-faces 'diary) - (add-to-list 'facemenu-unlisted-faces 'calendar-today) - (add-to-list 'facemenu-unlisted-faces 'holiday))) - (defcustom diary-entry-marker (if (not (display-color-p)) "+"