From ce7ff436ffd6d9ace7e8d89f4cc81c427407cfaf Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 30 Apr 2015 20:06:15 -0400 Subject: [PATCH] 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. --- lisp/emacs-lisp/package.el | 2 +- lisp/gnus/gnus-util.el | 3 ++- lisp/gnus/mm-decode.el | 2 +- lisp/gnus/mml.el | 2 +- lisp/gnus/nnrss.el | 2 +- lisp/net/eww.el | 2 +- lisp/net/shr.el | 2 +- lisp/vc/vc-bzr.el | 2 +- lisp/vc/vc-cvs.el | 2 +- lisp/vc/vc-git.el | 2 +- lisp/vc/vc-hg.el | 2 +- lisp/vc/vc-mtn.el | 2 +- lisp/vc/vc-rcs.el | 2 +- 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." deps)))) (declare-function lm-header "lisp-mnt" (header)) -(declare-function lm-homepage "lisp-mnt" ()) +(declare-function lm-homepage "lisp-mnt" (&optional file)) (defun package-buffer-info () "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', (declare-function iswitchb-read-buffer "iswitchb" - (prompt &optional default require-match start matches-set)) + (prompt &optional default require-match + _predicate start matches-set)) (defvar iswitchb-temp-buflist) (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." (not (mm-long-lines-p 76)))))) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (declare-function shr-insert-document "shr" (dom)) (defvar shr-blocked-images) (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." (defvar mml-inhibit-compute-boundary nil) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun mml-generate-mime (&optional multipart-type) "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." (mm-coding-system-p 'utf-8))) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun nnrss-fetch (url &optional local) "Fetch URL and put it in a the expected Lisp structure." (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." (match-string 1))))) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun eww-display-html (charset url &optional document point buffer encode) (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.") ;; Public functions and commands. (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun shr-render-buffer (buffer) "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." (move-marker (process-mark proc) (point)))) (process-put proc :vc-left-over string))))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-bzr-annotate-time () (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." (re-search-forward vc-cvs-annotate-first-line-re) (delete-region (point-min) (1- (point))))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-cvs-annotate-current-time () "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)." (append (vc-switches 'git 'annotate) (list rev "--" name))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-git-annotate-time () (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." (append (vc-switches 'hg 'annotate) (if revision (list (concat "-r" revision)))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) ;; The format for one line output by "hg annotate -d -n" looks like this: ;;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." (append (vc-switches 'mtn 'annotate) (if rev (list "-r" rev))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defconst vc-mtn-annotate-full-re "^ *\\([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." (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) (forward-line 1)))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-rcs-annotate-current-time () "Return the current time, based at midnight of the current day, and -- 2.39.2