* minibuffer.el (completion--twq-all): Beware completion-ignore-case.

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96273f72ece..b75a6606779 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion--twq-all): Beware completion-ignore-case.
+
 2012-05-03  Wilson Snyder  <wsnyder@wsnyder.org>
 
         * progmodes/verilog-mode.el (font-lock-keywords):
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 1d459b0db62..f468db9768a 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -546,16 +546,19 @@ for use at QPOS."
       ;; which only get quoted when needed by choose-completion.
       (nconc
        (mapcar (lambda (completion)
-                 (assert (string-prefix-p prefix completion))
+                 (assert (string-prefix-p prefix completion 'ignore-case) t)
                  (let* ((new (substring completion (length prefix)))
                         (qnew (funcall qfun new))
                         (qcompletion (concat qprefix qnew)))
                    (assert
-                    (equal (funcall unquote
+                    (eq t (compare-strings
+                           (funcall unquote
                                     (concat (substring string 0 qboundary)
                                             qcompletion))
+                           nil nil
                            (concat (substring ustring 0 boundary)
-                                   completion)))
+                                   completion)
+                           nil nil 'ignore-case)))
                    qcompletion))
                completions)
        qboundary))))