1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00

* minibuffer.el (read-file-name-default): Revert the patch from 2012-06-17.

This commit is contained in:
Michael Albinus 2012-06-18 22:39:52 +02:00
parent ee4b13300e
commit 6b11952a33
2 changed files with 7 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2012-06-18 Michael Albinus <michael.albinus@gmx.de>
* minibuffer.el (read-file-name-default): Revert the patch from
2012-06-17.
2012-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/pcase.el (pcase--expand): Warn for unused pattern.

View File

@ -461,7 +461,7 @@ for use at QPOS."
(last (last completions)))
(when (consp last) (setcdr last nil))
completions))
((eq action 'completion--unquote)
(let ((ustring (funcall unquote string))
(uprefix (funcall unquote (substring string 0 pred))))
@ -2335,8 +2335,7 @@ See `read-file-name' for the meaning of the arguments."
(if (consp default-filename)
(mapcar 'abbreviate-file-name default-filename)
(abbreviate-file-name default-filename))))
(let ((non-essential t)
(insdef (cond
(let ((insdef (cond
((and insert-default-directory (stringp dir))
(if initial
(cons (minibuffer--double-dollars (concat dir initial))