Mercurial > emacs

changeset 11307:f6b6a67ff758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fnext_window, Fprevious_window): If all_frames is a frame and window is not on that frame, return the first window on that frame.
author Richard M. Stallman <rms@gnu.org>
date Sat, 08 Apr 1995 20:15:04 +0000
parents 9b907fb88921
children 1401dd853db7
files src/window.c
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.c	Sat Apr 08 20:11:04 1995 +0000
+++ b/src/window.c	Sat Apr 08 20:15:04 1995 +0000
@@ -888,6 +888,7 @@
 ALL-FRAMES nil or omitted means cycle within the frames as specified\n\
 above.  ALL-FRAMES = `visible' means include windows on all visible frames.\n\
 ALL-FRAMES = 0 means include windows on all visible and iconified frames.\n\
+If ALL-FRAMES is a frame, restrict search to windows on that frame.\n\
 Anything else means restrict to WINDOW's frame.\n\
 \n\
 If you use consistent values for MINIBUF and ALL-FRAMES, you can use\n\
@@ -929,6 +930,10 @@
     ;
   else if (XFASTINT (all_frames) == 0)
     ;
+  else if (FRAMEP (all_frames) && ! EQ (all_frames, Fwindow_frame (window)))
+    /* If all_frames is a frame and window arg isn't on that frame, just
+       return the first window on the frame.  */
+    return Fframe_first_window (all_frames);
   else if (! EQ (all_frames, Qt))
     all_frames = Qnil;
   /* Now all_frames is t meaning search all frames,
@@ -1021,6 +1026,7 @@
 ALL-FRAMES nil or omitted means cycle within the frames as specified\n\
 above.  ALL-FRAMES = `visible' means include windows on all visible frames.\n\
 ALL-FRAMES = 0 means include windows on all visible and iconified frames.\n\
+If ALL-FRAMES is a frame, restrict search to windows on that frame.\n\
 Anything else means restrict to WINDOW's frame.\n\
 \n\
 If you use consistent values for MINIBUF and ALL-FRAMES, you can use\n\
@@ -1064,6 +1070,10 @@
     ;
   else if (XFASTINT (all_frames) == 0)
     ;
+  else if (FRAMEP (all_frames) && ! EQ (all_frames, Fwindow_frame (window)))
+    /* If all_frames is a frame and window arg isn't on that frame, just
+       return the first window on the frame.  */
+    return Fframe_first_window (all_frames);
   else if (! EQ (all_frames, Qt))
     all_frames = Qnil;
   /* Now all_frames is t meaning search all frames,