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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90fad4be7ebeb56473bdc3cae589354fae1100e9..00a33cc01b96e3b81f3d602d4d96b1065f0a9fb0 100644 (file)
--- 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 e4453afe046f01fef80645f2c644a4d200d32e98..a084ed9fb4dca07462e8ebc89755cbbe739973cf 100644 (file)
--- 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))