From: Stefan Monnier Date: Mon, 19 Nov 2012 18:27:25 +0000 (-0500) Subject: * lisp/files.el (load-file): Require match in minibuffer selection, as was X-Git-Tag: emacs-24.3.90~173^2~18^2~53 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac5392dcfda42b26767ae966a8b290142c00bff7;p=emacs.git * 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 cd81564d032..50effda7a48 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2012-11-19 Stefan Monnier + * 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)