diff options
| author | Juanma Barranquero | 2004-05-07 00:45:53 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2004-05-07 00:45:53 +0000 |
| commit | ab80314baad9c325fdbd2b3d82929f60a6681ce4 (patch) | |
| tree | 46fc9daca80882776825e4c1cc25fab3e04aa6d1 /src | |
| parent | 91ab5bb4565a48ebb15a1003c206f691e7b67a7c (diff) | |
| download | emacs-ab80314baad9c325fdbd2b3d82929f60a6681ce4.tar.gz emacs-ab80314baad9c325fdbd2b3d82929f60a6681ce4.zip | |
(Fset_window_buffer): Fix docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/window.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5ad22805b36..cf2201e95dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-05-07 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * window.c (Fset_window_buffer): Fix docstring. | ||
| 4 | |||
| 1 | 2004-05-06 Thien-Thi Nguyen <ttn@gnu.org> | 5 | 2004-05-06 Thien-Thi Nguyen <ttn@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs.c (main) [VMS]: Fix var ref. | 7 | * emacs.c (main) [VMS]: Fix var ref. |
diff --git a/src/window.c b/src/window.c index f830c88bb18..34000bd61f9 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Window creation, deletion and examination for GNU Emacs. | 1 | /* Window creation, deletion and examination for GNU Emacs. |
| 2 | Does not include redisplay. | 2 | Does not include redisplay. |
| 3 | Copyright (C) 1985,86,87,93,94,95,96,97,1998,2000, 2001, 2002, 2003 | 3 | Copyright (C) 1985,86,87, 1993,94,95,96,97,98, 2000,01,02,03,04 |
| 4 | Free Software Foundation, Inc. | 4 | Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| @@ -3023,7 +3023,7 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p) | |||
| 3023 | DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, | 3023 | DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, |
| 3024 | doc: /* Make WINDOW display BUFFER as its contents. | 3024 | doc: /* Make WINDOW display BUFFER as its contents. |
| 3025 | BUFFER can be a buffer or buffer name. | 3025 | BUFFER can be a buffer or buffer name. |
| 3026 | Optional third arg KEEP_MARGINS non-nil means that WINDOW's current | 3026 | Optional third arg KEEP-MARGINS non-nil means that WINDOW's current |
| 3027 | display margins, fringe widths, and scroll bar settings are maintained; | 3027 | display margins, fringe widths, and scroll bar settings are maintained; |
| 3028 | the default is to reset these from BUFFER's local settings or the frame | 3028 | the default is to reset these from BUFFER's local settings or the frame |
| 3029 | defaults. */) | 3029 | defaults. */) |