* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd81564d032db5fb958142da990f03a42d6ac93d..50effda7a48089e088c2edb1e73980a068912abc 100644 (file)
--- 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 8e8a178caab6dd661bf047bc90b21b5c30b93925..40eddec469b4ed039e71c2848dac0ee85aee3c3e 100644 (file)
--- 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)