diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-11-10 08:11:47 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-11-10 08:11:47 +0000 |
| commit | e8a11b2298d9274b7496f6de6883bf4042823f0b (patch) | |
| tree | 0aebe638444ec4c0825c17491c7953302cdf1f40 /lisp/calendar | |
| parent | b16ff465dc11ec819bd3d20dd7003953c69b6178 (diff) | |
| download | emacs-e8a11b2298d9274b7496f6de6883bf4042823f0b.tar.gz | |
Update x-popup-menu declaration.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/cal-menu.el | 2 | ||||
| -rw-r--r-- | lisp/calendar/calendar.el | 4 | ||||
| -rw-r--r-- | lisp/calendar/holidays.el | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index e39e181dbed..81be8b533ab 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -164,7 +164,7 @@ ["Backward 1 Year" calendar-backward-year]) "Key map for \"Scroll\" menu in the calendar.") -(declare-function x-popup-menu "xmenu.c" (position menu)) +(declare-function x-popup-menu "menu.c" (position menu)) (defmacro cal-menu-x-popup-menu (event title &rest body) "Call `x-popup-menu' at position EVENT, with TITLE and contents BODY. diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index d72a56d1114..ee242dc985b 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -114,7 +114,7 @@ ;;; Code: -(load "cal-loaddefs" nil 'nomessage) +(load "cal-loaddefs" nil t) ;; Avoid recursive load of calendar when loading cal-menu. Yuck. (provide 'calendar) @@ -2510,7 +2510,7 @@ DATE is (month day year). Calendars that do not apply are omitted." (format "Mayan date: %s" (calendar-mayan-date-string date)))))) -(declare-function x-popup-menu "xmenu.c" (position menu)) +(declare-function x-popup-menu "menu.c" (position menu)) (defun calendar-print-other-dates (&optional event) "Show dates on other calendars for date under the cursor. diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index d41f2cf9aff..cb32e19aaea 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -29,7 +29,7 @@ ;;; Code: (require 'calendar) -(load "hol-loaddefs" nil 'nomessage) +(load "hol-loaddefs" nil t) (defgroup holidays nil "Holidays support in calendar." @@ -643,7 +643,7 @@ The holidays are those in the list `calendar-holidays'." (define-obsolete-function-alias 'check-calendar-holidays 'calendar-check-holidays "23.1") -(declare-function x-popup-menu "xmenu.c" (position menu)) +(declare-function x-popup-menu "menu.c" (position menu)) ;;;###cal-autoload (defun calendar-cursor-holidays (&optional date event) |