Commit c88586a9 authored by Michael Albinus's avatar Michael Albinus
Browse files

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

* rfn-eshadow.el (rfn-eshadow-update-overlay): Move binding of
`non-essential' up.
parent 236beba0
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> 2013-08-17 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el: * net/tramp.el:
......
...@@ -2246,7 +2246,8 @@ same as `substitute-in-file-name'." ...@@ -2246,7 +2246,8 @@ same as `substitute-in-file-name'."
;; - Cygwin (substitute-in-file-name "C:\bin") => "/usr/bin" ;; - Cygwin (substitute-in-file-name "C:\bin") => "/usr/bin"
;; (substitute-in-file-name "C:\") => "/" ;; (substitute-in-file-name "C:\") => "/"
;; (substitute-in-file-name "C:\bi") => "/bi" ;; (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)) (uprefix (substring ustr 0 upos))
qprefix) qprefix)
;; Main assumption: nothing after qpos should affect the text before upos, ;; Main assumption: nothing after qpos should affect the text before upos,
......
...@@ -176,11 +176,11 @@ This is intended to be used as a minibuffer `post-command-hook' for ...@@ -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 `file-name-shadow-mode'; the minibuffer should have already
been set up by `rfn-eshadow-setup-minibuffer'." been set up by `rfn-eshadow-setup-minibuffer'."
(condition-case nil (condition-case nil
(let ((goal (substitute-in-file-name (minibuffer-contents))) (let* ((non-essential t)
(mid (overlay-end rfn-eshadow-overlay)) (goal (substitute-in-file-name (minibuffer-contents)))
(start (minibuffer-prompt-end)) (mid (overlay-end rfn-eshadow-overlay))
(end (point-max)) (start (minibuffer-prompt-end))
(non-essential t)) (end (point-max)))
(unless (unless
;; Catch the common case where the shadow does not need to move. ;; Catch the common case where the shadow does not need to move.
(and mid (and mid
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment