[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/minibuffer.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/minibuffer.el,v |
Date: |
Wed, 03 Sep 2008 14:09:51 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/09/03 14:09:51
Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- minibuffer.el 1 Sep 2008 21:34:23 -0000 1.57
+++ minibuffer.el 3 Sep 2008 14:09:50 -0000 1.58
@@ -1383,13 +1383,8 @@
(case x
((star any point)
(if (if (consp group) (memq x group) group)
- "\\(.*?\\)"
- ".*?"))
- (t
- (if (and completion-ignore-case
- (string-match "[[:alpha:]]" x))
- (format "[%s%s]" (downcase x) (upcase x))
- (regexp-quote x)))))
+ "\\(.*?\\)" ".*?"))
+ (t (regexp-quote x))))
pattern
""))))
;; Avoid pathological backtracking.
@@ -1413,6 +1408,7 @@
;; since all-completions is written in C!
(let* (;; Convert search pattern to a standard regular expression.
(regex (completion-pcm--pattern->regex pattern))
+ (case-fold-search completion-ignore-case)
(completion-regexp-list (cons regex completion-regexp-list))
(compl (all-completions
(concat prefix (if (stringp (car pattern)) (car pattern)
""))
@@ -1426,8 +1422,7 @@
(if (not (functionp table))
;; The internal functions already obeyed completion-regexp-list.
compl
- (let ((case-fold-search completion-ignore-case)
- (poss ()))
+ (let ((poss ()))
(dolist (c compl)
(when (string-match regex c) (push c poss)))
poss)))))
@@ -1435,6 +1430,7 @@
(defun completion-pcm--hilit-commonality (pattern completions)
(when completions
(let* ((re (completion-pcm--pattern->regex pattern '(point)))
+ (case-fold-search completion-ignore-case)
(last (last completions))
(base-size (cdr last)))
;; Remove base-size during mapcar, and add it back later.