[Emacs-diffs] /srv/bzr/emacs/trunk r110708: * lisp/minibuffer.el (completion--twq-all): Disable too-strict assertions.

[Stefan Monnier]

------------------------------------------------------------
revno: 110708
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11714
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 15:07:52 -0400
message:
  * lisp/minibuffer.el (completion--twq-all): Disable too-strict assertions.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-28 18:48:17 +0000
+++ b/lisp/ChangeLog    2012-10-28 19:07:52 +0000
@@ -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).
 

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-10-28 18:48:17 +0000
+++ b/lisp/minibuffer.el        2012-10-28 19:07:52 +0000
@@ -529,10 +529,12 @@
          (`(,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 @@
                  (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))))