comparison lisp/occur.el @ 5855:0bddb59072b6

Look for cased character classes when deciding on case-fold-search, #'isearch lisp/ChangeLog addition: 2015-03-11 Aidan Kehoe <kehoea@parhasard.net> * isearch-mode.el: * isearch-mode.el (isearch-fix-case): Use the new #'no-case-regexp-p function if treating ISEARCH-STRING as a regular expression; otherwise, use the [[:upper:]] character class. * isearch-mode.el (isearch-no-upper-case-p): Removed. * isearch-mode.el (with-caps-disable-folding): Removed. These two haven't been used since 1998. * occur.el (occur-1): Use #'no-case-regexp-p here. * replace.el (perform-replace): Don't use #'no-upper-case-p, use #'no-case-regexp-p or (string-match "[[:upper:]]" ...) as appropriate. * simple.el: * simple.el (no-upper-case-p): Removed. This did two different things, and its secondary function (examining regular expressions) just became much more complicated; move the regular expression functionality to its own function, use character classes when examining non-regular-expressions instead. The code to look for character classes, and the design decision that this should be done, are from GNU, thank you Stefan Monnier. * simple.el (no-case-regexp-p): New. Given a REGEXP, return non-nil if it has nothing to suggest an interactive user wants a case-sensitive search. * simple.el (with-search-caps-disable-folding): * simple.el (with-interactive-search-caps-disable-folding): Update both these macros to use #'no-case-regexp-p.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 11 Mar 2015 18:06:15 +0000
parents cc6f0266bc36
children
comparison
equal deleted inserted replaced
5854:ccb0cff115d2 5855:0bddb59072b6
392 (let ((inhibit-read-only t)) 392 (let ((inhibit-read-only t))
393 (erase-buffer) 393 (erase-buffer)
394 (let ((count (occur-engine 394 (let ((count (occur-engine
395 regexp active-bufs occur-buf 395 regexp active-bufs occur-buf
396 (or nlines list-matching-lines-default-context-lines) 396 (or nlines list-matching-lines-default-context-lines)
397 (and case-fold-search 397 (and case-fold-search (no-case-regexp-p regexp))
398 (no-upper-case-p regexp t))
399 list-matching-lines-buffer-name-face 398 list-matching-lines-buffer-name-face
400 nil list-matching-lines-face t))) 399 nil list-matching-lines-face t)))
401 (let* ((bufcount (length active-bufs)) 400 (let* ((bufcount (length active-bufs))
402 (diff (- (length bufs) bufcount))) 401 (diff (- (length bufs) bufcount)))
403 (message "Searched %d buffer%s%s; %s match%s for `%s'" 402 (message "Searched %d buffer%s%s; %s match%s for `%s'"