From d280e2c3f0c543d8a86f0deb71799c7de693a9aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 25 Aug 2009 07:36:49 +0000 Subject: [PATCH] (byte-compile-file-form-require): Tweak previous change. --- lisp/emacs-lisp/bytecomp.el | 6 +++--- 1 file 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)) -- 2.39.5