aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-06-18 22:39:52 +0200
committerMichael Albinus2012-06-18 22:39:52 +0200
commit6b11952a33ff7f4989c9366f24bbe894ae6c05e1 (patch)
treef94593b6748b10b20b27f96f704854e863ca5e05
parentee4b13300e0b1feae48d8141026f9235e9ebe69a (diff)
downloademacs-6b11952a33ff7f4989c9366f24bbe894ae6c05e1.tar.gz
emacs-6b11952a33ff7f4989c9366f24bbe894ae6c05e1.zip
* minibuffer.el (read-file-name-default): Revert the patch from 2012-06-17.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/minibuffer.el5
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90fad4be7eb..00a33cc01b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-06-18 Michael Albinus <michael.albinus@gmx.de>
2
3 * minibuffer.el (read-file-name-default): Revert the patch from
4 2012-06-17.
5
12012-06-18 Stefan Monnier <monnier@iro.umontreal.ca> 62012-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emacs-lisp/pcase.el (pcase--expand): Warn for unused pattern. 8 * emacs-lisp/pcase.el (pcase--expand): Warn for unused pattern.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index e4453afe046..a084ed9fb4d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -461,7 +461,7 @@ for use at QPOS."
461 (last (last completions))) 461 (last (last completions)))
462 (when (consp last) (setcdr last nil)) 462 (when (consp last) (setcdr last nil))
463 completions)) 463 completions))
464 464
465 ((eq action 'completion--unquote) 465 ((eq action 'completion--unquote)
466 (let ((ustring (funcall unquote string)) 466 (let ((ustring (funcall unquote string))
467 (uprefix (funcall unquote (substring string 0 pred)))) 467 (uprefix (funcall unquote (substring string 0 pred))))
@@ -2335,8 +2335,7 @@ See `read-file-name' for the meaning of the arguments."
2335 (if (consp default-filename) 2335 (if (consp default-filename)
2336 (mapcar 'abbreviate-file-name default-filename) 2336 (mapcar 'abbreviate-file-name default-filename)
2337 (abbreviate-file-name default-filename)))) 2337 (abbreviate-file-name default-filename))))
2338 (let ((non-essential t) 2338 (let ((insdef (cond
2339 (insdef (cond
2340 ((and insert-default-directory (stringp dir)) 2339 ((and insert-default-directory (stringp dir))
2341 (if initial 2340 (if initial
2342 (cons (minibuffer--double-dollars (concat dir initial)) 2341 (cons (minibuffer--double-dollars (concat dir initial))