* lisp/minibuffer.el (completion--twq-all): Again, allow case differences.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 246906df9f9c204745eecbeeba603defcaf47ff7..f54e2da78f1f896b1bc845878218acf8f5b5164a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * minibuffer.el (completion--twq-all): Again, allow case differences.
+
        * term.el: Move keymap initialization code to be more idiomatic.
        (term-signals-menu, term-mode-map, term-raw-map, term-raw-escape-map)
        (term-terminal-menu): Move initialization into declaration.

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f468db9768a9df45ce88697d46a64dada89fcb35..60a70fbcce71516a2dc6a589574d7e870b794220 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -519,9 +519,10 @@ for use at QPOS."
          (`(,qfullpos . ,qfun)
           (funcall requote (+ boundary (length prefix)) string))
          (qfullprefix (substring string 0 qfullpos))
-         (_ (assert (let ((uboundarystr (substring ustring 0 boundary)))
-                      (equal (funcall unquote qfullprefix)
-                             (concat uboundarystr prefix)))))
+         (_ (assert (eq t (compare-strings
+                           (funcall unquote qfullprefix) nil nil
+                           (concat (substring ustring 0 boundary) prefix)
+                           nil nil 'ignore-case))))
          (qboundary (car (funcall requote boundary string)))
          (_ (assert (<= qboundary qfullpos)))
          ;; FIXME: this split/quote/concat business messes up the carefully