# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 889863336 0
# Node ID e917eb0d4e011492c3ca28cc495a3968639d46fc
# Parent  f9887487a4a11ff00c5d44afa5b8b6ee57e7ddab
(save-match-data): store-match-data => set-match-data.

(store-match-data): This is now the alias,
set-match-data is now the primitive.

(momentary-string-display): Pass t as UPDATE to window-end.

diff -r f9887487a4a1 -r e917eb0d4e01 lisp/subr.el
--- a/lisp/subr.el	Sat Mar 14 05:46:01 1998 +0000
+++ b/lisp/subr.el	Sat Mar 14 08:15:36 1998 +0000
@@ -543,7 +543,7 @@
 (defalias 'search-forward-regexp (symbol-function 're-search-forward))
 (defalias 'search-backward-regexp (symbol-function 're-search-backward))
 (defalias 'int-to-string 'number-to-string)
-(defalias 'set-match-data 'store-match-data)
+(defalias 'store-match-data 'set-match-data)
 
 ;;; Should this be an obsolete name?  If you decide it should, you get
 ;;; to go through all the sources and change them.
@@ -825,7 +825,7 @@
 	    (insert-before-markers string)
 	    (setq insert-end (point))
 	    ;; If the message end is off screen, recenter now.
-	    (if (< (window-end) insert-end)
+	    (if (< (window-end nil t) insert-end)
 		(recenter (/ (window-height) 2)))
 	    ;; If that pushed message start off the screen,
 	    ;; scroll to start it at the top of the screen.
@@ -993,7 +993,7 @@
   `(let ((save-match-data-internal (match-data)))
        (unwind-protect
 	   (progn ,@body)
-	 (store-match-data save-match-data-internal))))
+	 (set-match-data save-match-data-internal))))
 
 (defun match-string (num &optional string)
   "Return string of text matched by last search.