# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1257840707 0
# Node ID 8f110099da5ca3717700347c5d94d1e3fd01fae5
# Parent  dd099beb5a5b325fcbb0149d2e2799f4ace5a6ab
Update x-popup-menu declaration.

diff -r dd099beb5a5b -r 8f110099da5c lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/ChangeLog	Tue Nov 10 08:11:47 2009 +0000
@@ -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 -r dd099beb5a5b -r 8f110099da5c lisp/calendar/cal-menu.el
--- a/lisp/calendar/cal-menu.el	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/calendar/cal-menu.el	Tue Nov 10 08:11:47 2009 +0000
@@ -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 -r dd099beb5a5b -r 8f110099da5c lisp/calendar/calendar.el
--- a/lisp/calendar/calendar.el	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/calendar/calendar.el	Tue Nov 10 08:11:47 2009 +0000
@@ -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 @@
            (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 -r dd099beb5a5b -r 8f110099da5c lisp/calendar/holidays.el
--- a/lisp/calendar/holidays.el	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/calendar/holidays.el	Tue Nov 10 08:11:47 2009 +0000
@@ -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 @@
 (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 -r dd099beb5a5b -r 8f110099da5c lisp/dired.el
--- a/lisp/dired.el	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/dired.el	Tue Nov 10 08:11:47 2009 +0000
@@ -3311,7 +3311,7 @@
   (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 -r dd099beb5a5b -r 8f110099da5c lisp/hi-lock.el
--- a/lisp/hi-lock.el	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/hi-lock.el	Tue Nov 10 08:11:47 2009 +0000
@@ -447,7 +447,7 @@
   (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 -r dd099beb5a5b -r 8f110099da5c lisp/progmodes/cperl-mode.el
--- a/lisp/progmodes/cperl-mode.el	Tue Nov 10 08:06:53 2009 +0000
+++ b/lisp/progmodes/cperl-mode.el	Tue Nov 10 08:11:47 2009 +0000
@@ -7171,7 +7171,7 @@
 			(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.