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