comparison src/window.c @ 9567:cf4f4c8a3ef6

(Fdisplay_buffer): In desperation case of looking for something to split, verify that a window's frame is splittable.
author Richard M. Stallman <rms@gnu.org>
date Mon, 17 Oct 1994 07:26:30 +0000
parents ac6a5691607f
children b36d5e88cccc
comparison
equal deleted inserted replaced
9566:fef2cfcbbe37 9567:cf4f4c8a3ef6
1934 } 1934 }
1935 else 1935 else
1936 #endif 1936 #endif
1937 window = Fget_largest_window (frames); 1937 window = Fget_largest_window (frames);
1938 1938
1939 /* If we got a tall enough full-width window, split it. */ 1939 /* If we got a tall enough full-width window that can be split,
1940 split it. */
1940 if (!NILP (window) 1941 if (!NILP (window)
1942 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
1941 && window_height (window) >= split_height_threshold 1943 && window_height (window) >= split_height_threshold
1942 && (XFASTINT (XWINDOW (window)->width) 1944 && (XFASTINT (XWINDOW (window)->width)
1943 == FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (window)))))) 1945 == FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (window))))))
1944 window = Fsplit_window (window, Qnil, Qnil); 1946 window = Fsplit_window (window, Qnil, Qnil);
1945 else 1947 else
1946 { 1948 {
1947 window = Fget_lru_window (frames); 1949 window = Fget_lru_window (frames);
1948 /* If the LRU window is selected, and big enough, split it. */ 1950 /* If the LRU window is selected, and big enough,
1951 and can be split, split it. */
1949 if (!NILP (window) 1952 if (!NILP (window)
1953 && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
1950 && (EQ (window, selected_window) 1954 && (EQ (window, selected_window)
1951 || EQ (XWINDOW (window)->parent, Qnil)) 1955 || EQ (XWINDOW (window)->parent, Qnil))
1952 && window_height (window) >= window_min_height << 1) 1956 && window_height (window) >= window_min_height << 1)
1953 window = Fsplit_window (window, Qnil, Qnil); 1957 window = Fsplit_window (window, Qnil, Qnil);
1954 #ifdef MULTI_FRAME 1958 #ifdef MULTI_FRAME