[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/bytecomp.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/bytecomp.el |
Date: |
Tue, 25 Aug 2009 07:28:20 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/08/25 07:28:20
Modified files:
lisp : ChangeLog
lisp/emacs-lisp: bytecomp.el
Log message:
(byte-compile-eval): Fix test for cl in load-history for absolute
file-names.
(byte-compile-file-form-require): Warn about use of the cl package.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16008&r2=1.16009
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/bytecomp.el?cvsroot=emacs&r1=2.249&r2=2.250
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16008
retrieving revision 1.16009
diff -u -b -r1.16008 -r1.16009
--- ChangeLog 25 Aug 2009 03:26:40 -0000 1.16008
+++ ChangeLog 25 Aug 2009 07:28:16 -0000 1.16009
@@ -4,6 +4,10 @@
2009-08-25 Glenn Morris <address@hidden>
+ * emacs-lisp/bytecomp.el (byte-compile-eval): Fix test for cl in
+ load-history for absolute file-names.
+ (byte-compile-file-form-require): Warn about use of the cl package.
+
* format.el (format-alist): Doc fix.
* play/bubbles.el (top-level): Don't require cl at run-time.
Index: emacs-lisp/bytecomp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/bytecomp.el,v
retrieving revision 2.249
retrieving revision 2.250
diff -u -b -r2.249 -r2.250
--- emacs-lisp/bytecomp.el 10 Aug 2009 16:28:18 -0000 2.249
+++ emacs-lisp/bytecomp.el 25 Aug 2009 07:28:20 -0000 2.250
@@ -902,7 +902,9 @@
(while (and hist-new (not (eq hist-new hist-orig)))
(let ((xs (pop hist-new)))
;; Make sure the file was not already loaded before.
- (when (and (equal (car xs) "cl") (not (assoc (car xs) hist-orig)))
+ (and (stringp (car xs))
+ (string-match "^cl\\>" (file-name-nondirectory (car xs)))
+ (not (assoc (car xs) hist-orig))
(byte-compile-find-cl-functions)))))))))
(defun byte-compile-eval-before-compile (form)
@@ -2322,7 +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.
- (if (member (car args) '("cl" cl))
+ (when (member (car args) '("cl" cl))
+ (if (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))
- [Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/bytecomp.el,
Glenn Morris <=