[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103546: Doc fixes for bug#5567 (tiny
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103546: Doc fixes for bug#5567 (tiny change) |
Date: |
Sat, 05 Mar 2011 18:14:43 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103546
author: Michael Shields <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 18:14:43 -0800
message:
Doc fixes for bug#5567 (tiny change)
* lisp/window.el (one-window-p, walk-windows, display-buffer): Doc fixes.
* src/window.c (Fnext_window): Doc (and comment) fixes.
modified:
lisp/ChangeLog
lisp/window.el
src/ChangeLog
src/window.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-06 02:04:41 +0000
+++ b/lisp/ChangeLog 2011-03-06 02:14:43 +0000
@@ -1,3 +1,8 @@
+2011-03-06 Michael Shields <address@hidden> (tiny change)
+
+ * window.el (one-window-p, walk-windows, display-buffer):
+ Doc fixes. (Bug#5567)
+
2011-03-06 Jay Belanger <address@hidden>
* cus-edit.el (custom-prompt-variable): Use the `custom-get' property
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-01-25 04:08:28 +0000
+++ b/lisp/window.el 2011-03-06 02:14:43 +0000
@@ -106,11 +106,12 @@
when it is active.
The optional arg ALL-FRAMES t means count windows on all frames.
-If it is `visible', count windows on all visible frames.
-ALL-FRAMES nil or omitted means count only the selected frame,
-plus the minibuffer it uses (which may be on another frame).
-ALL-FRAMES 0 means count all windows in all visible or iconified frames.
-If ALL-FRAMES is anything else, count only the selected frame."
+If it is `visible', count windows on all visible frames on the
+current terminal. ALL-FRAMES nil or omitted means count only the
+selected frame, plus the minibuffer it uses (which may be on
+another frame). ALL-FRAMES 0 means count all windows in all
+visible or iconified frames on the current terminal. If
+ALL-FRAMES is anything else, count only the selected frame."
(let ((base-window (selected-window)))
(if (and nomini (eq base-window (minibuffer-window)))
(setq base-window (next-window base-window)))
@@ -169,9 +170,9 @@
ALL-FRAMES t means cycle through all windows on all existing
frames.
ALL-FRAMES `visible' means cycle through all windows on all
- visible frames.
+ visible frames on the current terminal.
ALL-FRAMES 0 means cycle through all windows on all visible and
- iconified frames.
+ iconified frames on the current terminal.
ALL-FRAMES a frame means cycle through all windows on that frame
only.
Anything else means cycle through all windows on the selected
@@ -1067,9 +1068,11 @@
already displayed in some window on one of these frames simply
return that window. Possible values of FRAME are:
-`visible' - consider windows on all visible frames.
+`visible' - consider windows on all visible frames on the current
+terminal.
-0 - consider windows on all visible or iconified frames.
+0 - consider windows on all visible or iconified frames on the
+current terminal.
t - consider windows on all frames.
@@ -1079,7 +1082,7 @@
last non-minibuffer frame\) only. If, however, either
`display-buffer-reuse-frames' or `pop-up-frames' is non-nil
\(non-nil and not graphic-only on a text-only terminal),
-consider all visible or iconified frames."
+consider all visible or iconified frames on the current terminal."
(interactive "BDisplay buffer:\nP")
(let* ((can-use-selected-window
;; The selected window is usable unless either NOT-THIS-WINDOW
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-03-05 23:52:45 +0000
+++ b/src/ChangeLog 2011-03-06 02:14:43 +0000
@@ -1,3 +1,7 @@
+2011-03-06 Michael Shields <address@hidden> (tiny change)
+
+ * window.c (Fnext_window): Doc fix. (Bug#5567)
+
2011-03-05 Chong Yidong <address@hidden>
* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
=== modified file 'src/window.c'
--- a/src/window.c 2011-02-16 16:35:16 +0000
+++ b/src/window.c 2011-03-06 02:14:43 +0000
@@ -1769,8 +1769,10 @@
ALL_FRAMES t means search all frames,
nil means search just current frame,
- `visible' means search just visible frames,
- 0 means search visible and iconified frames,
+ `visible' means search just visible frames on the
+ current terminal,
+ 0 means search visible and iconified frames on the
+ current terminal,
a window means search the frame that window belongs to,
a frame means consider windows on that frame, only. */
@@ -1836,8 +1838,8 @@
/* Decode arguments as allowed by Fnext_window, Fprevious_window, and
- Fwindow_list. See there for the meaning of WINDOW, MINIBUF, and
- ALL_FRAMES. */
+ Fwindow_list. See candidate_window_p for the meaning of WINDOW,
+ MINIBUF, and ALL_FRAMES. */
static void
decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf,
Lisp_Object *all_frames)
@@ -1871,12 +1873,6 @@
;
else if (!EQ (*all_frames, Qt))
*all_frames = Qnil;
-
- /* Now *ALL_FRAMES is t meaning search all frames, nil meaning
- search just current frame, `visible' meaning search just visible
- frames, 0 meaning search visible and iconified frames, or a
- window, meaning search the frame that window belongs to, or a
- frame, meaning consider windows on that frame, only. */
}
@@ -1974,9 +1970,9 @@
windows on all frames that share that minibuffer too.
ALL-FRAMES t means consider all windows on all existing frames.
ALL-FRAMES `visible' means consider all windows on all visible
- frames.
+ frames on the current terminal.
ALL-FRAMES 0 means consider all windows on all visible and
- iconified frames.
+ iconified frames on the current terminal.
ALL-FRAMES a frame means consider all windows on that frame only.
Anything else means consider all windows on WINDOW's frame and no
others.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103546: Doc fixes for bug#5567 (tiny change),
Glenn Morris <=