aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-04-30 20:06:15 -0400
committerGlenn Morris2015-04-30 20:06:15 -0400
commitce7ff436ffd6d9ace7e8d89f4cc81c427407cfaf (patch)
tree247a8880fff37d8d3ac92eece43b36ad61402e8f
parente0d0ad2acce8a153f10ecbb84c51c6e0981e3c0c (diff)
downloademacs-ce7ff436ffd6d9ace7e8d89f4cc81c427407cfaf.tar.gz
emacs-ce7ff436ffd6d9ace7e8d89f4cc81c427407cfaf.zip
Function declaration updates prompted by 'make check-declare'
* lisp/emacs-lisp/package.el (lm-homepage): * lisp/gnus/gnus-util.el (iswitchb-read-buffer): * lisp/gnus/mm-decode.el (libxml-parse-html-region): * lisp/gnus/mml.el (libxml-parse-html-region): * lisp/gnus/nnrss.el (libxml-parse-html-region): * lisp/net/eww.el (libxml-parse-html-region): * lisp/net/shr.el (libxml-parse-html-region): * lisp/vc/vc-bzr.el (vc-annotate-convert-time): * lisp/vc/vc-cvs.el (vc-annotate-convert-time): * lisp/vc/vc-git.el (vc-annotate-convert-time): * lisp/vc/vc-hg.el (vc-annotate-convert-time): * lisp/vc/vc-mtn.el (vc-annotate-convert-time): * lisp/vc/vc-rcs.el (vc-annotate-convert-time): Update declaration.
-rw-r--r--lisp/emacs-lisp/package.el2
-rw-r--r--lisp/gnus/gnus-util.el3
-rw-r--r--lisp/gnus/mm-decode.el2
-rw-r--r--lisp/gnus/mml.el2
-rw-r--r--lisp/gnus/nnrss.el2
-rw-r--r--lisp/net/eww.el2
-rw-r--r--lisp/net/shr.el2
-rw-r--r--lisp/vc/vc-bzr.el2
-rw-r--r--lisp/vc/vc-cvs.el2
-rw-r--r--lisp/vc/vc-git.el2
-rw-r--r--lisp/vc/vc-hg.el2
-rw-r--r--lisp/vc/vc-mtn.el2
-rw-r--r--lisp/vc/vc-rcs.el2
13 files changed, 14 insertions, 13 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index db61ababd6d..c2c0f34d1ae 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -956,7 +956,7 @@ is wrapped around any parts requiring it."
956 deps)))) 956 deps))))
957 957
958(declare-function lm-header "lisp-mnt" (header)) 958(declare-function lm-header "lisp-mnt" (header))
959(declare-function lm-homepage "lisp-mnt" ()) 959(declare-function lm-homepage "lisp-mnt" (&optional file))
960 960
961(defun package-buffer-info () 961(defun package-buffer-info ()
962 "Return a `package-desc' describing the package in the current buffer. 962 "Return a `package-desc' describing the package in the current buffer.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 7bacaba286d..4b06cc00416 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1575,7 +1575,8 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
1575 1575
1576 1576
1577(declare-function iswitchb-read-buffer "iswitchb" 1577(declare-function iswitchb-read-buffer "iswitchb"
1578 (prompt &optional default require-match start matches-set)) 1578 (prompt &optional default require-match
1579 _predicate start matches-set))
1579(defvar iswitchb-temp-buflist) 1580(defvar iswitchb-temp-buflist)
1580 1581
1581(defun gnus-iswitchb-completing-read (prompt collection &optional require-match 1582(defun gnus-iswitchb-completing-read (prompt collection &optional require-match
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index ae6bb71dfc7..bce9abdcc8d 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1827,7 +1827,7 @@ If RECURSIVE, search recursively."
1827 (not (mm-long-lines-p 76)))))) 1827 (not (mm-long-lines-p 76))))))
1828 1828
1829(declare-function libxml-parse-html-region "xml.c" 1829(declare-function libxml-parse-html-region "xml.c"
1830 (start end &optional base-url)) 1830 (start end &optional base-url discard-comments))
1831(declare-function shr-insert-document "shr" (dom)) 1831(declare-function shr-insert-document "shr" (dom))
1832(defvar shr-blocked-images) 1832(defvar shr-blocked-images)
1833(defvar shr-use-fonts) 1833(defvar shr-use-fonts)
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 2a3b228097a..57544758597 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -463,7 +463,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
463(defvar mml-inhibit-compute-boundary nil) 463(defvar mml-inhibit-compute-boundary nil)
464 464
465(declare-function libxml-parse-html-region "xml.c" 465(declare-function libxml-parse-html-region "xml.c"
466 (start end &optional base-url)) 466 (start end &optional base-url discard-comments))
467 467
468(defun mml-generate-mime (&optional multipart-type) 468(defun mml-generate-mime (&optional multipart-type)
469 "Generate a MIME message based on the current MML document. 469 "Generate a MIME message based on the current MML document.
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index ac9c5ffab2c..1546f922e7a 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -395,7 +395,7 @@ otherwise return nil."
395 (mm-coding-system-p 'utf-8))) 395 (mm-coding-system-p 'utf-8)))
396 396
397(declare-function libxml-parse-html-region "xml.c" 397(declare-function libxml-parse-html-region "xml.c"
398 (start end &optional base-url)) 398 (start end &optional base-url discard-comments))
399(defun nnrss-fetch (url &optional local) 399(defun nnrss-fetch (url &optional local)
400 "Fetch URL and put it in a the expected Lisp structure." 400 "Fetch URL and put it in a the expected Lisp structure."
401 (mm-with-unibyte-buffer 401 (mm-with-unibyte-buffer
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index a128ffb9d06..f2f5ecb8e88 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -379,7 +379,7 @@ Currently this means either text/html or application/xhtml+xml."
379 (match-string 1))))) 379 (match-string 1)))))
380 380
381(declare-function libxml-parse-html-region "xml.c" 381(declare-function libxml-parse-html-region "xml.c"
382 (start end &optional base-url)) 382 (start end &optional base-url discard-comments))
383 383
384(defun eww-display-html (charset url &optional document point buffer encode) 384(defun eww-display-html (charset url &optional document point buffer encode)
385 (unless (fboundp 'libxml-parse-html-region) 385 (unless (fboundp 'libxml-parse-html-region)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 454332e55d0..7763507734f 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -178,7 +178,7 @@ cid: URL as the argument.")
178 178
179;; Public functions and commands. 179;; Public functions and commands.
180(declare-function libxml-parse-html-region "xml.c" 180(declare-function libxml-parse-html-region "xml.c"
181 (start end &optional base-url)) 181 (start end &optional base-url discard-comments))
182 182
183(defun shr-render-buffer (buffer) 183(defun shr-render-buffer (buffer)
184 "Display the HTML rendering of the current buffer." 184 "Display the HTML rendering of the current buffer."
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 9c52106fdb5..a1f6bab5fd4 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -873,7 +873,7 @@ property containing author and date information."
873 (move-marker (process-mark proc) (point)))) 873 (move-marker (process-mark proc) (point))))
874 (process-put proc :vc-left-over string))))))) 874 (process-put proc :vc-left-over string)))))))
875 875
876(declare-function vc-annotate-convert-time "vc-annotate" (time)) 876(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
877 877
878(defun vc-bzr-annotate-time () 878(defun vc-bzr-annotate-time ()
879 (when (re-search-forward "^ *[0-9.]+ +.+? +|" nil t) 879 (when (re-search-forward "^ *[0-9.]+ +.+? +|" nil t)
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 232dcc2185e..9a41905abd2 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -651,7 +651,7 @@ Optional arg REVISION is a revision to annotate from."
651 (re-search-forward vc-cvs-annotate-first-line-re) 651 (re-search-forward vc-cvs-annotate-first-line-re)
652 (delete-region (point-min) (1- (point))))))) 652 (delete-region (point-min) (1- (point)))))))
653 653
654(declare-function vc-annotate-convert-time "vc-annotate" (time)) 654(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
655 655
656(defun vc-cvs-annotate-current-time () 656(defun vc-cvs-annotate-current-time ()
657 "Return the current time, based at midnight of the current day, and 657 "Return the current time, based at midnight of the current day, and
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index c8b696a03bb..2bca723ce77 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1035,7 +1035,7 @@ or BRANCH^ (where \"^\" can be repeated)."
1035 (append (vc-switches 'git 'annotate) 1035 (append (vc-switches 'git 'annotate)
1036 (list rev "--" name))))) 1036 (list rev "--" name)))))
1037 1037
1038(declare-function vc-annotate-convert-time "vc-annotate" (time)) 1038(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
1039 1039
1040(defun vc-git-annotate-time () 1040(defun vc-git-annotate-time ()
1041 (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t) 1041 (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t)
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index c841dfcdf54..c302436d83b 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -373,7 +373,7 @@ Optional arg REVISION is a revision to annotate from."
373 (append (vc-switches 'hg 'annotate) 373 (append (vc-switches 'hg 'annotate)
374 (if revision (list (concat "-r" revision)))))) 374 (if revision (list (concat "-r" revision))))))
375 375
376(declare-function vc-annotate-convert-time "vc-annotate" (time)) 376(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
377 377
378;; The format for one line output by "hg annotate -d -n" looks like this: 378;; The format for one line output by "hg annotate -d -n" looks like this:
379;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS 379;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index cd84ebe7afa..93bd1f6a83f 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -261,7 +261,7 @@ If LIMIT is non-nil, show no more than this many entries."
261 (append (vc-switches 'mtn 'annotate) 261 (append (vc-switches 'mtn 'annotate)
262 (if rev (list "-r" rev))))) 262 (if rev (list "-r" rev)))))
263 263
264(declare-function vc-annotate-convert-time "vc-annotate" (time)) 264(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
265 265
266(defconst vc-mtn-annotate-full-re 266(defconst vc-mtn-annotate-full-re
267 "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ") 267 "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ")
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 8aedc00269d..1e1990890a2 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -758,7 +758,7 @@ Optional arg REVISION is a revision to annotate from."
758 (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) 758 (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht))
759 (forward-line 1)))) 759 (forward-line 1))))
760 760
761(declare-function vc-annotate-convert-time "vc-annotate" (time)) 761(declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
762 762
763(defun vc-rcs-annotate-current-time () 763(defun vc-rcs-annotate-current-time ()
764 "Return the current time, based at midnight of the current day, and 764 "Return the current time, based at midnight of the current day, and