comparison src/window.c @ 3803:c267c2431d92

Don't let the 'B' interactive spec default to buffers viewed in any visible frame. * buffer.c (Fother_buffer): Pass Qt as the second argument to Fget_buffer_window. * window.c (window_loop): In GET_BUFFER_WINDOW case, ignore non-visible frames. (Fget_buffer_window): Change doc string to mention that passing Qt for the FRAME argument returns windows on visible frames only. (Qvisible): Removed.

3802:594bc11c67ba

#include "termchar.h"
#include "disptab.h"
#include "keyboard.h"

Lisp_Object Qwindowp, Qwindow_live_p;
Lisp_Object Qvisible;

Lisp_Object Fnext_window (), Fdelete_window (), Fselect_window ();
Lisp_Object Fset_window_buffer (), Fsplit_window (), Frecenter ();

void delete_all_subwindows ();

}

/* Look at all windows, performing an operation specified by TYPE
   with argument OBJ.
   If FRAMES is Qt, look at all frames;
                Qvisible, look at visible frames (GET_BUFFER_WINDOW only);
                Qnil, look at just the selected frame;
	        a frame, just look at windows on that frame.
   If MINI is non-zero, perform the operation on minibuffer windows too.
*/

      if (! MINI_WINDOW_P (XWINDOW (w))
	  || (mini && minibuf_level > 0))
	switch (type)
	  {
	  case GET_BUFFER_WINDOW:
	    /* Perhaps ignore invisible and iconified frames.  */
	    if (EQ (frames, Qvisible)
		&& (! FRAME_VISIBLE_P (w_frame)
		    || FRAME_ICONIFIED_P (w_frame)))
	      break;
	    if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj))
	      return w;
	    break;

		      frame);
}

DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0,
  "Return a window currently displaying BUFFER, or nil if none.\n\
If optional argument FRAME is t, search all frames.\n\
If FRAME is `visible', search all visible frames.\n\
If FRAME is a frame, search only that frame.\n")
  (buffer, frame)
    Lisp_Object buffer, frame;
{
  buffer = Fget_buffer (buffer);

  Qwindowp = intern ("windowp");
  staticpro (&Qwindowp);

  Qwindow_live_p = intern ("window-live-p");
  staticpro (&Qwindow_live_p);

  Qvisible = intern ("Qvisible");
  staticpro (&Qvisible);

#ifndef MULTI_FRAME
  /* Make sure all windows get marked */
  staticpro (&minibuf_window);
#endif

3803:c267c2431d92

#include "termchar.h"
#include "disptab.h"
#include "keyboard.h"

Lisp_Object Qwindowp, Qwindow_live_p;

Lisp_Object Fnext_window (), Fdelete_window (), Fselect_window ();
Lisp_Object Fset_window_buffer (), Fsplit_window (), Frecenter ();

void delete_all_subwindows ();

}

/* Look at all windows, performing an operation specified by TYPE
   with argument OBJ.
   If FRAMES is Qt, look at all frames;
                Qnil, look at just the selected frame;
	        a frame, just look at windows on that frame.
   If MINI is non-zero, perform the operation on minibuffer windows too.
*/

      if (! MINI_WINDOW_P (XWINDOW (w))
	  || (mini && minibuf_level > 0))
	switch (type)
	  {
	  case GET_BUFFER_WINDOW:
	    /* Ignore invisible and iconified frames.  */
	    if (! FRAME_VISIBLE_P (w_frame)
		|| FRAME_ICONIFIED_P (w_frame))
	      break;
	    if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj))
	      return w;
	    break;

		      frame);
}

DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0,
  "Return a window currently displaying BUFFER, or nil if none.\n\
If optional argument FRAME is t, search all visible frames.\n\
If FRAME is nil, search only the selected frame.\n\
If FRAME is a frame, search only that frame.\n")
  (buffer, frame)
    Lisp_Object buffer, frame;
{
  buffer = Fget_buffer (buffer);

  Qwindowp = intern ("windowp");
  staticpro (&Qwindowp);

  Qwindow_live_p = intern ("window-live-p");
  staticpro (&Qwindow_live_p);

#ifndef MULTI_FRAME
  /* Make sure all windows get marked */
  staticpro (&minibuf_window);
#endif