Mercurial > emacs
changeset 39523:183567a011b1
(calendar-mode-map): Require cal-menu unconditionally.
(calendar-mode): Set up activate-menubar-hook unconditionally.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Mon, 01 Oct 2001 11:05:18 +0000 |
| parents | 6102045363ab |
| children | 291264d596e9 |
| files | lisp/calendar/calendar.el |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/calendar.el Mon Oct 01 10:53:38 2001 +0000 +++ b/lisp/calendar/calendar.el Mon Oct 01 11:05:18 2001 +0000 @@ -1900,7 +1900,7 @@ (if calendar-mode-map nil (setq calendar-mode-map (make-sparse-keymap)) - (if (display-popup-menus-p) (require 'cal-menu)) + (require 'cal-menu) (calendar-for-loop i from 0 to 9 do (define-key calendar-mode-map (int-to-string i) 'digit-argument)) (let ((l (list 'narrow-to-region 'mark-word 'mark-sexp 'mark-paragraph @@ -2101,10 +2101,8 @@ (setq buffer-read-only t) (setq indent-tabs-mode nil) (update-calendar-mode-line) - (if (display-popup-menus-p) - (progn - (make-local-hook 'activate-menubar-hook) - (add-hook 'activate-menubar-hook 'cal-menu-update nil t))) + (make-local-hook 'activate-menubar-hook) + (add-hook 'activate-menubar-hook 'cal-menu-update nil t) (make-local-variable 'calendar-mark-ring) (make-local-variable 'displayed-month);; Month in middle of window. (make-local-variable 'displayed-year));; Year in middle of window.