changeset 71037:a0da1a83020d

(load-history-regexp): If FILE is relative, insist entire last name component must match it. (load-history-filename-element, load-history-regexp): Doc fixes.
author Richard M. Stallman <rms@gnu.org>
date Mon, 29 May 2006 00:28:43 +0000
parents 2a973dfbccc2
children 50e8561148f4
files lisp/subr.el
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/subr.el	Mon May 29 00:18:44 2006 +0000
+++ b/lisp/subr.el	Mon May 29 00:28:43 2006 +0000
@@ -1394,11 +1394,11 @@
      nil))
 
 (defun load-history-regexp (file)
-  "Form a regexp to find FILE in load-history.
-FILE, a string, is described in eval-after-load's doc-string."
+  "Form a regexp to find FILE in `load-history'.
+FILE, a string, is described in the function `eval-after-load'."
   (if (file-name-absolute-p file)
       (setq file (file-truename file)))
-  (concat (if (file-name-absolute-p file) "\\`" "\\<")
+  (concat (if (file-name-absolute-p file) "\\`" "\\(\\`\\|/\\)")
 	  (regexp-quote file)
 	  (if (file-name-extension file)
 	      ""
@@ -1409,7 +1409,7 @@
 	  "\\)?\\'"))
 
 (defun load-history-filename-element (file-regexp)
-  "Get the first elt of load-history whose car matches FILE-REGEXP.
+  "Get the first elt of `load-history' whose car matches FILE-REGEXP.
 Return nil if there isn't one."
   (let* ((loads load-history)
 	 (load-elt (and loads (car loads))))
@@ -1432,8 +1432,8 @@
 additionally may or may not have an extension denoting a compressed
 format \(e.g. \".gz\").
 
-When FILE is absolute, it is first converted to a true name by chasing
-out symbolic links.  Only a file of this name \(see next paragraph for
+When FILE is absolute, this first converts it to a true name by chasing
+symbolic links.  Only a file of this name \(see next paragraph regarding
 extensions) will trigger the evaluation of FORM.  When FILE is relative,
 a file whose absolute true name ends in FILE will trigger evaluation.