aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-10-27 16:35:51 +0200
committerJuanma Barranquero2011-10-27 16:35:51 +0200
commit87e68db4734d89bab693744ad210560da0c20a87 (patch)
treece1990fd4a21c7d94e0967944746b828aaa7d306 /src
parent01db225d1c53f3d2056f4521ce14a2f499258d06 (diff)
downloademacs-87e68db4734d89bab693744ad210560da0c20a87.tar.gz
emacs-87e68db4734d89bab693744ad210560da0c20a87.zip
src/window.c: Fix typos in docstrings.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/window.c40
2 files changed, 27 insertions, 20 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c3926f6024b..0d421223228 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12011-10-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * window.c (Fframe_root_window, Fframe_first_window, Fwindow_end)
4 (Fframe_selected_window, Ftemp_output_buffer_show, Fnext_window)
5 (Fdelete_window_internal, Fwindow_parameters): Fix typos in docstrings.
6 (Fmove_to_window_line): Doc fix.
7
12011-10-27 Chong Yidong <cyd@gnu.org> 82011-10-27 Chong Yidong <cyd@gnu.org>
2 9
3 * process.c (make_process): Set gnutls_state to NULL. 10 * process.c (make_process): Set gnutls_state to NULL.
diff --git a/src/window.c b/src/window.c
index c3b4384137d..0c35b913789 100644
--- a/src/window.c
+++ b/src/window.c
@@ -175,10 +175,10 @@ WINDOW can be any window and defaults to the selected one. */)
175} 175}
176 176
177DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, 177DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0,
178 doc: /* Return the root window of FRAME_OR_WINDOW. 178 doc: /* Return the root window of FRAME-OR-WINDOW.
179If omitted, FRAME_OR_WINDOW defaults to the currently selected frame. 179If omitted, FRAME-OR-WINDOW defaults to the currently selected frame.
180Else if FRAME_OR_WINDOW denotes any window, return the root window of 180Else if FRAME-OR-WINDOW denotes any window, return the root window of
181that window's frame. If FRAME_OR_WINDOW denotes a live frame, return 181that window's frame. If FRAME-OR-WINDOW denotes a live frame, return
182the root window of that frame. */) 182the root window of that frame. */)
183 (Lisp_Object frame_or_window) 183 (Lisp_Object frame_or_window)
184{ 184{
@@ -220,10 +220,10 @@ WINDOW can be any window and defaults to the selected one. */)
220 220
221/* Don't move this to window.el - this must be a safe routine. */ 221/* Don't move this to window.el - this must be a safe routine. */
222DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0, 222DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0,
223 doc: /* Return the topmost, leftmost live window on FRAME_OR_WINDOW. 223 doc: /* Return the topmost, leftmost live window on FRAME-OR-WINDOW.
224If omitted, FRAME_OR_WINDOW defaults to the currently selected frame. 224If omitted, FRAME-OR-WINDOW defaults to the currently selected frame.
225Else if FRAME_OR_WINDOW denotes any window, return the first window of 225Else if FRAME-OR-WINDOW denotes any window, return the first window of
226that window's frame. If FRAME_OR_WINDOW denotes a live frame, return 226that window's frame. If FRAME-OR-WINDOW denotes a live frame, return
227the first window of that frame. */) 227the first window of that frame. */)
228 (Lisp_Object frame_or_window) 228 (Lisp_Object frame_or_window)
229{ 229{
@@ -254,10 +254,10 @@ the first window of that frame. */)
254 254
255DEFUN ("frame-selected-window", Fframe_selected_window, 255DEFUN ("frame-selected-window", Fframe_selected_window,
256 Sframe_selected_window, 0, 1, 0, 256 Sframe_selected_window, 0, 1, 0,
257 doc: /* Return the selected window of FRAME_OR_WINDOW. 257 doc: /* Return the selected window of FRAME-OR-WINDOW.
258If omitted, FRAME_OR_WINDOW defaults to the currently selected frame. 258If omitted, FRAME-OR-WINDOW defaults to the currently selected frame.
259Else if FRAME_OR_WINDOW denotes any window, return the selected window 259Else if FRAME-OR-WINDOW denotes any window, return the selected window
260of that window's frame. If FRAME_OR_WINDOW denotes a live frame, return 260of that window's frame. If FRAME-OR-WINDOW denotes a live frame, return
261the selected window of that frame. */) 261the selected window of that frame. */)
262 (Lisp_Object frame_or_window) 262 (Lisp_Object frame_or_window)
263{ 263{
@@ -1297,7 +1297,7 @@ WINDOW must be a live window and defaults to the selected one.
1297This is updated by redisplay, when it runs to completion. 1297This is updated by redisplay, when it runs to completion.
1298Simply changing the buffer text or setting `window-start' 1298Simply changing the buffer text or setting `window-start'
1299does not update this value. 1299does not update this value.
1300Return nil if there is no recorded value. \(This can happen if the 1300Return nil if there is no recorded value. (This can happen if the
1301last redisplay of WINDOW was preempted, and did not finish.) 1301last redisplay of WINDOW was preempted, and did not finish.)
1302If UPDATE is non-nil, compute the up-to-date position 1302If UPDATE is non-nil, compute the up-to-date position
1303if it isn't already recorded. */) 1303if it isn't already recorded. */)
@@ -1688,7 +1688,7 @@ DEFUN ("window-parameters", Fwindow_parameters, Swindow_parameters,
1688 0, 1, 0, 1688 0, 1, 0,
1689 doc: /* Return the parameters of WINDOW and their values. 1689 doc: /* Return the parameters of WINDOW and their values.
1690WINDOW defaults to the selected window. The return value is a list of 1690WINDOW defaults to the selected window. The return value is a list of
1691elements of the form (PARAMETER . VALUE). */) 1691elements of the form (PARAMETER . VALUE). */)
1692 (Lisp_Object window) 1692 (Lisp_Object window)
1693{ 1693{
1694 return Fcopy_alist (decode_any_window (window)->window_parameters); 1694 return Fcopy_alist (decode_any_window (window)->window_parameters);
@@ -2193,7 +2193,7 @@ next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, in
2193 2193
2194DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0, 2194DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
2195 doc: /* Return window following WINDOW in cyclic ordering of windows. 2195 doc: /* Return window following WINDOW in cyclic ordering of windows.
2196WINDOW must be a live window and defaults to the selected one. The 2196WINDOW must be a live window and defaults to the selected one. The
2197optional arguments MINIBUF and ALL-FRAMES specify the set of windows to 2197optional arguments MINIBUF and ALL-FRAMES specify the set of windows to
2198consider. 2198consider.
2199 2199
@@ -3224,7 +3224,7 @@ temp_output_buffer_show (register Lisp_Object buf)
3224DEFUN ("internal-temp-output-buffer-show", 3224DEFUN ("internal-temp-output-buffer-show",
3225 Ftemp_output_buffer_show, Stemp_output_buffer_show, 3225 Ftemp_output_buffer_show, Stemp_output_buffer_show,
3226 1, 1, 0, 3226 1, 1, 0,
3227 doc: /* Internal function for `with-output-to-temp-buffer''. */) 3227 doc: /* Internal function for `with-output-to-temp-buffer'. */)
3228 (Lisp_Object buf) 3228 (Lisp_Object buf)
3229{ 3229{
3230 temp_output_buffer_show (buf); 3230 temp_output_buffer_show (buf);
@@ -3845,8 +3845,8 @@ set correctly. See the code of `split-window' for how this is done. */)
3845 3845
3846DEFUN ("delete-window-internal", Fdelete_window_internal, Sdelete_window_internal, 1, 1, 0, 3846DEFUN ("delete-window-internal", Fdelete_window_internal, Sdelete_window_internal, 1, 1, 0,
3847 doc: /* Remove WINDOW from its frame. 3847 doc: /* Remove WINDOW from its frame.
3848WINDOW defaults to the selected window. Return nil. Signal an error 3848WINDOW defaults to the selected window. Return nil.
3849when WINDOW is the only window on its frame. */) 3849Signal an error when WINDOW is the only window on its frame. */)
3850 (register Lisp_Object window) 3850 (register Lisp_Object window)
3851{ 3851{
3852 register Lisp_Object parent, sibling, frame, root; 3852 register Lisp_Object parent, sibling, frame, root;
@@ -5225,8 +5225,8 @@ any partial-height lines in the text display area. */)
5225DEFUN ("move-to-window-line", Fmove_to_window_line, Smove_to_window_line, 5225DEFUN ("move-to-window-line", Fmove_to_window_line, Smove_to_window_line,
5226 1, 1, "P", 5226 1, 1, "P",
5227 doc: /* Position point relative to window. 5227 doc: /* Position point relative to window.
5228With no argument, position point at center of window. 5228ARG nil means position point at center of window.
5229An argument specifies vertical position within the window; 5229Else, ARG specifies vertical position within the window;
5230zero means top of window, negative means relative to bottom of window. */) 5230zero means top of window, negative means relative to bottom of window. */)
5231 (Lisp_Object arg) 5231 (Lisp_Object arg)
5232{ 5232{