emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r110950: * lisp/files.el (load-file):


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r110950: * lisp/files.el (load-file): Require match in minibuffer selection, as was
Date: Mon, 19 Nov 2012 13:27:25 -0500
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 110950
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12935
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-11-19 13:27:25 -0500
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/files.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-19 17:24:12 +0000
+++ b/lisp/ChangeLog    2012-11-19 18:27:25 +0000
@@ -1,5 +1,9 @@
 2012-11-19  Stefan Monnier  <address@hidden>
 
+       * 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'.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-11-08 19:50:08 +0000
+++ b/lisp/files.el     2012-11-19 18:27:25 +0000
@@ -730,7 +730,7 @@
   ;; 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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]