# HG changeset patch
# User root <root>
# Date 648960272 0
# Node ID ada1c5de39683036a2dfe2de69f0211ed3a22451
# Parent  21f566443ad1b0b837b65b87b7302bd9f6b63d0b
*** empty log message ***

diff -r 21f566443ad1 -r ada1c5de3968 lisp/replace.el
--- a/lisp/replace.el	Mon Jul 16 02:29:23 1990 +0000
+++ b/lisp/replace.el	Thu Jul 26 02:44:32 1990 +0000
@@ -80,6 +80,7 @@
 (defvar occur-buffer nil)
 (defvar occur-nlines nil)
 (defvar occur-pos-list nil)
+(defvar occur-last-string "")
 
 (defun occur-mode ()
   "Major mode for output from \\[occur].
@@ -131,19 +132,23 @@
 (fset 'list-matching-lines 'occur)
 
 (defun occur (regexp &optional nlines)
-  "Show lines  containing a match for REGEXP.  If the global variable
+  "Show lines containing a match for REGEXP.  If the global variable
 occur-whole-buffer is non-nil, the entire buffer is searched, otherwise
-search begins at point.
+search begins at point.  Interactively, REGEXP defaults to the last REGEXP
+used interactively.
 
 Each line is displayed with NLINES lines before and after,
- or -NLINES before if NLINES is negative.
+or -NLINES before if NLINES is negative.
 NLINES defaults to list-matching-lines-default-context-lines.
 Interactively it is the prefix arg.
 
 The lines are shown in a buffer named *Occur*.
 It serves as a menu to find any of the occurrences in this buffer.
 \\[describe-mode] in that buffer will explain how."
-  (interactive "sList lines matching regexp: \nP")
+  (interactive (list (setq occur-last-string
+			   (read-string "List lines matching regexp: "
+					occur-last-string))
+		     current-prefix-arg))
   (setq nlines (if nlines (prefix-numeric-value nlines)
 		 list-matching-lines-default-context-lines))
   (let ((first t)