Mercurial > emacs
comparison lisp/replace.el @ 90105:7e3f621f1dd4
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
Move Gnus images into etc/images
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
Update from CVS: lisp/imap.el (imap-log): Doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 18 Feb 2005 00:41:50 +0000 |
parents | 3ebd9bdb4fe5 aa148fbcec2e |
children | bf0d492ea2d5 |
comparison
equal
deleted
inserted
replaced
90104:a01e7a9f1659 | 90105:7e3f621f1dd4 |
---|---|
1433 (if (not query-flag) | 1433 (if (not query-flag) |
1434 (let ((inhibit-read-only | 1434 (let ((inhibit-read-only |
1435 query-replace-skip-read-only)) | 1435 query-replace-skip-read-only)) |
1436 (unless (or literal noedit) | 1436 (unless (or literal noedit) |
1437 (replace-highlight (nth 0 real-match-data) | 1437 (replace-highlight (nth 0 real-match-data) |
1438 (nth 1 real-match-data))) | 1438 (nth 1 real-match-data) |
1439 start end)) | |
1439 (setq noedit | 1440 (setq noedit |
1440 (replace-match-maybe-edit | 1441 (replace-match-maybe-edit |
1441 next-replacement nocasify literal | 1442 next-replacement nocasify literal |
1442 noedit real-match-data) | 1443 noedit real-match-data) |
1443 replace-count (1+ replace-count))) | 1444 replace-count (1+ replace-count))) |
1449 ;; leave behind proper match data for the stack. | 1450 ;; leave behind proper match data for the stack. |
1450 ;; Commands not setting `done' need to adjust | 1451 ;; Commands not setting `done' need to adjust |
1451 ;; `real-match-data'. | 1452 ;; `real-match-data'. |
1452 (while (not done) | 1453 (while (not done) |
1453 (set-match-data real-match-data) | 1454 (set-match-data real-match-data) |
1454 (replace-highlight (match-beginning 0) (match-end 0)) | 1455 (replace-highlight (match-beginning 0) (match-end 0) |
1456 start end) | |
1455 ;; Bind message-log-max so we don't fill up the message log | 1457 ;; Bind message-log-max so we don't fill up the message log |
1456 ;; with a bunch of identical messages. | 1458 ;; with a bunch of identical messages. |
1457 (let ((message-log-max nil)) | 1459 (let ((message-log-max nil)) |
1458 (message message | 1460 (message message |
1459 (query-replace-descr from-string) | 1461 (query-replace-descr from-string) |
1625 (if (= replace-count 1) "" "s"))) | 1627 (if (= replace-count 1) "" "s"))) |
1626 (and keep-going stack))) | 1628 (and keep-going stack))) |
1627 | 1629 |
1628 (defvar replace-overlay nil) | 1630 (defvar replace-overlay nil) |
1629 | 1631 |
1630 (defun replace-highlight (beg end) | 1632 (defun replace-highlight (match-beg match-end range-beg range-end) |
1631 (if query-replace-highlight | 1633 (if query-replace-highlight |
1632 (if replace-overlay | 1634 (if replace-overlay |
1633 (move-overlay replace-overlay beg end (current-buffer)) | 1635 (move-overlay replace-overlay match-beg match-end (current-buffer)) |
1634 (setq replace-overlay (make-overlay beg end)) | 1636 (setq replace-overlay (make-overlay match-beg match-end)) |
1635 (overlay-put replace-overlay 'priority 1) ;higher than lazy overlays | 1637 (overlay-put replace-overlay 'priority 1) ;higher than lazy overlays |
1636 (overlay-put replace-overlay 'face 'query-replace))) | 1638 (overlay-put replace-overlay 'face 'query-replace))) |
1637 (if query-replace-lazy-highlight | 1639 (when query-replace-lazy-highlight |
1638 (isearch-lazy-highlight-new-loop))) | 1640 (isearch-lazy-highlight-new-loop range-beg range-end))) |
1639 | 1641 |
1640 (defun replace-dehighlight () | 1642 (defun replace-dehighlight () |
1641 (when replace-overlay | 1643 (when replace-overlay |
1642 (delete-overlay replace-overlay)) | 1644 (delete-overlay replace-overlay)) |
1643 (when query-replace-lazy-highlight | 1645 (when query-replace-lazy-highlight |