mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

* lisp/minibuffer.el (completion--twq-all): Disable too-strict assertions.

Browse Source 
Fixes: debbugs:11714
This commit is contained in:
Stefan Monnier 2012-10-28 15:07:52 -04:00
parent 86957a0cd3
commit b938340493
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/ChangeLog
View File

@ -2,6 +2,7 @@
* minibuffer.el (completion--sifn-requote): Rewrite to handle things
like Tramp's "/foo:~bar//baz" -> "/scpc:foo:/baz" mapping (bug#11714).
(completion--twq-all): Disable too-strict assertions.
* tmm.el (tmm-prompt): Use map-keymap (bug#12744).

28
lisp/minibuffer.el
View File

@ -529,10 +529,12 @@ for use at QPOS."
(`(,qfullpos . ,qfun)
(funcall requote (+ boundary (length prefix)) string))
(qfullprefix (substring string 0 qfullpos))
(_ (cl-assert (completion--string-equal-p
(funcall unquote qfullprefix)
(concat (substring ustring 0 boundary) prefix))
t))
;; FIXME: This assertion can be wrong, e.g. in Cygwin, where
;; (unquote "c:\bin") => "/usr/bin" but (unquote "c:\") => "/".
;;(cl-assert (completion--string-equal-p
;; (funcall unquote qfullprefix)
;; (concat (substring ustring 0 boundary) prefix))
;; t))
(qboundary (car (funcall requote boundary string)))
(_ (cl-assert (<= qboundary qfullpos)))
;; FIXME: this split/quote/concat business messes up the carefully
@ -561,14 +563,16 @@ for use at QPOS."
(let* ((new (substring completion (length prefix)))
(qnew (funcall qfun new))
(qcompletion (concat qprefix qnew)))
(cl-assert
(completion--string-equal-p
(funcall unquote
(concat (substring string 0 qboundary)
qcompletion))
(concat (substring ustring 0 boundary)
completion))
t)
;; FIXME: Similarly here, Cygwin's mapping trips this
;; assertion.
;;(cl-assert
;; (completion--string-equal-p
;; (funcall unquote
;; (concat (substring string 0 qboundary)
;; qcompletion))
;; (concat (substring ustring 0 boundary)
;; completion))
;; t)
qcompletion))
completions)
qboundary))))