diff options
| author | Glenn Morris | 2009-08-25 07:36:49 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-08-25 07:36:49 +0000 |
| commit | d280e2c3f0c543d8a86f0deb71799c7de693a9aa (patch) | |
| tree | 542dea6874cb3f52141d97adabf270eb0caa39ab | |
| parent | bac9c66cc78624f5cd7868258308e0ae5a916650 (diff) | |
| download | emacs-d280e2c3f0c543d8a86f0deb71799c7de693a9aa.tar.gz emacs-d280e2c3f0c543d8a86f0deb71799c7de693a9aa.zip | |
(byte-compile-file-form-require): Tweak previous change.
| -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. | |||
| 2324 | (let ((args (mapcar 'eval (cdr form)))) | 2324 | (let ((args (mapcar 'eval (cdr form)))) |
| 2325 | (apply 'require args) | 2325 | (apply 'require args) |
| 2326 | ;; Detect (require 'cl) in a way that works even if cl is already loaded. | 2326 | ;; Detect (require 'cl) in a way that works even if cl is already loaded. |
| 2327 | (when (member (car args) '("cl" cl)) | 2327 | (when (and (member (car args) '("cl" cl)) |
| 2328 | (if (byte-compile-warning-enabled-p 'cl-functions) | 2328 | (byte-compile-warning-enabled-p 'cl-functions)) |
| 2329 | (byte-compile-warn "cl package required at runtime")) | 2329 | (byte-compile-warn "cl package required at runtime") |
| 2330 | (byte-compile-disable-warning 'cl-functions))) | 2330 | (byte-compile-disable-warning 'cl-functions))) |
| 2331 | (byte-compile-keep-pending form 'byte-compile-normal-call)) | 2331 | (byte-compile-keep-pending form 'byte-compile-normal-call)) |
| 2332 | 2332 | ||