[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b4d1cdd 5/6: Pacify byte-compiler for byte-compile-
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master b4d1cdd 5/6: Pacify byte-compiler for byte-compile-macroexpand-declare-function |
Date: |
Wed, 18 May 2016 07:49:35 +0000 (UTC) |
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
- [Emacs-diffs] master updated (631ca55 -> 07ebcf1), Paul Eggert, 2016/05/18
- [Emacs-diffs] master b4d1cdd 5/6: Pacify byte-compiler for byte-compile-macroexpand-declare-function,
Paul Eggert <=
- [Emacs-diffs] master 6f5db02 1/6: Sync from gnulib, Paul Eggert, 2016/05/18
- [Emacs-diffs] master 07ebcf1 6/6: ‘make check-declare’ now chatters less, Paul Eggert, 2016/05/18
- [Emacs-diffs] master ccd5156 3/6: Pacify byte-compiler in lisp/url, Paul Eggert, 2016/05/18
- [Emacs-diffs] master 639fd22 4/6: Pacify byte-compiler for with-wrapper-hook, Paul Eggert, 2016/05/18
- [Emacs-diffs] master 374f6a5 2/6: Port --enable-gcc-warnings to GCC 6.1, Paul Eggert, 2016/05/18