aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2008-10-17 13:03:30 +0000
committerMartin Rudalics2008-10-17 13:03:30 +0000
commit87527026563d5820f7b309daaae4054d7db3da11 (patch)
treefd56676b1c63fb0fe725233846e6b73ff30c0e0a /src
parentac62ec165aad69984eb5c944d6b63443df319099 (diff)
downloademacs-87527026563d5820f7b309daaae4054d7db3da11.tar.gz
emacs-87527026563d5820f7b309daaae4054d7db3da11.zip
(Fsplit_window): Rename arg horflag to horizontal.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/window.c21
2 files changed, 14 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6606d09e446..fe330b9e0ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-10-17 Martin Rudalics <rudalics@gmx.at>
2
3 * window.c (Fsplit_window): Rename arg horflag to horizontal.
4
12008-10-17 Kenichi Handa <handa@m17n.org> 52008-10-17 Kenichi Handa <handa@m17n.org>
2 6
3 * ftfont.c (ftfont_otf_features): Fix indexing 7 * ftfont.c (ftfont_otf_features): Fix indexing
diff --git a/src/window.c b/src/window.c
index a5374d3531e..9790d026a70 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3732,18 +3732,17 @@ make_dummy_parent (window)
3732DEFUN ("split-window", Fsplit_window, Ssplit_window, 0, 3, "", 3732DEFUN ("split-window", Fsplit_window, Ssplit_window, 0, 3, "",
3733 doc: /* Split WINDOW, putting SIZE lines in the first of the pair. 3733 doc: /* Split WINDOW, putting SIZE lines in the first of the pair.
3734WINDOW defaults to selected one and SIZE to half its size. 3734WINDOW defaults to selected one and SIZE to half its size.
3735If optional third arg HORFLAG is non-nil, split side by side 3735If optional third arg HORIZONTAL is non-nil, split side by side and put
3736and put SIZE columns in the first of the pair. In that case, 3736SIZE columns in the first of the pair. In that case, SIZE includes that
3737SIZE includes that window's scroll bar, or the divider column to its right. 3737window's scroll bar, or the divider column to its right.
3738Interactively, all arguments are nil. 3738Interactively, all arguments are nil.
3739
3740Returns the newly created window (which is the lower or rightmost one). 3739Returns the newly created window (which is the lower or rightmost one).
3741The upper or leftmost window is the original one, and remains selected 3740The upper or leftmost window is the original one, and remains selected
3742if it was selected before. 3741if it was selected before.
3743 3742
3744See Info node `(elisp)Splitting Windows' for more details and examples.*/) 3743See Info node `(elisp)Splitting Windows' for more details and examples. */)
3745 (window, size, horflag) 3744 (window, size, horizontal)
3746 Lisp_Object window, size, horflag; 3745 Lisp_Object window, size, horizontal;
3747{ 3746{
3748 register Lisp_Object new; 3747 register Lisp_Object new;
3749 register struct window *o, *p; 3748 register struct window *o, *p;
@@ -3760,7 +3759,7 @@ See Info node `(elisp)Splitting Windows' for more details and examples.*/)
3760 3759
3761 if (NILP (size)) 3760 if (NILP (size))
3762 { 3761 {
3763 if (!NILP (horflag)) 3762 if (!NILP (horizontal))
3764 /* Calculate the size of the left-hand window, by dividing 3763 /* Calculate the size of the left-hand window, by dividing
3765 the usable space in columns by two. 3764 the usable space in columns by two.
3766 We round up, since the left-hand window may include 3765 We round up, since the left-hand window may include
@@ -3777,10 +3776,10 @@ See Info node `(elisp)Splitting Windows' for more details and examples.*/)
3777 3776
3778 if (MINI_WINDOW_P (o)) 3777 if (MINI_WINDOW_P (o))
3779 error ("Attempt to split minibuffer window"); 3778 error ("Attempt to split minibuffer window");
3780 else if (window_fixed_size_p (o, !NILP (horflag), 0)) 3779 else if (window_fixed_size_p (o, !NILP (horizontal), 0))
3781 error ("Attempt to split fixed-size window"); 3780 error ("Attempt to split fixed-size window");
3782 3781
3783 if (NILP (horflag)) 3782 if (NILP (horizontal))
3784 { 3783 {
3785 int window_safe_height = window_min_size_2 (o, 0, 0); 3784 int window_safe_height = window_min_size_2 (o, 0, 0);
3786 3785
@@ -3847,7 +3846,7 @@ See Info node `(elisp)Splitting Windows' for more details and examples.*/)
3847 3846
3848 /* Apportion the available frame space among the two new windows */ 3847 /* Apportion the available frame space among the two new windows */
3849 3848
3850 if (!NILP (horflag)) 3849 if (!NILP (horizontal))
3851 { 3850 {
3852 p->total_lines = o->total_lines; 3851 p->total_lines = o->total_lines;
3853 p->top_line = o->top_line; 3852 p->top_line = o->top_line;