aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-09-26 02:37:50 +0200
committerJuanma Barranquero2010-09-26 02:37:50 +0200
commitfb5f3a23b58f1da26f3a7ec29e2517ce3856edbd (patch)
tree7a16359ca84d07b9326f347b7546afeffce569d5
parentb93e37e55b064e5741bf79037479b08f08f81292 (diff)
downloademacs-fb5f3a23b58f1da26f3a7ec29e2517ce3856edbd.tar.gz
emacs-fb5f3a23b58f1da26f3a7ec29e2517ce3856edbd.zip
lisp/window.el (walk-windows): Doc fix (bug#7105).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/window.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18643c3f824..518ebc3cab7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-09-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * window.el (walk-windows): Doc fix (bug#7105).
4
12010-09-23 Glenn Morris <rgm@gnu.org> 52010-09-23 Glenn Morris <rgm@gnu.org>
2 6
3 * isearch.el (isearch-lazy-highlight-cleanup) 7 * isearch.el (isearch-lazy-highlight-cleanup)
diff --git a/lisp/window.el b/lisp/window.el
index 41a5d17321f..4b1155f2388 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -160,8 +160,8 @@ counts, `walk-windows' includes the windows in the frame from
160which you entered the minibuffer, as well as the minibuffer 160which you entered the minibuffer, as well as the minibuffer
161window. 161window.
162 162
163ALL-FRAMES nil or omitted means cycle through all windows on 163ALL-FRAMES nil or omitted means cycle through all windows on the
164 WINDOW's frame, plus the minibuffer window if specified by the 164 selected frame, plus the minibuffer window if specified by the
165 MINIBUF argument, see above. If the minibuffer counts, cycle 165 MINIBUF argument, see above. If the minibuffer counts, cycle
166 through all windows on all frames that share that minibuffer 166 through all windows on all frames that share that minibuffer
167 too. 167 too.
@@ -173,8 +173,8 @@ ALL-FRAMES 0 means cycle through all windows on all visible and
173 iconified frames. 173 iconified frames.
174ALL-FRAMES a frame means cycle through all windows on that frame 174ALL-FRAMES a frame means cycle through all windows on that frame
175 only. 175 only.
176Anything else means cycle through all windows on WINDOW's frame 176Anything else means cycle through all windows on the selected
177 and no others. 177 frame and no others.
178 178
179This function changes neither the order of recently selected 179This function changes neither the order of recently selected
180windows nor the buffer list." 180windows nor the buffer list."