From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 18 Jun 2012 20:39:52 +0000 (+0200)
Subject: * minibuffer.el (read-file-name-default): Revert the patch from 2012-06-17.
X-Git-Tag: emacs-24.2.90~1199^2~433
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b11952a33ff7f4989c9366f24bbe894ae6c05e1;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90fad4be7eb..00a33cc01b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
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."
            (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))