Mercurial > hg > xemacs-beta

diff src/window.c @ 5171:8cd17b2131a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix further crash in window-mirror finding -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-03-28 Ben Wing <ben@xemacs.org> * window.c (find_window_mirror_internal): Stop looking if no window mirror, and return 0. * window.c (window_display_lines): * window.c (window_display_buffer): * window.c (set_window_display_buffer): Don't need to update window mirror before calling find_window_mirror because does the updating automatically.
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 00:00:06 -0500
parents 5ddbab03b0e6
children be6e5ea38dda
line wrap: on
line diff
--- a/src/window.c	Thu Mar 25 06:07:25 2010 -0500
+++ b/src/window.c	Mon Mar 29 00:00:06 2010 -0500
@@ -627,7 +627,7 @@
 find_window_mirror_internal (Lisp_Object win, struct window_mirror *rmir,
 			    struct window *w)
 {
-  for (; !NILP (win); win = XWINDOW (win)->next, rmir = rmir->next)
+  for (; !NILP (win) && rmir; win = XWINDOW (win)->next, rmir = rmir->next)
     {
       if (w == XWINDOW (win))
 	return rmir;
@@ -764,8 +764,6 @@
 {
   struct window_mirror *t;
 
-  if (XFRAME (w->frame)->mirror_dirty)
-    update_frame_window_mirror (XFRAME (w->frame));
   t = find_window_mirror (w);
   assert (t);
 
@@ -787,8 +785,6 @@
 {
   struct window_mirror *t;
 
-  if (XFRAME (w->frame)->mirror_dirty)
-    update_frame_window_mirror (XFRAME (w->frame));
   t = find_window_mirror (w);
   assert (t);
 
@@ -800,8 +796,6 @@
 {
   struct window_mirror *t;
 
-  if (XFRAME (w->frame)->mirror_dirty)
-    update_frame_window_mirror (XFRAME (w->frame));
   t = find_window_mirror (w);
   assert (t);