aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1993-06-17 05:06:36 +0000
committerJim Blandy1993-06-17 05:06:36 +0000
commit1bc981d2b5016077f8d96e7384148f7444dbc120 (patch)
treeaf242e3ecdd88cdd1e863c1a490100a61f2b7aac /src
parentdb732e5a3d99f59620df5503510e61cb9db1fadc (diff)
downloademacs-1bc981d2b5016077f8d96e7384148f7444dbc120.tar.gz
emacs-1bc981d2b5016077f8d96e7384148f7444dbc120.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/window.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/window.c b/src/window.c
index 4c182a6924d..a9ab938d2cb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -30,7 +30,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
30#include "keyboard.h" 30#include "keyboard.h"
31 31
32Lisp_Object Qwindowp, Qwindow_live_p; 32Lisp_Object Qwindowp, Qwindow_live_p;
33Lisp_Object Qvisible;
34 33
35Lisp_Object Fnext_window (), Fdelete_window (), Fselect_window (); 34Lisp_Object Fnext_window (), Fdelete_window (), Fselect_window ();
36Lisp_Object Fset_window_buffer (), Fsplit_window (), Frecenter (); 35Lisp_Object Fset_window_buffer (), Fsplit_window (), Frecenter ();
@@ -1059,7 +1058,6 @@ argument ALL_FRAMES is non-nil, cycle through all frames.")
1059/* Look at all windows, performing an operation specified by TYPE 1058/* Look at all windows, performing an operation specified by TYPE
1060 with argument OBJ. 1059 with argument OBJ.
1061 If FRAMES is Qt, look at all frames; 1060 If FRAMES is Qt, look at all frames;
1062 Qvisible, look at visible frames (GET_BUFFER_WINDOW only);
1063 Qnil, look at just the selected frame; 1061 Qnil, look at just the selected frame;
1064 a frame, just look at windows on that frame. 1062 a frame, just look at windows on that frame.
1065 If MINI is non-zero, perform the operation on minibuffer windows too. 1063 If MINI is non-zero, perform the operation on minibuffer windows too.
@@ -1147,10 +1145,9 @@ window_loop (type, obj, mini, frames)
1147 switch (type) 1145 switch (type)
1148 { 1146 {
1149 case GET_BUFFER_WINDOW: 1147 case GET_BUFFER_WINDOW:
1150 /* Perhaps ignore invisible and iconified frames. */ 1148 /* Ignore invisible and iconified frames. */
1151 if (EQ (frames, Qvisible) 1149 if (! FRAME_VISIBLE_P (w_frame)
1152 && (! FRAME_VISIBLE_P (w_frame) 1150 || FRAME_ICONIFIED_P (w_frame))
1153 || FRAME_ICONIFIED_P (w_frame)))
1154 break; 1151 break;
1155 if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj)) 1152 if (XBUFFER (XWINDOW (w)->buffer) == XBUFFER (obj))
1156 return w; 1153 return w;
@@ -1276,8 +1273,8 @@ frame, search only that frame.\n")
1276 1273
1277DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0, 1274DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0,
1278 "Return a window currently displaying BUFFER, or nil if none.\n\ 1275 "Return a window currently displaying BUFFER, or nil if none.\n\
1279If optional argument FRAME is t, search all frames.\n\ 1276If optional argument FRAME is t, search all visible frames.\n\
1280If FRAME is `visible', search all visible frames.\n\ 1277If FRAME is nil, search only the selected frame.\n\
1281If FRAME is a frame, search only that frame.\n") 1278If FRAME is a frame, search only that frame.\n")
1282 (buffer, frame) 1279 (buffer, frame)
1283 Lisp_Object buffer, frame; 1280 Lisp_Object buffer, frame;
@@ -2901,9 +2898,6 @@ syms_of_window ()
2901 Qwindow_live_p = intern ("window-live-p"); 2898 Qwindow_live_p = intern ("window-live-p");
2902 staticpro (&Qwindow_live_p); 2899 staticpro (&Qwindow_live_p);
2903 2900
2904 Qvisible = intern ("Qvisible");
2905 staticpro (&Qvisible);
2906
2907#ifndef MULTI_FRAME 2901#ifndef MULTI_FRAME
2908 /* Make sure all windows get marked */ 2902 /* Make sure all windows get marked */
2909 staticpro (&minibuf_window); 2903 staticpro (&minibuf_window);