diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-05-07 14:20:00 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-05-07 14:20:00 +0000 |
| commit | 52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf (patch) | |
| tree | 399c54ddfa7cac6c90a07a81308bf7f5e71b66bd /src/window.c | |
| parent | b160ff41a813213adfa745a9d009ab638a22d7b1 (diff) | |
| parent | a478f3e181bd9925ecb506abf4e49216d392124a (diff) | |
| download | emacs-52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf.tar.gz emacs-52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf.tar.bz2 emacs-52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-268
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-269
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-270
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-271
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-272
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-273
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275
Update from CVS: man/makefile.w32-in: Revert last change
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-277
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-278
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-279
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-280
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-281
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-282
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-283
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-284
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-285
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-286
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-157
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 221d8bbbaf2..8a2c16598ec 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. @@ -3025,7 +3025,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. */) |