[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/emacs-lisp bytecomp.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp/emacs-lisp bytecomp.el |
Date: |
Tue, 25 Aug 2009 07:36:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/08/25 07:36:50
Modified files:
lisp/emacs-lisp: bytecomp.el
Log message:
(byte-compile-file-form-require): Tweak previous change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/bytecomp.el?cvsroot=emacs&r1=2.250&r2=2.251
Patches:
Index: bytecomp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/bytecomp.el,v
retrieving revision 2.250
retrieving revision 2.251
diff -u -b -r2.250 -r2.251
--- bytecomp.el 25 Aug 2009 07:28:20 -0000 2.250
+++ bytecomp.el 25 Aug 2009 07:36:49 -0000 2.251
@@ -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))