diff options
| author | Oleh Krehel | 2015-08-12 20:12:14 +0200 |
|---|---|---|
| committer | Oleh Krehel | 2015-08-12 20:15:57 +0200 |
| commit | 401bc8b28d47db697e4997d35059ce5bc45f5648 (patch) | |
| tree | 72ae7a655f2db8b216baf17e5201c31d7b45b664 | |
| parent | ad0b6dd05a1a782dc12e921fc077aef46698e063 (diff) | |
| download | emacs-401bc8b28d47db697e4997d35059ce5bc45f5648.tar.gz emacs-401bc8b28d47db697e4997d35059ce5bc45f5648.zip | |
loadhist.el (read-feature): Conform to completing-read
* 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.
| -rw-r--r-- | lisp/loadhist.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 056a4ef4dc2..52fd04736f6 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el | |||
| @@ -101,10 +101,15 @@ A library name is equivalent to the file name that `load-library' would load." | |||
| 101 | "Read feature name from the minibuffer, prompting with string PROMPT. | 101 | "Read feature name from the minibuffer, prompting with string PROMPT. |
| 102 | If optional second arg LOADED-P is non-nil, the feature must be loaded | 102 | If optional second arg LOADED-P is non-nil, the feature must be loaded |
| 103 | from a file." | 103 | from a file." |
| 104 | (intern (completing-read prompt | 104 | (intern (completing-read |
| 105 | features | 105 | prompt |
| 106 | (and loaded-p #'feature-file) | 106 | (mapcar #'symbol-name |
| 107 | loaded-p))) | 107 | (if loaded-p |
| 108 | (delq nil | ||
| 109 | (mapcar | ||
| 110 | (lambda (x) (and (feature-file x) x)) | ||
| 111 | features)) | ||
| 112 | features))))) | ||
| 108 | 113 | ||
| 109 | (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks) | 114 | (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks) |
| 110 | (defvar unload-feature-special-hooks | 115 | (defvar unload-feature-special-hooks |