Mercurial > emacs

changeset 104587:169761687b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(byte-compile-file-form-require): Tweak previous change.
author Glenn Morris <rgm@gnu.org>
date Tue, 25 Aug 2009 07:36:49 +0000
parents 2786934ea419
children 862c2cba639a
files lisp/emacs-lisp/bytecomp.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emacs-lisp/bytecomp.el	Tue Aug 25 07:28:16 2009 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Tue Aug 25 07:36:49 2009 +0000
@@ -2324,9 +2324,9 @@
   (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))