Mercurial > emacs
comparison src/window.c @ 83296:effe22690419
Merged from miles@gnu.org--gnu-2005 (patch 281-285)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-281
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-282
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-283
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-284
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-285
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-336
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 02 May 2005 14:38:00 +0000 |
parents | ad07ff6e4555 dd7b3da13b8f |
children | 63b7247f4be6 |
comparison
equal
deleted
inserted
replaced
83295:2d137ca54960 | 83296:effe22690419 |
---|---|
3263 return window; | 3263 return window; |
3264 } | 3264 } |
3265 | 3265 |
3266 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0, | 3266 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0, |
3267 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame. | 3267 doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame. |
3268 If the value is t, a frame would be created for that buffer | 3268 If the value is t, `display-buffer' or `pop-to-buffer' would create a |
3269 using the default frame parameters. If the value is a list, | 3269 special frame for that buffer using the default frame parameters. |
3270 it is a list of frame parameters that would be used | 3270 |
3271 If the value is a list, it is a list of frame parameters that would be used | |
3271 to make a frame for that buffer. | 3272 to make a frame for that buffer. |
3272 The variables `special-display-buffer-names' | 3273 The variables `special-display-buffer-names' |
3273 and `special-display-regexps' control this. */) | 3274 and `special-display-regexps' control this. */) |
3274 (buffer_name) | 3275 (buffer_name) |
3275 Lisp_Object buffer_name; | 3276 Lisp_Object buffer_name; |
3299 } | 3300 } |
3300 return Qnil; | 3301 return Qnil; |
3301 } | 3302 } |
3302 | 3303 |
3303 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, | 3304 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0, |
3304 doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window. | 3305 doc: /* Returns non-nil if a buffer named BUFFER-NAME would use the same window. |
3306 More precisely, if `display-buffer' or `pop-to-buffer' would display | |
3307 that buffer in the selected window rather than (as usual) in some other window. | |
3305 See `same-window-buffer-names' and `same-window-regexps'. */) | 3308 See `same-window-buffer-names' and `same-window-regexps'. */) |
3306 (buffer_name) | 3309 (buffer_name) |
3307 Lisp_Object buffer_name; | 3310 Lisp_Object buffer_name; |
3308 { | 3311 { |
3309 Lisp_Object tem; | 3312 Lisp_Object tem; |
6748 where `pop-up-frame-alist' would hold the default frame parameters. */); | 6751 where `pop-up-frame-alist' would hold the default frame parameters. */); |
6749 Vpop_up_frame_function = Qnil; | 6752 Vpop_up_frame_function = Qnil; |
6750 | 6753 |
6751 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names, | 6754 DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names, |
6752 doc: /* *List of buffer names that should have their own special frames. | 6755 doc: /* *List of buffer names that should have their own special frames. |
6753 Displaying a buffer whose name is in this list makes a special frame for it | 6756 Displaying a buffer with `display-buffer' or `pop-to-buffer', |
6757 if its name is in this list, makes a special frame for it | |
6754 using `special-display-function'. See also `special-display-regexps'. | 6758 using `special-display-function'. See also `special-display-regexps'. |
6755 | 6759 |
6756 An element of the list can be a list instead of just a string. | 6760 An element of the list can be a list instead of just a string. |
6757 There are two ways to use a list as an element: | 6761 There are two ways to use a list as an element: |
6758 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...) | 6762 (BUFFER FRAME-PARAMETERS...) (BUFFER FUNCTION OTHER-ARGS...) |
6773 Those variables take precedence over this one. */); | 6777 Those variables take precedence over this one. */); |
6774 Vspecial_display_buffer_names = Qnil; | 6778 Vspecial_display_buffer_names = Qnil; |
6775 | 6779 |
6776 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps, | 6780 DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps, |
6777 doc: /* *List of regexps saying which buffers should have their own special frames. | 6781 doc: /* *List of regexps saying which buffers should have their own special frames. |
6778 If a buffer name matches one of these regexps, it gets its own frame. | 6782 When displaying a buffer with `display-buffer' or `pop-to-buffer', |
6779 Displaying a buffer whose name is in this list makes a special frame for it | 6783 if any regexp in this list matches the buffer name, it makes a |
6780 using `special-display-function'. | 6784 special frame for the buffer by calling `special-display-function'. |
6781 | 6785 |
6782 An element of the list can be a list instead of just a string. | 6786 An element of the list can be a list instead of just a string. |
6783 There are two ways to use a list as an element: | 6787 There are two ways to use a list as an element: |
6784 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...) | 6788 (REGEXP FRAME-PARAMETERS...) (REGEXP FUNCTION OTHER-ARGS...) |
6785 In the first case, the FRAME-PARAMETERS are pairs of the form | 6789 In the first case, the FRAME-PARAMETERS are pairs of the form |