comparison lisp/replace.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 c6b1500299a7
children bbe4146603db
comparison
equal deleted inserted replaced
5854:ccb0cff115d2 5855:0bddb59072b6
561 (match-again t) 561 (match-again t)
562 (recenter-last-op nil) ; Start cycling order with initial position. 562 (recenter-last-op nil) ; Start cycling order with initial position.
563 ;; XEmacs addition 563 ;; XEmacs addition
564 (qr-case-fold-search 564 (qr-case-fold-search
565 (if (and case-fold-search search-caps-disable-folding) 565 (if (and case-fold-search search-caps-disable-folding)
566 (no-upper-case-p search-string regexp-flag) 566 (if regexp-flag
567 (no-case-regexp-p search-string)
568 (save-match-data
569 (let (case-fold-search)
570 (not (string-match "[[:upper:]]" search-string)))))
567 case-fold-search)) 571 case-fold-search))
568 (message 572 (message
569 (if query-flag 573 (if query-flag
570 (substitute-command-keys 574 (substitute-command-keys
571 "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")))) 575 "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) "))))