emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/replace.el,v


From: Stefan Monnier
Subject: [Emacs-diffs] Changes to emacs/lisp/replace.el,v
Date: Mon, 23 Jul 2007 21:32:34 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/07/23 21:32:34

Index: replace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/replace.el,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- replace.el  15 Jul 2007 01:50:59 -0000      1.257
+++ replace.el  23 Jul 2007 21:32:32 -0000      1.258
@@ -1408,16 +1408,14 @@
   (or map (setq map query-replace-map))
   (and query-flag minibuffer-auto-raise
        (raise-frame (window-frame (minibuffer-window))))
-  (let ((nocasify (not (and case-fold-search case-replace
-                           (string-equal from-string
-                                         (downcase from-string)))))
-       (case-fold-search (and case-fold-search
-                              (string-equal from-string
-                                            (downcase from-string))))
+  (let* ((case-fold-search
+          (and case-fold-search
+               (isearch-no-upper-case-p from-string regexp-flag)))
+         (nocasify (not (and case-replace case-fold-search)))
        (literal (or (not regexp-flag) (eq regexp-flag 'literal)))
        (search-function (if regexp-flag 're-search-forward 'search-forward))
        (search-string from-string)
-       (real-match-data nil)           ; the match data for the current match
+         (real-match-data nil)       ; The match data for the current match.
        (next-replacement nil)
        ;; This is non-nil if we know there is nothing for the user
        ;; to edit in the replacement.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]