[Emacs-diffs] trunk r116101: Fix some function declarations

[Glenn Morris]

------------------------------------------------------------
revno: 116101
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2014-01-21 20:50:40 -0500
message:
  Fix some function declarations
  
  * lisp/calc/calc-embed.el (thing-at-point-looking-at):
  * lisp/emacs-lisp/map-ynp.el (x-popup-dialog):
  * lisp/obsolete/lmenu.el (x-popup-dialog):
  * lisp/emacs-lisp/package.el (url-recreate-url):
  * lisp/mail/mailclient.el (clipboard-kill-ring-save):
  * lisp/subr.el (x-popup-dialog): Update declaration.
  
  * lisp/mail/rmail.el (rmail-mime-message-p):
  * lisp/window.el (tool-bar-lines-needed): Remove unnecessary declaration.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calc/calc-embed.el        
calcembed.el-20091113204419-o5vbwnq5f7feedwu-2275
  lisp/emacs-lisp/map-ynp.el     mapynp.el-20091113204419-o5vbwnq5f7feedwu-2589
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2
  lisp/mail/mailclient.el        
mailclient.el-20091113204419-o5vbwnq5f7feedwu-3840
  lisp/mail/rmail.el             rmail.el-20091113204419-o5vbwnq5f7feedwu-8812
  lisp/obsolete/lmenu.el         lmenu.el-20091113204419-o5vbwnq5f7feedwu-547
  lisp/subr.el                   subr.el-20091113204419-o5vbwnq5f7feedwu-151
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-21 23:42:59 +0000
+++ b/lisp/ChangeLog    2014-01-22 01:50:40 +0000
@@ -1,3 +1,14 @@
+2014-01-22  Glenn Morris  <address@hidden>
+
+       * calc/calc-embed.el (thing-at-point-looking-at):
+       * emacs-lisp/map-ynp.el (x-popup-dialog):
+       * obsolete/lmenu.el (x-popup-dialog):
+       * emacs-lisp/package.el (url-recreate-url):
+       * mail/mailclient.el (clipboard-kill-ring-save):
+       * subr.el (x-popup-dialog): Update declaration.
+       * mail/rmail.el (rmail-mime-message-p):
+       * window.el (tool-bar-lines-needed): Remove unnecessary declaration.
+
 2014-01-21  Daniel Colascione  <address@hidden>
 
        * progmodes/sh-script.el (sh--inside-noncommand-expression):

=== modified file 'lisp/calc/calc-embed.el'
--- a/lisp/calc/calc-embed.el   2014-01-01 07:43:34 +0000
+++ b/lisp/calc/calc-embed.el   2014-01-22 01:50:40 +0000
@@ -30,7 +30,8 @@
 (require 'calc-macs)
 
 ;; Declare functions which are defined elsewhere.
-(declare-function thing-at-point-looking-at "thingatpt" (regexp))
+(declare-function thing-at-point-looking-at "thingatpt"
+                 (regexp &optional distance))
 
 
 (defun calc-show-plain (n)

=== modified file 'lisp/emacs-lisp/map-ynp.el'
--- a/lisp/emacs-lisp/map-ynp.el        2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/map-ynp.el        2014-01-22 01:50:40 +0000
@@ -34,7 +34,7 @@
 
 ;;; Code:
 
-(declare-function x-popup-dialog "xmenu.c" (position contents &optional 
header))
+(declare-function x-popup-dialog "menu.c" (position contents &optional header))
 
 (defun map-y-or-n-p (prompter actor list &optional help action-alist
                              no-cursor-in-echo-area)

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-01-16 16:44:17 +0000
+++ b/lisp/emacs-lisp/package.el        2014-01-22 01:50:40 +0000
@@ -210,7 +210,7 @@
 (declare-function lm-header "lisp-mnt" (header))
 (declare-function lm-commentary "lisp-mnt" (&optional file))
 (defvar url-http-end-of-headers)
-(declare-function url-recreate-url "url" (urlobj))
+(declare-function url-recreate-url "url-parse" (urlobj))
 (defvar url-http-target-url)
 
 (defcustom package-archives '(("gnu" . "http://elpa.gnu.org/packages/";))

=== modified file 'lisp/mail/mailclient.el'
--- a/lisp/mail/mailclient.el   2014-01-01 07:43:34 +0000
+++ b/lisp/mail/mailclient.el   2014-01-22 01:50:40 +0000
@@ -99,7 +99,8 @@
              (mail-strip-quoted-names field) "\, *"))
            result)))))
 
-(declare-function clipboard-kill-ring-save "menu-bar.el" (beg end))
+(declare-function clipboard-kill-ring-save "menu-bar.el"
+                 (beg end &optional region))
 
 ;;;###autoload
 (defun mailclient-send-it ()

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2014-01-10 23:29:10 +0000
+++ b/lisp/mail/rmail.el        2014-01-22 01:50:40 +0000
@@ -4121,7 +4121,6 @@
 
 (autoload 'mail-position-on-field "sendmail")
 
-(declare-function rmail-mime-message-p "rmailmm" ())
 (declare-function rmail-mime-toggle-raw "rmailmm" (&optional state))
 
 (defun rmail-retry-failure ()

=== modified file 'lisp/obsolete/lmenu.el'
--- a/lisp/obsolete/lmenu.el    2014-01-01 07:43:34 +0000
+++ b/lisp/obsolete/lmenu.el    2014-01-22 01:50:40 +0000
@@ -131,7 +131,7 @@
       (setq menu-items (cdr menu-items)))
     menu))
 
-(declare-function x-popup-dialog "xmenu.c" (position contents &optional 
header))
+(declare-function x-popup-dialog "menu.c" (position contents &optional header))
 
 ;; XEmacs compatibility function
 (defun popup-dialog-box (data)

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2014-01-06 23:34:05 +0000
+++ b/lisp/subr.el      2014-01-22 01:50:40 +0000
@@ -2177,7 +2177,7 @@
            nil))))))
 
 ;; Behind display-popup-menus-p test.
-(declare-function x-popup-dialog "xmenu.c" (position contents &optional 
header))
+(declare-function x-popup-dialog "menu.c" (position contents &optional header))
 
 (defun y-or-n-p (prompt)
   "Ask user a \"y or n\" question.  Return t if answer is \"y\".

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-01-13 07:47:15 +0000
+++ b/lisp/window.el    2014-01-22 01:50:40 +0000
@@ -6811,7 +6811,6 @@
   :group 'help)
 
 (declare-function x-display-pixel-height "xfns.c" (&optional terminal))
-(declare-function tool-bar-lines-needed "xdisp.c" (&optional frame))
 
 (defun window--sanitize-margin (margin left right)
   "Return MARGIN if it's a number between LEFT and RIGHT."