[Emacs-diffs] master b4d1cdd 5/6: Pacify byte-compiler for byte-compile-macroexpand-declare-function

[Paul Eggert]

branch: master
commit b4d1cddc1b238f0c53ef7eb52e7dcf3467d412ea
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Pacify byte-compiler for byte-compile-macroexpand-declare-function
    
    * lisp/emacs-lisp/bytecomp.el: Change signature of
    byte-compile-macroexpand-declare-function to match that of
    declare-function.
---
 lisp/emacs-lisp/bytecomp.el |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 11eb44c..aa13210 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2958,23 +2958,24 @@ for symbols generated by the byte compiler itself."
         (list body))))
 
 ;; Special macro-expander used during byte-compilation.
-(defun byte-compile-macroexpand-declare-function (fn file &rest args)
-  (let ((gotargs (and (consp args) (listp (car args))))
+(defun byte-compile-macroexpand-declare-function (fn file &optional arglist
+                                                     fileonly)
+  (let ((gotargs (listp arglist))
        (unresolved (assq fn byte-compile-unresolved-functions)))
     (when unresolved         ; function was called before declaration
       (if (and gotargs (byte-compile-warning-enabled-p 'callargs))
-         (byte-compile-arglist-warn fn (car args) nil)
+         (byte-compile-arglist-warn fn arglist nil)
        (setq byte-compile-unresolved-functions
              (delq unresolved byte-compile-unresolved-functions))))
     (push (cons fn (if gotargs
-                      (list 'declared (car args))
+                      (list 'declared arglist)
                     t))                     ; Arglist not specified.
          byte-compile-function-environment))
   ;; We are stating that it _will_ be defined at runtime.
   (setq byte-compile-noruntime-functions
         (delq fn byte-compile-noruntime-functions))
   ;; Delegate the rest to the normal macro definition.
-  (macroexpand `(declare-function ,fn ,file ,@args)))
+  (macroexpand `(declare-function ,fn ,file ,arglist ,fileonly)))
 
 
 ;; This is the recursive entry point for compiling each subform of an