[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108115: * minibuffer.el (completion--twq-all): Beware completion-ignore-case.

[Stefan Monnier]

------------------------------------------------------------
revno: 108115
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-03 15:54:07 -0400
message:
  * minibuffer.el (completion--twq-all): Beware completion-ignore-case.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-03 19:23:55 +0000
+++ b/lisp/ChangeLog    2012-05-03 19:54:07 +0000
@@ -1,3 +1,7 @@
+2012-05-03  Stefan Monnier  <address@hidden>
+
+       * minibuffer.el (completion--twq-all): Beware completion-ignore-case.
+
 2012-05-03  Wilson Snyder  <address@hidden>
 
        * progmodes/verilog-mode.el (font-lock-keywords):

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-05-01 00:21:23 +0000
+++ b/lisp/minibuffer.el        2012-05-03 19:54:07 +0000
@@ -546,16 +546,19 @@
       ;; 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))))