aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2012-11-16 19:33:34 -0800
committerGlenn Morris2012-11-16 19:33:34 -0800
commit2279276c8415433b73d6ac62df9319fbcc097746 (patch)
tree3dc34a7b70ffc234490ace0429296a3c74b10081 /doc
parent7fe37cfcce719480da3bafd2e7f1346c2f44b22e (diff)
downloademacs-2279276c8415433b73d6ac62df9319fbcc097746.tar.gz
emacs-2279276c8415433b73d6ac62df9319fbcc097746.zip
* frames.texi (Display Action Functions): Mention pop-up-frame-parameters.
* etc/NEWS: Related markup.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog1
-rw-r--r--doc/lispref/windows.texi4
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6726c6d2ad0..32aca367546 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -5,6 +5,7 @@
5 * frames.texi (Size and Position): Add fit-frame-to-buffer command. 5 * frames.texi (Size and Position): Add fit-frame-to-buffer command.
6 * windows.texi (Resizing Windows): Add fit-frame-to-buffer option. 6 * windows.texi (Resizing Windows): Add fit-frame-to-buffer option.
7 (Window Sizes): Add vindex for window-min-height, window-min-width. 7 (Window Sizes): Add vindex for window-min-height, window-min-width.
8 (Display Action Functions): Mention pop-up-frame-parameters.
8 9
92012-11-16 Martin Rudalics <rudalics@gmx.at> 102012-11-16 Martin Rudalics <rudalics@gmx.at>
10 11
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 9a5c7f053e6..439e807260f 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1932,7 +1932,9 @@ entry (@pxref{Choosing Window Options}), raises that frame if necessary.
1932This function creates a new frame, and displays the buffer in that 1932This function creates a new frame, and displays the buffer in that
1933frame's window. It actually performs the frame creation by calling 1933frame's window. It actually performs the frame creation by calling
1934the function specified in @code{pop-up-frame-function} 1934the function specified in @code{pop-up-frame-function}
1935(@pxref{Choosing Window Options}). 1935(@pxref{Choosing Window Options}). If @var{alist} contains a
1936@code{pop-up-frame-parameters} entry, the associated value
1937is added to the newly created frame's parameters.
1936@end defun 1938@end defun
1937 1939
1938@defun display-buffer-pop-up-window buffer alist 1940@defun display-buffer-pop-up-window buffer alist