Make `split-window' a non-interactive function.

* doc/lispref/windows.texi (Splitting Windows): Change category of
split-window from a command to a function.

* etc/NEWS: Mention fixing `split-window' to be non-interactive.

* window.el (split-window): Remove interactive form, since as a
command this function is a special case of split-window-below.
Correct doc string.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 0bc2b0880b04b8061c9de2fa6564f2e354d13ae3..f65c2e854614ed671fa034e68352612a0cb61eb1 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-13  Stephen Berman  <stephen.berman@gmx.net>
+
+       * windows.texi (Splitting Windows): Change category of
+       split-window from a command to a function.
+
 2013-04-06  Chong Yidong  <cyd@gnu.org>
 
        * display.texi (Faces): Minor clarifications.

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 792002add81aa7b469a272696ac487e8e45d0486..f2a4b3849dd4a0d5601cfacc0bc51d04c6ff40c8 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -717,7 +717,7 @@ window.
 This section describes functions for creating a new window by
 @dfn{splitting} an existing one.
 
-@deffn Command split-window &optional window size side
+@defun split-window &optional window size side
 This function creates a new live window next to the window
 @var{window}.  If @var{window} is omitted or @code{nil}, it defaults
 to the selected window.  That window is ``split'', and reduced in
@@ -767,7 +767,7 @@ called with the arguments @var{window}, @var{size}, and @var{side}, in
 lieu of the usual action of @code{split-window}.  Otherwise, this
 function obeys the @code{window-atom} or @code{window-side} window
 parameter, if any.  @xref{Window Parameters}.
-@end deffn
+@end defun
 
   As an example, here is a sequence of @code{split-window} calls that
 yields the window configuration discussed in @ref{Windows and Frames}.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 493095e962123cac48f322d2e12af0d2749abae1..31d14b96d94868bea63c0c0f75f0b06b1a49caba 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-13  Stephen Berman  <stephen.berman@gmx.net>
+
+       * NEWS: Mention fixing `split-window' to be non-interactive.
+
 2013-04-09  Tassilo Horn  <tsdh@gnu.org>
 
        * themes/tsdh-dark-theme.el (tsdh-dark): Add some more faces.

diff --git a/etc/NEWS b/etc/NEWS
index 6014ee362195d649af0b2afad06d0884a5cce751..1e072afaaf10bed99ab60cb53cfd1ce9db502cf0 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -76,6 +76,11 @@ of the buffer is visible).
 \f
 * Editing Changes in Emacs 24.4
 
+** `split-window' is no longer a command, just a non-interactive function.
+As a command it was a special case of `split-window-below', and as such
+superfluous.  After being reimplemented in Lisp, its interactive form
+was mistakenly retained.
+
 ** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
 bound to <f11> and M-<f10>, respectively.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37e8028c941016435e8746fa472089ceb476e5b5..9f31cd8228b7f92c9df1a1caa4480eed0f082a53 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-13  Stephen Berman  <stephen.berman@gmx.net>
+
+       * window.el (split-window): Remove interactive form, since as a
+       command this function is a special case of split-window-below.
+       Correct doc string.
+
 2013-04-12  Roland Winkler  <winkler@gnu.org>
 
        * faces.el (read-face-name): Do not override value of arg default.

diff --git a/lisp/window.el b/lisp/window.el
index 627b9a425eb74114ad1492775e2532d73a830c14..5b001988ddfb0e1cfacd844688214732c3297de8 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3686,7 +3686,7 @@ lines or columns tall.  If SIZE is negative, make the new window
 absolute value can be less than `window-min-height' or
 `window-min-width'; so this command can make a new window as
 small as one line or two columns.  SIZE defaults to half of
-WINDOW's size.  Interactively, SIZE is the prefix argument.
+WINDOW's size.
 
 Optional third argument SIDE nil (or `below') specifies that the
 new window shall be located below WINDOW.  SIDE `above' means the
@@ -3718,7 +3718,6 @@ scrollbars are inherited from WINDOW.  If WINDOW is an internal
 window, these properties as well as the buffer displayed in the
 new window are inherited from the window selected on WINDOW's
 frame.  The selected window is not changed by this function."
-  (interactive "i")
   (setq window (window-normalize-window window))
   (let* ((side (cond
                ((not side) 'below)