diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-19 13:27:25 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-19 13:27:25 -0500 |
| commit | ac5392dcfda42b26767ae966a8b290142c00bff7 (patch) | |
| tree | 4e61b7a92fec122e993400b379aff463a56283ec /lisp | |
| parent | 19dc72069c79865d5464737b4ce10ed25a3be49b (diff) | |
| download | emacs-ac5392dcfda42b26767ae966a8b290142c00bff7.tar.gz | |
* lisp/files.el (load-file): Require match in minibuffer selection, as was
the case in Emacs-20 before we changed the spec to allow .elc files.
Fixes: debbugs:12935
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd81564d032..50effda7a48 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca> + * files.el (load-file): Require match in minibuffer selection, as was + the case in Emacs-20 before we changed the spec to allow .elc files + (bug#12935). + * json.el: Don't require cl since we don't use it. * color.el: Don't require cl. (color-complement): `caddr' -> `nth 2'. diff --git a/lisp/files.el b/lisp/files.el index 8e8a178caab..40eddec469b 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -730,7 +730,7 @@ The path separator is colon in GNU and GNU-like systems." ;; This is a case where .elc makes a lot of sense. (interactive (list (let ((completion-ignored-extensions (remove ".elc" completion-ignored-extensions))) - (read-file-name "Load file: ")))) + (read-file-name "Load file: " nil nil 'lambda)))) (load (expand-file-name file) nil nil t)) (defun locate-file (filename path &optional suffixes predicate) |