Mercurial > hg > xemacs-beta
comparison lisp/prim/replace.el @ 26:441bb1e64a06 r19-15b96
Import from CVS: tag r19-15b96
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:51:32 +0200 |
parents | bcdc7deadc19 |
children | 131b0175ea99 |
comparison
equal
deleted
inserted
replaced
25:383a494979f8 | 26:441bb1e64a06 |
---|---|
579 (defun perform-replace-next-event (event) | 579 (defun perform-replace-next-event (event) |
580 (if isearch-highlight | 580 (if isearch-highlight |
581 (let ((aborted t)) | 581 (let ((aborted t)) |
582 (unwind-protect | 582 (unwind-protect |
583 (progn | 583 (progn |
584 (isearch-highlight (match-beginning 0) (match-end 0)) | 584 (if (match-beginning 0) |
585 (isearch-highlight (match-beginning 0) (match-end 0))) | |
585 (next-command-event event) | 586 (next-command-event event) |
586 (setq aborted nil)) | 587 (setq aborted nil)) |
587 (isearch-dehighlight aborted))) | 588 (isearch-dehighlight aborted))) |
588 (next-command-event event))) | 589 (next-command-event event))) |
589 | 590 |
733 (setq done t replaced t)) | 734 (setq done t replaced t)) |
734 ((eq def 'act-and-show) | 735 ((eq def 'act-and-show) |
735 (if (not replaced) | 736 (if (not replaced) |
736 (progn | 737 (progn |
737 (replace-match next-replacement nocasify literal) | 738 (replace-match next-replacement nocasify literal) |
739 (store-match-data nil) | |
738 (setq replaced t)))) | 740 (setq replaced t)))) |
739 ((eq def 'automatic) | 741 ((eq def 'automatic) |
740 (or replaced | 742 (or replaced |
741 (replace-match next-replacement nocasify literal)) | 743 (replace-match next-replacement nocasify literal)) |
742 (setq done t query-flag nil replaced t)) | 744 (setq done t query-flag nil replaced t)) |