aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/help-fns.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbb9692b6b2..2dcc50d873a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-10-29 Romain Francoise <romain@orebokech.com>
2
3 * help-fns.el (describe-simplify-lib-file-name): Fix regexp.
4
12005-10-29 Ken Manheimer <ken.manheimer@gmail.com> 52005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
2 6
3 * pgg-gpg.el 7 * pgg-gpg.el
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index cffe313fd6c..88f32003867 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -291,7 +291,7 @@ face (according to `face-differs-from-default-p')."
291 ;; Now convert that back to a file name and see if we get 291 ;; Now convert that back to a file name and see if we get
292 ;; the original one. If so, they are equivalent. 292 ;; the original one. If so, they are equivalent.
293 (if (equal file (locate-file libname load-path '(""))) 293 (if (equal file (locate-file libname load-path '("")))
294 (if (string-match "[.]elc?\\'" libname) 294 (if (string-match "[.]elc\\'" libname)
295 (substring libname 0 -1) 295 (substring libname 0 -1)
296 libname) 296 libname)
297 file)))) 297 file))))