Mercurial > emacs
diff lisp/calendar/cal-menu.el @ 90399:a5812696f7bf unicode-pre-font-backend
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 274-284)
- Update from CVS
- Update etc/MORE.STUFF.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 101)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 17 May 2006 07:46:49 +0000 |
| parents | 2ecafc6d5db7 516e75189437 |
| children | 95d0cdf160ea |
line wrap: on
line diff
--- a/lisp/calendar/cal-menu.el Mon May 15 03:48:50 2006 +0000 +++ b/lisp/calendar/cal-menu.el Wed May 17 07:46:49 2006 +0000 @@ -85,7 +85,7 @@ (define-key calendar-mode-map [menu-bar diary ent] '("Insert Diary Entry" . insert-diary-entry)) (define-key calendar-mode-map [menu-bar diary all] - '("Show All" . show-all-diary-entries)) + '("Show All" . diary-show-all-entries)) (define-key calendar-mode-map [menu-bar diary mark] '("Mark All" . mark-diary-entries)) (define-key calendar-mode-map [menu-bar diary view] @@ -616,7 +616,7 @@ (define-key calendar-mouse-3-map [exit-calendar] '("Exit calendar" . exit-calendar)) (define-key calendar-mouse-3-map [show-diary] - '("Show diary" . show-all-diary-entries)) + '("Show diary" . diary-show-all-entries)) (define-key calendar-mouse-3-map [lunar-phases] '("Lunar phases" . calendar-phases-of-moon)) (define-key calendar-mouse-3-map [unmark]