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

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

1 files changed, 5 insertions, 5 deletions

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