Fix manual description of display-buffer-pop-up-window.

Also, tweaks to NEWS.

* doc/lispref/windows.texi (Display Action Functions): Fix description of
display-buffer-pop-up-window.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7755fd65bff15038fe32dd9ec49f6508e20a711b..27c2597c6a38ed98f2c0afa63db092ceb84bda1d 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -3,6 +3,8 @@
        * windows.texi (Textual Scrolling): Document scroll-up-command,
        scroll-down-command, scroll-error-top-bottom, and the
        scroll-command symbol property.
+       (Display Action Functions): Fix description of
+       display-buffer-pop-up-window.
 
 2011-09-28  Juanma Barranquero  <lekktu@gmail.com>
 

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 2ba52ef8b59c87a42d22635bcd65f2d7d0f668d2..bffea19210c65a32bc4fb1a3ca4aaf398cfe8bac 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2351,9 +2351,9 @@ frame's window.
 @end defun
 
 @defun display-buffer-pop-up-window buffer alist
-This function tries to display @var{buffer} by splitting the selected
-window.  It uses @code{split-window-sensibly} as a subroutine
-(@pxref{Choosing Window Options}).
+This function tries to display @var{buffer} by splitting the largest
+or least recently-used window.  It uses @code{split-window-sensibly}
+as a subroutine (@pxref{Choosing Window Options}).
 @end defun
 
 @defun display-buffer-use-some-window buffer alist

diff --git a/etc/NEWS b/etc/NEWS
index ae2f137e1f9fdf6e47f5d31ef0f79fee2125fea7..4a3667a2138d9736e8bcc0142b60fc734e4714ee 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -397,7 +397,7 @@ instead of `switch-to-buffer' when selecting an item in the Buffers menu.
 modulo restrictions like window minimum sizes and fixed-size windows.
 
 *** The behavior of `display-buffer' is now customizable in detail.
-
++++
 **** New option `display-buffer-base-action' specifies a list of
 user-determined display "actions" (functions and optional arguments
 for choosing the displaying window).
@@ -405,6 +405,7 @@ for choosing the displaying window).
 This takes precedence over the default display action, which is
 specified by `display-buffer-fallback-action'.
 
++++
 **** New option `display-buffer-alist' maps buffer name regexps to
 display actions, taking precedence over `display-buffer-base-action'.
 
@@ -544,10 +545,6 @@ To inhibit this, change `x-select-enable-clipboard-manager' to nil.
 the lines in the current rectangle.  With a prefix argument, this
 prompts for a number to count from and for a format string.
 
-** The command shell prompts for the shell path name, when the default
-directory is a remote file name and neither environment variable
-$ESHELL nor variable `explicit-shell-file-name' is set.
-
 +++
 ** The default value of redisplay-dont-change is now t
 This makes Emacs feel more responsive to editing commands that arrive
@@ -725,8 +722,15 @@ more variants, including Mercury, and a lot more.
 *** The command `rmail-epa-decrypt' decrypts OpenPGP data
 in the Rmail incoming message.
 
-** shell-mode can track your cwd by reading it from your prompt.
-Just set shell-dir-cookie-re to an appropriate regexp.
+** Shell mode
+
+*** The `shell' command prompts for the shell path name if the default
+directory is a remote file name and neither the environment variable
+$ESHELL nor the variable `explicit-shell-file-name' is set.
+
+*** New variable `shell-dir-cookie-re'.
+If set to an appropriate regexp, Shell mode can track your cwd by
+reading it from your prompt.
 
 ---
 ** SQL Mode enhancements.