From: Martin Rudalics <rudalics@gmx.at>
Date: Sun, 10 Jun 2007 16:15:10 +0000 (+0000)
Subject: (byte-compile-find-cl-functions): Match
X-Git-Tag: emacs-pretest-23.0.90~12376
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7940bf7dc0a572e6d05bb198c738b436657210f1;p=emacs.git

(byte-compile-find-cl-functions): Match
against file-name-nondirectory.
Fix text on user customization variables.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 337e0be3ef9..c0b00b8fbb1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-10  Martin Rudalics  <rudalics@gmx.at>
+
+	* emacs-lisp/bytecomp.el (byte-compile-find-cl-functions): Match
+	against file-name-nondirectory.
+	Fix text on user customization variables.
+	Reported by Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se>.
+
 2007-06-09  Alfred M. Szmidt  <ams@gnu.org>  (tiny change)
 
 	* mail/rmail.el (rmail-movemail-variant-in-use): Fix doc typo.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 0a37f098a7b..619b7533ca7 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -98,7 +98,7 @@
 ;;				`obsolete'  (obsolete variables and functions)
 ;;				`noruntime' (calls to functions only defined
 ;;					     within `eval-when-compile')
-;;				`cl-warnings' (calls to CL functions)
+;;				`cl-functions' (calls to CL functions)
 ;;				`interactive-only' (calls to commands that are
 ;;						   not good to call from Lisp)
 ;;				`make-local' (dubious calls to
@@ -1348,7 +1348,8 @@ extra args."
   (unless byte-compile-cl-functions
     (dolist (elt load-history)
       (when (and (stringp (car elt))
-		 (string-match "^cl\\>" (car elt)))
+		 (string-match
+		  "^cl\\>" (file-name-nondirectory (car elt))))
 	(setq byte-compile-cl-functions
 	      (append byte-compile-cl-functions
 		      (cdr elt)))))