diff options
| author | Leo Liu <sdl.web@gmail.com> | 2013-11-15 14:52:40 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2013-11-15 14:52:40 +0800 |
| commit | a1f03e8916caa24f1abc2aa14f98a79303017698 (patch) | |
| tree | 44f4654406788beadcee133feb5557743d136044 /lisp | |
| parent | 1a191e5c73cdae3d3b34f5fc3501bfd2ddf50ec8 (diff) | |
| download | emacs-a1f03e8916caa24f1abc2aa14f98a79303017698.tar.gz | |
* lisp/loadhist.el (read-feature): Get rid of fake feature nil.
* src/minibuf.c (Ftry_completion, Fall_completions)
(Ftest_completion): Use FUNCTIONP. (Bug#15889)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/loadhist.el | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1be44bceff9..e3eb6da2f71 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-11-15 Leo Liu <sdl.web@gmail.com> + + * loadhist.el (read-feature): Get rid of fake feature nil. (Bug#15889) + 2013-11-14 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/gud.el (ctl-x-map): diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 620344734b3..b8433e1cbaa 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -101,14 +101,10 @@ 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 - (cons nil features) - (and loaded-p - #'(lambda (f) - (and f ; ignore nil - (feature-file f)))) - loaded-p))) + (intern (completing-read prompt + features + (and loaded-p #'feature-file) + loaded-p))) (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks) (defvar unload-feature-special-hooks |