diff options
author | Glenn Morris <rgm@gnu.org> | 2009-08-25 07:36:49 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2009-08-25 07:36:49 +0000 |
commit | d280e2c3f0c543d8a86f0deb71799c7de693a9aa (patch) | |
tree | 542dea6874cb3f52141d97adabf270eb0caa39ab /lisp/emacs-lisp/bytecomp.el | |
parent | bac9c66cc78624f5cd7868258308e0ae5a916650 (diff) | |
download | emacs-d280e2c3f0c543d8a86f0deb71799c7de693a9aa.tar.gz emacs-d280e2c3f0c543d8a86f0deb71799c7de693a9aa.tar.bz2 emacs-d280e2c3f0c543d8a86f0deb71799c7de693a9aa.zip |
(byte-compile-file-form-require): Tweak previous change.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
-rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 70557d5e247..b8e63a4f5f8 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2324,9 +2324,9 @@ list that represents a doc string reference. (let ((args (mapcar 'eval (cdr form)))) (apply 'require args) ;; Detect (require 'cl) in a way that works even if cl is already loaded. - (when (member (car args) '("cl" cl)) - (if (byte-compile-warning-enabled-p 'cl-functions) - (byte-compile-warn "cl package required at runtime")) + (when (and (member (car args) '("cl" cl)) + (byte-compile-warning-enabled-p 'cl-functions)) + (byte-compile-warn "cl package required at runtime") (byte-compile-disable-warning 'cl-functions))) (byte-compile-keep-pending form 'byte-compile-normal-call)) |