(save_excursion_restore): Don't use XBUFFER on

a non-buffer.

(save_excursion_restore): Don't use XBUFFER on
a non-buffer.
ba973f7a · Gerd Moellmann · b792ae36 · ba973f7a · ba973f7a
Commit ba973f7a authored Apr 26, 2001 by Gerd Moellmann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/editfns.c src/editfns.c +5 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2001-04-26  Gerd Moellmann  <gerd@gnu.org>
+
+	* editfns.c (save_excursion_restore): Don't use XBUFFER on
+	a non-buffer.
+
 2001-04-25  Gerd Moellmann  <gerd@gnu.org>

 	* term.c (toggle_highlight): New function.

--- a/src/editfns.c
+++ b/src/editfns.c
@@ -848,8 +848,11 @@ save_excursion_restore (info)
  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;