[Emacs-diffs] /srv/bzr/emacs/trunk r105979: Fix manual description of display-buffer-pop-up-window.

[Chong Yidong]

------------------------------------------------------------
revno: 105979
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-01 18:16:24 -0400
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/windows.texi
  etc/NEWS

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-10-01 21:54:33 +0000
+++ b/doc/lispref/ChangeLog     2011-10-01 22:16:24 +0000
@@ -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  <address@hidden>
 

=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi  2011-10-01 21:54:33 +0000
+++ b/doc/lispref/windows.texi  2011-10-01 22:16:24 +0000
@@ -2351,9 +2351,9 @@
 @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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2011-10-01 21:54:33 +0000
+++ b/etc/NEWS  2011-10-01 22:16:24 +0000
@@ -397,7 +397,7 @@
 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 @@
 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 @@
 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 @@
 *** 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.