Commit aa248733 authored by Michael Shields's avatar Michael Shields Committed by Glenn Morris
Browse files

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.
parent da0275f8
2011-03-06 Michael Shields <shields@msrl.com> (tiny change)
* window.el (one-window-p, walk-windows, display-buffer):
Doc fixes. (Bug#5567)
2011-03-06 Jay Belanger <jay.p.belanger@gmail.com> 2011-03-06 Jay Belanger <jay.p.belanger@gmail.com>
   
* cus-edit.el (custom-prompt-variable): Use the `custom-get' property * cus-edit.el (custom-prompt-variable): Use the `custom-get' property
......
...@@ -106,11 +106,12 @@ even if it is active. Otherwise, the minibuffer is counted ...@@ -106,11 +106,12 @@ even if it is active. Otherwise, the minibuffer is counted
when it is active. when it is active.
The optional arg ALL-FRAMES t means count windows on all frames. The optional arg ALL-FRAMES t means count windows on all frames.
If it is `visible', count windows on all visible frames. If it is `visible', count windows on all visible frames on the
ALL-FRAMES nil or omitted means count only the selected frame, current terminal. ALL-FRAMES nil or omitted means count only the
plus the minibuffer it uses (which may be on another frame). selected frame, plus the minibuffer it uses (which may be on
ALL-FRAMES 0 means count all windows in all visible or iconified frames. another frame). ALL-FRAMES 0 means count all windows in all
If ALL-FRAMES is anything else, count only the selected frame." visible or iconified frames on the current terminal. If
ALL-FRAMES is anything else, count only the selected frame."
(let ((base-window (selected-window))) (let ((base-window (selected-window)))
(if (and nomini (eq base-window (minibuffer-window))) (if (and nomini (eq base-window (minibuffer-window)))
(setq base-window (next-window base-window))) (setq base-window (next-window base-window)))
...@@ -169,9 +170,9 @@ ALL-FRAMES nil or omitted means cycle through all windows on the ...@@ -169,9 +170,9 @@ ALL-FRAMES nil or omitted means cycle through all windows on the
ALL-FRAMES t means cycle through all windows on all existing ALL-FRAMES t means cycle through all windows on all existing
frames. frames.
ALL-FRAMES `visible' means cycle through all windows on all 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 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 ALL-FRAMES a frame means cycle through all windows on that frame
only. only.
Anything else means cycle through all windows on the selected Anything else means cycle through all windows on the selected
...@@ -1067,9 +1068,11 @@ when the specified buffer is already displayed. If the buffer is ...@@ -1067,9 +1068,11 @@ when the specified buffer is already displayed. If the buffer is
already displayed in some window on one of these frames simply already displayed in some window on one of these frames simply
return that window. Possible values of FRAME are: 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. t - consider windows on all frames.
...@@ -1079,7 +1082,7 @@ nil - consider windows on the selected frame \(actually the ...@@ -1079,7 +1082,7 @@ nil - consider windows on the selected frame \(actually the
last non-minibuffer frame\) only. If, however, either last non-minibuffer frame\) only. If, however, either
`display-buffer-reuse-frames' or `pop-up-frames' is non-nil `display-buffer-reuse-frames' or `pop-up-frames' is non-nil
\(non-nil and not graphic-only on a text-only terminal), \(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") (interactive "BDisplay buffer:\nP")
(let* ((can-use-selected-window (let* ((can-use-selected-window
;; The selected window is usable unless either NOT-THIS-WINDOW ;; The selected window is usable unless either NOT-THIS-WINDOW
......
2011-03-06 Michael Shields <shields@msrl.com> (tiny change)
* window.c (Fnext_window): Doc fix. (Bug#5567)
2011-03-05 Chong Yidong <cyd@stupidchicken.com> 2011-03-05 Chong Yidong <cyd@stupidchicken.com>
   
* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit. * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
...@@ -1769,8 +1769,10 @@ window_list (void) ...@@ -1769,8 +1769,10 @@ window_list (void)
ALL_FRAMES t means search all frames, ALL_FRAMES t means search all frames,
nil means search just current frame, nil means search just current frame,
`visible' means search just visible frames, `visible' means search just visible frames on the
0 means search visible and iconified frames, current terminal,
0 means search visible and iconified frames on the
current terminal,
a window means search the frame that window belongs to, a window means search the frame that window belongs to,
a frame means consider windows on that frame, only. */ a frame means consider windows on that frame, only. */
...@@ -1836,8 +1838,8 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf ...@@ -1836,8 +1838,8 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf
/* Decode arguments as allowed by Fnext_window, Fprevious_window, and /* Decode arguments as allowed by Fnext_window, Fprevious_window, and
Fwindow_list. See there for the meaning of WINDOW, MINIBUF, and Fwindow_list. See candidate_window_p for the meaning of WINDOW,
ALL_FRAMES. */ MINIBUF, and ALL_FRAMES. */
static void static void
decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object *all_frames) decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object *all_frames)
...@@ -1871,12 +1873,6 @@ decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object ...@@ -1871,12 +1873,6 @@ decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object
; ;
else if (!EQ (*all_frames, Qt)) else if (!EQ (*all_frames, Qt))
*all_frames = Qnil; *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 @@ ALL-FRAMES nil or omitted means consider all windows on WINDOW's ...@@ -1974,9 +1970,9 @@ ALL-FRAMES nil or omitted means consider all windows on WINDOW's
windows on all frames that share that minibuffer too. windows on all frames that share that minibuffer too.
ALL-FRAMES t means consider all windows on all existing frames. ALL-FRAMES t means consider all windows on all existing frames.
ALL-FRAMES `visible' means consider all windows on all visible 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 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. ALL-FRAMES a frame means consider all windows on that frame only.
Anything else means consider all windows on WINDOW's frame and no Anything else means consider all windows on WINDOW's frame and no
others. others.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment