Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org

7 files changed, 33 insertions, 11 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c2d6c8d7012..3bbcee76884 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * frames.texi (Size and Position): In `frame-resize-pixelwise'
+        description drop remark about frame maximization.
+        * windows.texi (Display Action Functions): Add description for
+        `display-buffer-no-window' and explain use of `allow-no-window'
+        alist entries.
+
+2014-03-21  Glenn Morris  <rgm@gnu.org>
+
+        * commands.texi (Defining Commands): Copyedit re `interactive-only'.
+
 2014-03-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         * internals.texi (C Integer Types): Prefer 'false' and 'true'
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 5c28522158a..198926a9a6a 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -123,11 +123,10 @@ value for this property takes precedence over any @code{interactive}
 form in the function body itself.  This feature is seldom used.
 
 @cindex @code{interactive-only} property
-  Sometimes, a named command is only intended to be called
-interactively, never directly from Lisp.  In that case, give it a
-non-@code{nil} @code{interactive-only} property.  In that case, the
-byte compiler will print a warning message if the command is called
-from Lisp.
+  Sometimes, a function is only intended to be called interactively,
+never directly from Lisp.  In that case, give the function a
+non-@code{nil} @code{interactive-only} property.  This causes the
+byte compiler to warn if the command is called from Lisp.
 
 @menu
 * Using Interactive::     General rules for @code{interactive}.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e896d1b4c04..b6513426909 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1163,10 +1163,7 @@ on the toolkit used: Dragging the frame border with the mouse is usually
 always done character-wise.  Calling @code{set-frame-size} (see below)
 with arguments that do not specify the frame size as an integer multiple
 of its character size may be, however, either ignored or cause a
-rounding (GTK+, Windows) or get accepted (Lucid, Motif).  This also
-means that with some toolkits and a display whose size is not an
-integral multiple of your default font, you may have to set this to
-non-@code{nil} in order to fully maximize a frame.
+rounding (GTK+, Windows) or get accepted (Lucid, Motif).
 @end defopt
 
 @defun set-frame-size frame width height pixelwise
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 1b3fc377d61..e4177836fa8 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2280,6 +2280,15 @@ window and displaying the buffer in that window.  It can fail if all
 windows are dedicated to another buffer (@pxref{Dedicated Windows}).
 @end defun
 
+@defun display-buffer-no-window buffer alist
+If @var{alist} has a non-@code{nil} @code{allow-no-window} entry, then
+this function does not display @code{buffer}.  This allows to override
+the default action and avoid displaying the buffer.  It is assumed that
+when the caller specifies a non-@code{nil} @code{allow-no-window} value
+it can handle a @code{nil} value returned from @code{display-buffer} in
+this case.
+@end defun
+
 To illustrate the use of action functions, consider the following
 example.
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8796cafa4d6..34021fd3d9b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-21  Glenn Morris  <rgm@gnu.org>
+
+        * ede.texi (ede-linux):
+        * vip.texi (New Bindings): Tiny copyedits.
+
 2014-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vip.texi (Other Vi Commands): Adjust doc of C-j.
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 954427d10bf..ab1e8a418da 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -917,7 +917,7 @@ and has an optimized include file identification function.
 
 Through the variables @code{project-linux-build-directory-default} and
 @code{project-linux-architecture-default}, you can set the build
-directory and its architecture, resp.  The default is to assume that
+directory and its architecture, respectively.  The default is to assume that
 the build happens in the source directory and to auto-detect the
 architecture; if the auto-detection fails, you will be asked.
 
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 07f12fdf882..25605aadcac 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -569,7 +569,7 @@ in the current window, while @kbd{S} selects buffer in another window.
 @kindex 1300 @kbd{X} (@code{vip-ctl-x-equivalent})
 These keys will exit from vi mode and return to emacs mode temporarily.
 If you type @kbd{C} (@kbd{X}), Emacs will be in emacs mode and will believe
-that you have typed @kbd{C-c} (@kbd{C-x}, resp.) in emacs mode. Moreover,
+that you have typed @kbd{C-c} (@kbd{C-x}) in emacs mode. Moreover,
 if the following character you type is an upper-case letter, then Emacs
 will believe that you have typed the corresponding control character.
 You will be in vi mode again after the command is executed.  For example,