aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorRichard M. Stallman2005-04-26 22:42:28 +0000
committerRichard M. Stallman2005-04-26 22:42:28 +0000
commitc019856ec3ad39fa892d62afb037f41ffc36896b (patch)
treea5c95d336ab562e7101607ba14586ee44e8cc77c /src/window.c
parenta00917788e00e916dda9bbf126065efaf807009e (diff)
downloademacs-c019856ec3ad39fa892d62afb037f41ffc36896b.tar.gz
emacs-c019856ec3ad39fa892d62afb037f41ffc36896b.zip
(Fsame_window_p, Fspecial_display_p): Doc fixes.
(syms_of_window): Doc fixes.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c
index 5e6f923497b..5e399afd28e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3263,9 +3263,10 @@ display_buffer_1 (window)
3263 3263
3264DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0, 3264DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0,
3265 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame. 3265 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame.
3266If the value is t, a frame would be created for that buffer 3266If the value is t, `display-buffer' or `pop-to-buffer' would create a
3267using the default frame parameters. If the value is a list, 3267special frame for that buffer using the default frame parameters.
3268it is a list of frame parameters that would be used 3268
3269If the value is a list, it is a list of frame parameters that would be used
3269to make a frame for that buffer. 3270to make a frame for that buffer.
3270The variables `special-display-buffer-names' 3271The variables `special-display-buffer-names'
3271and `special-display-regexps' control this. */) 3272and `special-display-regexps' control this. */)
@@ -3299,7 +3300,9 @@ and `special-display-regexps' control this. */)
3299} 3300}
3300 3301
3301DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, 3302DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0,
3302 doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window. 3303 doc: /* Returns non-nil if a buffer named BUFFER-NAME would use the same window.
3304More precisely, if `display-buffer' or `pop-to-buffer' would display
3305that buffer in the selected window rather than (as usual) in some other window.
3303See `same-window-buffer-names' and `same-window-regexps'. */) 3306See `same-window-buffer-names' and `same-window-regexps'. */)
3304 (buffer_name) 3307 (buffer_name)
3305 Lisp_Object buffer_name; 3308 Lisp_Object buffer_name;
@@ -6748,7 +6751,8 @@ where `pop-up-frame-alist' would hold the default frame parameters. */);
6748 6751
6749 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names, 6752 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names,
6750 doc: /* *List of buffer names that should have their own special frames. 6753 doc: /* *List of buffer names that should have their own special frames.
6751Displaying a buffer whose name is in this list makes a special frame for it 6754Displaying a buffer with `display-buffer' or `pop-to-buffer',
6755if its name is in this list, makes a special frame for it
6752using `special-display-function'. See also `special-display-regexps'. 6756using `special-display-function'. See also `special-display-regexps'.
6753 6757
6754An element of the list can be a list instead of just a string. 6758An element of the list can be a list instead of just a string.
@@ -6773,9 +6777,9 @@ Those variables take precedence over this one. */);
6773 6777
6774 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps, 6778 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps,
6775 doc: /* *List of regexps saying which buffers should have their own special frames. 6779 doc: /* *List of regexps saying which buffers should have their own special frames.
6776If a buffer name matches one of these regexps, it gets its own frame. 6780When displaying a buffer with `display-buffer' or `pop-to-buffer',
6777Displaying a buffer whose name is in this list makes a special frame for it 6781if any regexp in this list matches the buffer name, it makes a
6778using `special-display-function'. 6782special frame for the buffer by calling `special-display-function'.
6779 6783
6780An element of the list can be a list instead of just a string. 6784An element of the list can be a list instead of just a string.
6781There are two ways to use a list as an element: 6785There are two ways to use a list as an element: