aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorKaroly Lorentey2004-10-19 17:00:02 +0000
committerKaroly Lorentey2004-10-19 17:00:02 +0000
commit90b404757b24ea0c88d6ec3ed9c1ccce07bbd19f (patch)
treeb5cb05f7c5d0c27537362072badf76355d363319 /src/window.c
parentec16044407f468aacda9eb031fb7267d5ee0f899 (diff)
parentd4c2c0eff81e7540cbb0a32ef10017285f68e1aa (diff)
downloademacs-90b404757b24ea0c88d6ec3ed9c1ccce07bbd19f.tar.gz
emacs-90b404757b24ea0c88d6ec3ed9c1ccce07bbd19f.zip
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-617 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-618 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-619 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-623 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-624 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53 Merge from emacs--cvs-trunk--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-261
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index 22ca145b206..6b244ca5353 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3216,10 +3216,13 @@ display_buffer_1 (window)
3216} 3216}
3217 3217
3218DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0, 3218DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0,
3219 doc: /* Returns non-nil if a buffer named BUFFER-NAME would be created specially. 3219 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame.
3220The value is actually t if the frame should be called with default frame 3220If the value is t, a frame would be created for that buffer
3221parameters, and a list of frame parameters if they were specified. 3221using the default frame parameters. If the value is a list,
3222See `special-display-buffer-names', and `special-display-regexps'. */) 3222it is a list of frame parameters that would be used
3223to make a frame for that buffer.
3224The variables `special-display-buffer-names'
3225and `special-display-regexps' control this. */)
3223 (buffer_name) 3226 (buffer_name)
3224 Lisp_Object buffer_name; 3227 Lisp_Object buffer_name;
3225{ 3228{