aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1996-09-04 17:13:24 +0000
committerRichard M. Stallman1996-09-04 17:13:24 +0000
commit3043b0b49099a30ad9004fbc543c1661969644a4 (patch)
tree84a03c839442d851a2c6becfd87c7fec1af4fcbd
parent8d4e82b502175a979aea6cf651c657f60993133b (diff)
downloademacs-3043b0b49099a30ad9004fbc543c1661969644a4.tar.gz
emacs-3043b0b49099a30ad9004fbc543c1661969644a4.zip
(perform-replace): Increment replace-count
in the places where we do the replacement.
-rw-r--r--lisp/replace.el16
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index 90c66fa47c0..cc603d96c0b 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -626,21 +626,28 @@ which will run faster and probably do exactly what you want."
626 (sit-for 1))) 626 (sit-for 1)))
627 ((eq def 'act) 627 ((eq def 'act)
628 (or replaced 628 (or replaced
629 (replace-match next-replacement nocasify literal)) 629 (progn
630 (replace-match next-replacement nocasify literal)
631 (setq replace-count (1+ replace-count))))
630 (setq done t replaced t)) 632 (setq done t replaced t))
631 ((eq def 'act-and-exit) 633 ((eq def 'act-and-exit)
632 (or replaced 634 (or replaced
633 (replace-match next-replacement nocasify literal)) 635 (progn
636 (replace-match next-replacement nocasify literal)
637 (setq replace-count (1+ replace-count))))
634 (setq keep-going nil) 638 (setq keep-going nil)
635 (setq done t replaced t)) 639 (setq done t replaced t))
636 ((eq def 'act-and-show) 640 ((eq def 'act-and-show)
637 (if (not replaced) 641 (if (not replaced)
638 (progn 642 (progn
639 (replace-match next-replacement nocasify literal) 643 (replace-match next-replacement nocasify literal)
644 (setq replace-count (1+ replace-count))
640 (setq replaced t)))) 645 (setq replaced t))))
641 ((eq def 'automatic) 646 ((eq def 'automatic)
642 (or replaced 647 (or replaced
643 (replace-match next-replacement nocasify literal)) 648 (progn
649 (replace-match next-replacement nocasify literal)
650 (setq replace-count (1+ replace-count))))
644 (setq done t query-flag nil replaced t)) 651 (setq done t query-flag nil replaced t))
645 ((eq def 'skip) 652 ((eq def 'skip)
646 (setq done t)) 653 (setq done t))
@@ -682,8 +689,7 @@ which will run faster and probably do exactly what you want."
682 (prog1 (marker-position elt) 689 (prog1 (marker-position elt)
683 (set-marker elt nil)))) 690 (set-marker elt nil))))
684 (match-data)))) 691 (match-data))))
685 stack)) 692 stack))))
686 (if replaced (setq replace-count (1+ replace-count)))))
687 (setq lastrepl (point))) 693 (setq lastrepl (point)))
688 (replace-dehighlight)) 694 (replace-dehighlight))
689 (or unread-command-events 695 (or unread-command-events