[Emacs-diffs] emacs/lisp ChangeLog dired.el hi-lock.el calend...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/11/10 08:11:52

Modified files:
        lisp           : ChangeLog dired.el hi-lock.el 
        lisp/calendar  : cal-menu.el calendar.el holidays.el 
        lisp/progmodes : cperl-mode.el 

Log message:
        Update x-popup-menu declaration.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16590&r2=1.16591
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired.el?cvsroot=emacs&r1=1.437&r2=1.438
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/hi-lock.el?cvsroot=emacs&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/cal-menu.el?cvsroot=emacs&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.291&r2=1.292
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/holidays.el?cvsroot=emacs&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cperl-mode.el?cvsroot=emacs&r1=1.118&r2=1.119

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16590
retrieving revision 1.16591
diff -u -b -r1.16590 -r1.16591
--- ChangeLog   10 Nov 2009 08:06:53 -0000      1.16590
+++ ChangeLog   10 Nov 2009 08:11:47 -0000      1.16591
@@ -1,5 +1,9 @@
 2009-11-10  Glenn Morris  <address@hidden>
 
+       * 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.

Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -b -r1.437 -r1.438
--- dired.el    8 Nov 2009 00:32:22 -0000       1.437
+++ dired.el    10 Nov 2009 08:11:51 -0000      1.438
@@ -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,

Index: hi-lock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/hi-lock.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- hi-lock.el  2 Oct 2009 03:48:41 -0000       1.59
+++ hi-lock.el  10 Nov 2009 08:11:51 -0000      1.60
@@ -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)

Index: calendar/cal-menu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-menu.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- calendar/cal-menu.el        22 Sep 2009 07:15:34 -0000      1.116
+++ calendar/cal-menu.el        10 Nov 2009 08:11:51 -0000      1.117
@@ -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.

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -b -r1.291 -r1.292
--- calendar/calendar.el        4 Nov 2009 00:27:37 -0000       1.291
+++ calendar/calendar.el        10 Nov 2009 08:11:51 -0000      1.292
@@ -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.

Index: calendar/holidays.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/holidays.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- calendar/holidays.el        6 Nov 2009 05:16:29 -0000       1.89
+++ calendar/holidays.el        10 Nov 2009 08:11:51 -0000      1.90
@@ -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)

Index: progmodes/cperl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cperl-mode.el,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- progmodes/cperl-mode.el     31 Oct 2009 02:38:39 -0000      1.118
+++ progmodes/cperl-mode.el     10 Nov 2009 08:11:51 -0000      1.119
@@ -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.