Mercurial > emacs
comparison src/window.c @ 83117:46882e012e30
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
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 07 May 2004 14:20:00 +0000 |
parents | 30dd490f06f2 5896445199fd |
children | ad01ab3c6f4d |
comparison
equal
deleted
inserted
replaced
83116:6ae3d2810507 | 83117:46882e012e30 |
---|---|
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. |
7 | 7 |
8 GNU Emacs is free software; you can redistribute it and/or modify | 8 GNU Emacs is free software; you can redistribute it and/or modify |
3023 | 3023 |
3024 | 3024 |
3025 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, | 3025 DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, |
3026 doc: /* Make WINDOW display BUFFER as its contents. | 3026 doc: /* Make WINDOW display BUFFER as its contents. |
3027 BUFFER can be a buffer or buffer name. | 3027 BUFFER can be a buffer or buffer name. |
3028 Optional third arg KEEP_MARGINS non-nil means that WINDOW's current | 3028 Optional third arg KEEP-MARGINS non-nil means that WINDOW's current |
3029 display margins, fringe widths, and scroll bar settings are maintained; | 3029 display margins, fringe widths, and scroll bar settings are maintained; |
3030 the default is to reset these from BUFFER's local settings or the frame | 3030 the default is to reset these from BUFFER's local settings or the frame |
3031 defaults. */) | 3031 defaults. */) |
3032 (window, buffer, keep_margins) | 3032 (window, buffer, keep_margins) |
3033 register Lisp_Object window, buffer, keep_margins; | 3033 register Lisp_Object window, buffer, keep_margins; |