aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/apropos.el23
2 files changed, 15 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d594cae6e..9a2e46c919 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2009-02-20 Glenn Morris <[email protected]>
+ * apropos.el (apropos-library): Remove the element with null filename,
+ if present, from the completion list.
+
* mail/rmail.el (rmail-speedbar-buttons): Only add regular files.
(rmail-speedbar-find-file): Use rmail rather than find-file.
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 7a427b0c6f..91e763185b 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -569,17 +569,18 @@ Returns list of symbols and documentation found."
FILE should be one of the libraries currently loaded and should
thus be found in `load-history'."
(interactive
- (let ((libs
- (nconc (delq nil
- (mapcar
- (lambda (l)
- (setq l (file-name-nondirectory l))
- (while
- (not (equal (setq l (file-name-sans-extension l))
- l)))
- l)
- (mapcar 'car load-history)))
- (mapcar 'car load-history))))
+ (let* ((libs (delq nil (mapcar 'car load-history)))
+ (libs
+ (nconc (delq nil
+ (mapcar
+ (lambda (l)
+ (setq l (file-name-nondirectory l))
+ (while
+ (not (equal (setq l (file-name-sans-extension l))
+ l)))
+ l)
+ libs))
+ libs)))
(list (completing-read "Describe library: " libs nil t))))
(let ((symbols nil)
;; (autoloads nil)