]> git.eshelyaron.com Git - emacs.git/commitdiff
loadhist.el (read-feature): Conform to completing-read
authorOleh Krehel <ohwoeowho@gmail.com>
Wed, 12 Aug 2015 18:12:14 +0000 (20:12 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Wed, 12 Aug 2015 18:15:57 +0000 (20:15 +0200)
* lisp/loadhist.el (read-feature): According to `completing-read'
  documentation, if collection is a list, then it must be a list of
  strings. And not a list of symbols like before.

lisp/loadhist.el

index 056a4ef4dc26065639d5e6eaddb0d1158912641d..52fd04736f62620bb38e00ba355bbeeb52a105b7 100644 (file)
@@ -101,10 +101,15 @@ A library name is equivalent to the file name that `load-library' would load."
   "Read feature name from the minibuffer, prompting with string PROMPT.
 If optional second arg LOADED-P is non-nil, the feature must be loaded
 from a file."
-  (intern (completing-read prompt
-                          features
-                          (and loaded-p #'feature-file)
-                          loaded-p)))
+  (intern (completing-read
+           prompt
+           (mapcar #'symbol-name
+                   (if loaded-p
+                       (delq nil
+                             (mapcar
+                              (lambda (x) (and (feature-file x) x))
+                              features))
+                     features)))))
 
 (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks)
 (defvar unload-feature-special-hooks