diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-28 15:07:52 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-28 15:07:52 -0400 |
| commit | b9383404934cc07ec1f92b0354a559ed44cf4b2c (patch) | |
| tree | 3888ab31c03fbe0569db206a0ea8a58d62f396fc /lisp/minibuffer.el | |
| parent | 86957a0cd3f273a83ce6584dcbaf513c2db429dc (diff) | |
| download | emacs-b9383404934cc07ec1f92b0354a559ed44cf4b2c.tar.gz | |
* lisp/minibuffer.el (completion--twq-all): Disable too-strict assertions.
Fixes: debbugs:11714
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 420d8f9d0fd..38347f23f7d 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -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)))) |