# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 988288623 0
# Node ID b9cea35cf91f01f5ad9e30d3a6d938b93193d8e9
# Parent  772178ae2c7e4afcd247f042fb92fa6abb9077ac
(save_excursion_restore): Don't use XBUFFER on
a non-buffer.

diff -r 772178ae2c7e -r b9cea35cf91f src/editfns.c
--- a/src/editfns.c	Thu Apr 26 11:35:32 2001 +0000
+++ b/src/editfns.c	Thu Apr 26 12:37:03 2001 +0000
@@ -848,8 +848,11 @@
   tem = XCDR (info);
   if (visible_p
       && !EQ (tem, selected_window)
-      /* This also verifies that the window is still live.  */
-      && XBUFFER (XWINDOW (tem)->buffer) == current_buffer)
+      && (tem1 = XWINDOW (tem)->buffer,
+	  (/* Window is live...  */
+	   BUFFERP (tem1)
+	   /* ...and it shows the current buffer.  */
+	   && XBUFFER (tem1) == current_buffer)))
     Fset_window_point (tem, make_number (PT));
 
   UNGCPRO;