Yoshiaki Kasahara <kasahara(a)nc.kyushu-u.ac.jp&gt; writes: The problem is that replace-buffer-in-windws doesn't work correctly when called on X. I can't understand how window_loop can work under all conditions, so I made a simpler functions to do it. It does more CONSing, but I guess it's faster because you don't have to call Fnext_window every time. Perhaps I should convert some type of window_loop, too. 2000-12-18 Yoshiki Hayashi <yoshiki(a)xemacs.org&gt; * buffer.c (Fkill_buffer): Map over all devices. * window.c (window_loop): Remove UNSHOW_BUFFER code. (list_windows): New function. (list_all_windows): Ditto. (Freplace_buffer_in_windows): Use them. Index: src/buffer.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/buffer.c,v retrieving revision 1.36.2.45 diff -u -r1.36.2.45 buffer.c --- buffer.c 2000/12/18 11:13:37 1.36.2.45 +++ buffer.c 2000/12/18 11:43:04 ＠＠ -1259,7 +1259,9 ＠＠ /* #### This is a problem if this buffer is in a dedicated window. Need to undedicate any windows of this buffer first (and delete them?) */ - Freplace_buffer_in_windows (buf, Qnil, Qnil); + GCPRO1 (buf); + Freplace_buffer_in_windows (buf, Qnil, Qall); + UNGCPRO; font_lock_buffer_was_killed (b); Index: src/window.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/window.c,v retrieving revision 1.41.2.68 diff -u -r1.41.2.68 window.c --- window.c 2000/12/18 11:13:43 1.41.2.68 +++ window.c 2000/12/18 11:43:17 ＠＠ -2132,7 +2132,7 ＠＠ By default, only the windows in the selected frame are considered. The optional argument WHICH-FRAMES changes this behavior: WHICH-FRAMES = `visible' means search windows on all visible frames. -WHICH-FRAMES = 0 means search windows on all visible and iconified frames. +WHICH-FRAMES = 0 means search windows on all visible and iconified frames. WHICH-FRAMES = t means search windows on all frames including invisible frames. WHICH-FRAMES = a frame means search only windows on that frame. Anything else means restrict to the selected frame. ＠＠ -2278,7 +2278,7 ＠＠ By default, only the windows in the selected frame are considered. The optional argument WHICH-FRAMES changes this behavior: WHICH-FRAMES = `visible' means search windows on all visible frames. -WHICH-FRAMES = 0 means search windows on all visible and iconified frames. +WHICH-FRAMES = 0 means search windows on all visible and iconified frames. WHICH-FRAMES = t means search windows on all frames including invisible frames. WHICH-FRAMES = a frame means search only windows on that frame. Anything else means restrict to the selected frame. ＠＠ -2481,7 +2481,7 ＠＠ By default, only the windows in the selected frame are considered. The optional argument WHICH-FRAMES changes this behavior: WHICH-FRAMES = `visible' means search windows on all visible frames. -WHICH-FRAMES = 0 means search windows on all visible and iconified frames. +WHICH-FRAMES = 0 means search windows on all visible and iconified frames. WHICH-FRAMES = t means search windows on all frames including invisible frames. WHICH-FRAMES = a frame means search only windows on that frame. Anything else means restrict to the selected frame. ＠＠ -2536,7 +2536,6 ＠＠ DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ DELETE_BUFFER_WINDOWS, /* Arg is buffer */ GET_LARGEST_WINDOW, - UNSHOW_BUFFER, /* Arg is buffer */ GET_BUFFER_WINDOW_COUNT, /* Arg is buffer */ GET_BUFFER_MRU_WINDOW /* Arg is buffer */ }; ＠＠ -2549,7 +2548,7 ＠＠ int dedicated_too, Lisp_Object which_devices) { - /* This function can GC if type == DELETE_BUFFER_WINDOWS or UNSHOW_BUFFER */ + /* This function can GC if type == DELETE_BUFFER_WINDOWS */ Lisp_Object w; Lisp_Object best_window = Qnil; Lisp_Object next_window; ＠＠ -2621,7 +2620,6 ＠＠ for (;;) { struct window *p = XWINDOW (w); - struct frame *w_frame = XFRAME (WINDOW_FRAME (p)); /* Pick the next window now, since some operations will delete the current window. */ ＠＠ -2771,57 +2769,6 ＠＠ break; } - case UNSHOW_BUFFER: - { - if (EQ (p->buffer, obj)) - { - /* Find another buffer to show in this window. */ - Lisp_Object another_buffer = - Fother_buffer (obj, Qnil, Qnil); - if (NILP (another_buffer)) - another_buffer - = Fget_buffer_create (QSscratch); - /* If this window is dedicated, and in a frame - of its own, kill the frame. */ - if (EQ (w, FRAME_ROOT_WINDOW (w_frame)) - && !NILP (p->dedicated) - && other_visible_frames (w_frame)) - { - /* Skip the other windows on this frame. - There might be one, the minibuffer! */ - if (! EQ (w, last_window)) - while (w_frame == XFRAME (WINDOW_FRAME - (XWINDOW (next_window)))) - { - /* As we go, check for the end of the - loop. We mustn't start going - around a second time. */ - if (EQ (next_window, last_window)) - { - last_window = w; - break; - } - next_window = Fnext_window (next_window, - mini ? Qt : Qnil, - frame_arg, Qt); - } - /* Now we can safely delete the frame. */ - delete_frame_internal (XFRAME (WINDOW_FRAME (p)), - 0, 0, 0); - } - else - { - /* Otherwise show a different buffer in the - window. */ - p->dedicated = Qnil; - Fset_window_buffer (w, another_buffer, Qnil); - if (EQ (w, Fselected_window (Qnil))) - Fset_buffer (p->buffer); - } - } - break; - } - default: abort (); } ＠＠ -3099,6 +3046,63 ＠＠ return Qnil; } +static Lisp_Object +list_windows (struct window *w, Lisp_Object value) +{ + for (;;) + { + if (!NILP (w->hchild)) + value = list_windows (XWINDOW (w->hchild), value); + else if (!NILP (w->vchild)) + value = list_windows (XWINDOW (w->vchild), value); + else + { + Lisp_Object window; + XSETWINDOW (window, w); + value = Fcons (window, value); + } + if (NILP (w->next)) + break; + w = XWINDOW (w->next); + } + return value; +} + +static Lisp_Object +list_all_windows (Lisp_Object frame_spec, Lisp_Object device_spec) +{ + Lisp_Object devcons, concons; + Lisp_Object retval = Qnil; + + DEVICE_LOOP_NO_BREAK (devcons, concons) + { + Lisp_Object frame_list, the_window; + Lisp_Object device, tail; + + device = XCAR (devcons); + frame_list = DEVICE_FRAME_LIST (XDEVICE (device)); + + LIST_LOOP (tail, frame_list) + { + if ((NILP (frame_spec) + && !EQ (XCAR (tail), DEVICE_SELECTED_FRAME (XDEVICE (device)))) + || (EQ (frame_spec, Qvisible) + && !FRAME_VISIBLE_P (XFRAME (XCAR (tail)))) + || (FRAMEP (frame_spec) + && !EQ (frame_spec, XCAR (tail))) + || (!NILP (frame_spec) + && !device_matches_device_spec (device, + NILP (device_spec) ? + Vselected_console : + device_spec))) + continue; + the_window = FRAME_ROOT_WINDOW (XFRAME (XCAR (tail))); + retval = list_windows (XWINDOW (the_window), retval); + } + } + return Fnreverse (retval); +} + DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows, 1, 3, "bReplace buffer in windows: ", /* Replace BUFFER with some other buffer in all windows showing it. ＠＠ -3124,18 +3128,46 ＠＠ (buffer, which_frames, which_devices)) { /* This function can GC */ - buffer = Fget_buffer (buffer); - CHECK_BUFFER (buffer); + Lisp_Object window_list; + Lisp_Object tail; + struct gcpro gcpro1, gcpro2; - /* WHICH-FRAMES values t and nil mean the opposite of what - window_loop expects. */ if (EQ (which_frames, Qnil)) which_frames = Qt; else if (EQ (which_frames, Qt)) which_frames = Qnil; + window_list = list_all_windows (which_frames, which_devices); - /* Ignore dedicated windows. */ - window_loop (UNSHOW_BUFFER, buffer, 0, which_frames, 0, which_devices); + buffer = Fget_buffer (buffer); + CHECK_BUFFER (buffer); + + GCPRO2 (window_list, buffer); + LIST_LOOP (tail, window_list) + { + Lisp_Object window = XCAR (tail); + if (!MINI_WINDOW_P (XWINDOW (window)) + && EQ (XWINDOW (window)->buffer, buffer)) + { + Lisp_Object another_buffer = Fother_buffer (buffer, Qnil, Qnil); + Lisp_Object frame = WINDOW_FRAME (XWINDOW (window)); + if (NILP (another_buffer)) + another_buffer = Fget_buffer_create (QSscratch); + if (!NILP (XWINDOW (window)->dedicated) + && EQ (window, + FRAME_ROOT_WINDOW (XFRAME (frame))) + && other_visible_frames (XFRAME (frame))) + { + delete_frame_internal (XFRAME (frame), 0, 0, 0); /* GC */ + } + else + { + Fset_window_buffer (window, another_buffer, Qnil); + if (EQ (window, Fselected_window (Qnil))) + Fset_buffer (XWINDOW (window)->buffer); + } + } + } + UNGCPRO; return Qnil; }  -- Yoshiki Hayashi

On 20 Dec 2000 00:37:05 +0900, Yoshiki Hayashi <yoshiki(a)xemacs.org&gt; said: Ouch. I'm sorry I misunderstood. I just applied your patches manually and the problem seemed to be fixed. I'll report if something goes wrong. -- Yoshiaki Kasahara Computing and Communications Center, Kyushu University kasahara(a)nc.kyushu-u.ac.jp

Yoshiaki Kasahara <kasahara(a)nc.kyushu-u.ac.jp&gt; writes: Did you manually applied my patch? It's not in the CVS tree yet. I usually wait one day before commiting my patch so that others have chances to review it before it goes in. -- Yoshiki Hayashi

On 20 Dec 2000 13:10:06 +0900, Yoshiki Hayashi <yoshiki(a)xemacs.org&gt; said: No, I really meant tty... I just found a simple method to produce the problem. xemacs -vanilla (make an X frame #1) C-x 5 2 (to create another X frame #2) C-x b test (on the X frame #1) C-x b test (on the X frame #2) M-x make-frame-on-tty (to create a tty frame) the frame automatically display the buffer "test" M-: (delete-windows-on "test") (on the tty frame) The buffer "test" on the tty frame won't disappear. Additional argument ("nil 'all") didn't help. Actually iconify or hiding a frame is not really needed. The problem seems not to occur when I'm using only one X frame and one tty frame. I need two X frames. I'm not sure if it is the same problem as you have found. --Y.Kasahara

On 20 Dec 2000 16:15:38 +0900, Yoshiki Hayashi <yoshiki(a)xemacs.org&gt; said: Yes. After your patch was applied, (delete-windows-on "test") on a tty frame deleted the "test" window on the tty frame, and (delete-windows-on "test" nil 'all) deleted all the windows including both X and tty frames. I didn't see any problems while a simple check using Mew on both X and tty frames. I'll use this binary for a while to make sure. Well, I noticed that the behavior of (delete-windows-on "test" t) is slightly changed, though. Before the patch, it deleted a "test" window only on the tty frame, but now it also deletes a window on one of X frames (not both). When I do it on a X frame, a tty window is deleted, too. --Y.Kasahara

Y> Yoshiaki Kasahara <kasahara(a)nc.kyushu-u.ac.jp&gt; writes: Y> The problem is that replace-buffer-in-windows doesn't work Y> correctly when called on X. I can't understand how Y> window_loop can work under all conditions, so I made a Y> simpler functions to do it. It does more CONSing, but I Y> guess it's faster because you don't have to call Y> Fnext_window every time. Perhaps I should convert some type Y> of window_loop, too. I recently rewrote much of this code (to fix some old crashes!) and it is possible I introduced new ones. I also had trouble understanding window_loop(). But I think we should either replace it completely or fix it. Y> 2000-12-18 Yoshiki Hayashi <yoshiki(a)xemacs.org&gt; Y> * buffer.c (Fkill_buffer): Map over all devices. Y> * window.c (window_loop): Remove UNSHOW_BUFFER code. Y> (list_windows): New function. Y> (list_all_windows): Ditto. Y> (Freplace_buffer_in_windows): Use them. Y> Index: src/buffer.c Y> =================================================================== Y> RCS file: /usr/CVSroot/XEmacs/xemacs/src/buffer.c,v Y> retrieving revision 1.36.2.45 Y> diff -u -r1.36.2.45 buffer.c Y> --- buffer.c 2000/12/18 11:13:37 1.36.2.45 Y> +++ buffer.c 2000/12/18 11:43:04 Y> ＠＠ -1259,7 +1259,9 ＠＠ Y> /* #### This is a problem if this buffer is in a dedicated window. Y> Need to undedicate any windows of this buffer first (and delete them?) Y> */ Y> - Freplace_buffer_in_windows (buf, Qnil, Qnil); Y> + GCPRO1 (buf); Y> + Freplace_buffer_in_windows (buf, Qnil, Qall); Y> + UNGCPRO; Can you prove GCPROing is necessary here? Perhaps Freplace_buffer_in_windows() should be called before delete_from_buffer_alist(), which otherwise GCPROtects buf? The code has tried to prove that `buf' is a live buffer here. Y> +static Lisp_Object Y> +list_windows (struct window *w, Lisp_Object value) I don't like the idea of consing so much here. Admittedly, it's not that important here, since buffers don't get killed very often. But as Yoshiki knows, I would like XEmacs to be efficient when there are many buffers. I would like lisp programmers to feel free to create and destroy temporary buffers frequently. Perhaps you could write a clever WINDOW_LOOP macro? Alternatively, use a function like map_windows, except extended to handle frame_spec and device_spec?