diff options
| author | Lars Magne Ingebrigtsen | 2011-07-12 23:09:01 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-12 23:09:01 +0200 |
| commit | 0cf346886f0ac320e92e3b5df32508bc6fcfe576 (patch) | |
| tree | 9ac10fa0881e53314898d4ef5eac56b6225c05f3 /src | |
| parent | 1539f17338519c4f6ffa35d6e03908607ece81e5 (diff) | |
| download | emacs-0cf346886f0ac320e92e3b5df32508bc6fcfe576.tar.gz emacs-0cf346886f0ac320e92e3b5df32508bc6fcfe576.zip | |
window.c doc fixes.
Fixes: debbugs:4199
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 54637fe76fb..9bae32a8a98 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * window.c (Fset_window_start): Doc fix (bug#4199). | ||
| 4 | (Fset_window_hscroll): Ditto. | ||
| 5 | |||
| 1 | 2011-07-12 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-07-12 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Fix minor new problems caught by GCC 4.6.1. | 8 | Fix minor new problems caught by GCC 4.6.1. |
diff --git a/src/window.c b/src/window.c index 154efe4a222..e390c13dce0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -683,6 +683,7 @@ WINDOW must be a live window and defaults to the selected one. */) | |||
| 683 | 683 | ||
| 684 | DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0, | 684 | DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0, |
| 685 | doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL. | 685 | doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL. |
| 686 | If WINDOW is nil, the selected window is used. | ||
| 686 | Return NCOL. NCOL should be zero or positive. | 687 | Return NCOL. NCOL should be zero or positive. |
| 687 | 688 | ||
| 688 | Note that if `automatic-hscrolling' is non-nil, you cannot scroll the | 689 | Note that if `automatic-hscrolling' is non-nil, you cannot scroll the |
| @@ -1410,7 +1411,7 @@ Return POS. */) | |||
| 1410 | 1411 | ||
| 1411 | DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0, | 1412 | DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0, |
| 1412 | doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. | 1413 | doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. |
| 1413 | WINDOW defaults to the selected window. Return POS. | 1414 | If WINDOW is nil, the selected window is used. Return POS. |
| 1414 | Optional third arg NOFORCE non-nil inhibits next redisplay from | 1415 | Optional third arg NOFORCE non-nil inhibits next redisplay from |
| 1415 | overriding motion of point in order to display at this exact start. */) | 1416 | overriding motion of point in order to display at this exact start. */) |
| 1416 | (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce) | 1417 | (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce) |