[Emacs-diffs] trunk r113958: * minibuffer.el (completion--sifn-requote): Bind `non-essential'.

[Michael Albinus]

------------------------------------------------------------
revno: 113958
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-20 12:04:13 +0200
message:
  * minibuffer.el (completion--sifn-requote): Bind `non-essential'.
  
  * rfn-eshadow.el (rfn-eshadow-update-overlay): Move binding of
  `non-essential' up.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/minibuffer.el             
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622
  lisp/rfn-eshadow.el            
rfneshadow.el-20091113204419-o5vbwnq5f7feedwu-2245

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-17 10:20:15 +0000
+++ b/lisp/ChangeLog    2013-08-20 10:04:13 +0000
@@ -1,3 +1,10 @@
+2013-08-20  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp.el:

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2013-07-30 20:42:15 +0000
+++ b/lisp/minibuffer.el        2013-08-20 10:04:13 +0000
@@ -2246,7 +2246,8 @@
   ;; - 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,

=== modified file 'lisp/rfn-eshadow.el'
--- a/lisp/rfn-eshadow.el       2013-01-01 09:11:05 +0000
+++ b/lisp/rfn-eshadow.el       2013-08-20 10:04:13 +0000
@@ -176,11 +176,11 @@
 `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