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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6bdf446..b87d79b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2014-01-22  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <dancol@dancol.org>
 
        * progmodes/sh-script.el (sh--inside-noncommand-expression):

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index e6fbb18..52d2f4c 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -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)

diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 5ab4262..7e4534a 100644 (file)
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -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)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 118cf69..1daa9c0 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -210,7 +210,7 @@ If VERSION is nil, the package is not loaded (it is \"disabled\")."
 (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/"))

diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index ce613fe..6228559 100644 (file)
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -99,7 +99,8 @@ supported.  Defaults to non-nil on Windows, nil otherwise."
              (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 ()

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index cfde976..6692028 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4121,7 +4121,6 @@ The message should be narrowed to just the headers."
 
 (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 ()

diff --git a/lisp/obsolete/lmenu.el b/lisp/obsolete/lmenu.el
index 632d338..8f676e0 100644 (file)
--- a/lisp/obsolete/lmenu.el
+++ b/lisp/obsolete/lmenu.el
@@ -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)

diff --git a/lisp/subr.el b/lisp/subr.el
index 4046555..6709ebf 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2177,7 +2177,7 @@ floating point support."
            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\".

diff --git a/lisp/window.el b/lisp/window.el
index 29f3853..9bc9291 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6811,7 +6811,6 @@ See also `fit-frame-to-buffer-margins'."
   :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."