Update x-popup-menu declaration.

7 files changed, 12 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a6d18d35e8..652bd91d714 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-10  Glenn Morris  <rgm@gnu.org>
 
+        * dired.el, hi-lock.el, calendar/cal-menu.el, calendar/calendar.el:
+        * calendar/holidays.el, progmodes/cperl-mode.el:
+        Update x-popup-menu declarations.
+
         * emacs-lisp/shadow.el (find-emacs-lisp-shadows)
         (list-load-path-shadows): Use dolist.
         (list-load-path-shadows): Use with-current-buffer.
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)
diff --git a/lisp/dired.el b/lisp/dired.el
index 34c17ea4f5d..57c5c8954b4 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3311,7 +3311,7 @@ Anything else means ask for each directory."
   (message-box
    "Dired recursive copies are currently disabled.\nSee the variable `dired-recursive-copies'."))
 
-(declare-function x-popup-menu "xmenu.c" (position menu))
+(declare-function x-popup-menu "menu.c" (position menu))
 
 (defun dired-dnd-do-ask-action (uri)
   ;; No need to get actions and descriptions from the source,
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 8a85068d559..418a98f3f3a 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -447,7 +447,7 @@ lower-case letters made case insensitive."
   (unless hi-lock-mode (hi-lock-mode 1))
   (hi-lock-set-pattern regexp face))
 
-(declare-function x-popup-menu "xmenu.c" (position menu))
+(declare-function x-popup-menu "menu.c" (position menu))
 
 ;;;###autoload
 (defalias 'unhighlight-regexp 'hi-lock-unface-buffer)
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 7446de6ff8f..d7c6d9f1094 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -7171,7 +7171,7 @@ Use as
                         (cons cons1 (car cperl-hierarchy)))))))
       (end-of-line))))
 
-(declare-function x-popup-menu "xmenu.c" (position menu))
+(declare-function x-popup-menu "menu.c" (position menu))
 
 (defun cperl-tags-hier-init (&optional update)
   "Show hierarchical menu of classes and methods.