* minibuffer.el (completion--sifn-requote): Bind `non-essential'.

* rfn-eshadow.el (rfn-eshadow-update-overlay): Move binding of
`non-essential' up.

3 files changed, 14 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28431e9a08d..d8c4797434e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * minibuffer.el (completion--sifn-requote): Bind `non-essential'.
+
+        * rfn-eshadow.el (rfn-eshadow-update-overlay): Move binding of
+        `non-essential' up.
+
 2013-08-17  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el:
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index e07d28a54d0..72cb6f7e894 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2246,7 +2246,8 @@ same as `substitute-in-file-name'."
   ;; - Cygwin (substitute-in-file-name "C:\bin") => "/usr/bin"
   ;;          (substitute-in-file-name "C:\") => "/"
   ;;          (substitute-in-file-name "C:\bi") => "/bi"
-  (let* ((ustr (substitute-in-file-name qstr))
+  (let* ((non-essential t)
+         (ustr (substitute-in-file-name qstr))
          (uprefix (substring ustr 0 upos))
          qprefix)
     ;; Main assumption: nothing after qpos should affect the text before upos,
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index cf5f1d16974..8d29c43980c 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -176,11 +176,11 @@ This is intended to be used as a minibuffer `post-command-hook' for
 `file-name-shadow-mode'; the minibuffer should have already
 been set up by `rfn-eshadow-setup-minibuffer'."
   (condition-case nil
-      (let ((goal (substitute-in-file-name (minibuffer-contents)))
-            (mid (overlay-end rfn-eshadow-overlay))
-            (start (minibuffer-prompt-end))
-            (end (point-max))
-            (non-essential t))
+      (let* ((non-essential t)
+             (goal (substitute-in-file-name (minibuffer-contents)))
+             (mid (overlay-end rfn-eshadow-overlay))
+             (start (minibuffer-prompt-end))
+             (end (point-max)))
         (unless
             ;; Catch the common case where the shadow does not need to move.
             (and mid