diff options
| author | Richard M. Stallman | 2004-09-09 02:10:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-09-09 02:10:48 +0000 |
| commit | 6cb4a8923202a1f00fcbd2f7e3b8e0ee9e9bd3f4 (patch) | |
| tree | 4e3083cc344fcb15ee7a4ee5f95054a51bcc24a4 | |
| parent | e8e8c0c7b70441f7238e6b3111494729eb56d786 (diff) | |
| download | emacs-6cb4a8923202a1f00fcbd2f7e3b8e0ee9e9bd3f4.tar.gz emacs-6cb4a8923202a1f00fcbd2f7e3b8e0ee9e9bd3f4.zip | |
(Fset_window_buffer): Doc fix.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/window.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 57f51c64341..52426939562 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2004-09-08 Richard M. Stallman <rms@gnu.org> | 1 | 2004-09-08 Richard M. Stallman <rms@gnu.org> |
| 2 | 2 | ||
| 3 | * window.c (Fset_window_buffer): Doc fix. | ||
| 4 | |||
| 3 | * xdisp.c (Fformat_mode_line): New arg BUFFER says which buffer to use. | 5 | * xdisp.c (Fformat_mode_line): New arg BUFFER says which buffer to use. |
| 4 | 6 | ||
| 5 | 2004-09-08 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 2004-09-08 Dan Nicolaescu <dann@ics.uci.edu> |
diff --git a/src/window.c b/src/window.c index 463c8f1f1bd..c696d7f9e27 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3057,7 +3057,9 @@ BUFFER can be a buffer or the name of an existing buffer. | |||
| 3057 | Optional third arg KEEP-MARGINS non-nil means that WINDOW's current | 3057 | Optional third arg KEEP-MARGINS non-nil means that WINDOW's current |
| 3058 | display margins, fringe widths, and scroll bar settings are maintained; | 3058 | display margins, fringe widths, and scroll bar settings are maintained; |
| 3059 | the default is to reset these from BUFFER's local settings or the frame | 3059 | the default is to reset these from BUFFER's local settings or the frame |
| 3060 | defaults. */) | 3060 | defaults. |
| 3061 | |||
| 3062 | This function runs the hook `window-scroll-functions'. */) | ||
| 3061 | (window, buffer, keep_margins) | 3063 | (window, buffer, keep_margins) |
| 3062 | register Lisp_Object window, buffer, keep_margins; | 3064 | register Lisp_Object window, buffer, keep_margins; |
| 3063 | { | 3065 | { |