[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106670: Minor fixes in window handli
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106670: Minor fixes in window handling code and docs. |
Date: |
Tue, 13 Dec 2011 14:37:48 +0100 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106670
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2011-12-13 14:37:48 +0100
message:
Minor fixes in window handling code and docs.
* window.c (Vwindow_combination_resize)
(Vwindow_combination_limit): Use t instead of non-nil in
doc-strings.
* window.el (delete-other-windows): Use correct frame in call to
window-with-parameter.
* windows.texi (Splitting Windows): Use t instead of non-nil
when describing window-combination-resize.
modified:
doc/lispref/ChangeLog
doc/lispref/windows.texi
lisp/ChangeLog
lisp/window.el
src/ChangeLog
src/window.c
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-12-12 05:32:49 +0000
+++ b/doc/lispref/ChangeLog 2011-12-13 13:37:48 +0000
@@ -1,3 +1,8 @@
+2011-12-13 Martin Rudalics <address@hidden>
+
+ * windows.texi (Splitting Windows): Use t instead of non-nil
+ when describing window-combination-resize.
+
2011-12-05 Stefan Monnier <address@hidden>
* text.texi (Special Properties): Warn against `intangible' properties
=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi 2011-11-25 14:24:05 +0000
+++ b/doc/lispref/windows.texi 2011-12-13 13:37:48 +0000
@@ -793,20 +793,20 @@
@defopt window-combination-resize
If this variable is @code{nil}, @code{split-window} can only split a
-window (denoted by @var{window}) if @var{window}'s screen area is
-large enough to accommodate both itself and the new window. This is
-the default.
-
-If this variable is address@hidden, @code{split-window} tries to
-resize all windows that are part of the same combination as
address@hidden, in order to accommodate the new window. In particular,
-this may allow @code{split-window} to succeed even if @var{window} is
-a fixed-size window or too small to ordinarily split. Furthermore,
-subsequently resizing or deleting @var{window} may resize all other
-windows in its combination.
-
-This variable has no effect if @code{window-combination-limit} is
address@hidden (see below).
+window (denoted by @var{window}) if @var{window}'s screen area is large
+enough to accommodate both itself and the new window.
+
+If this variable is @code{t}, @code{split-window} tries to resize all
+windows that are part of the same combination as @var{window}, in order
+to accommodate the new window. In particular, this may allow
address@hidden to succeed even if @var{window} is a fixed-size
+window or too small to ordinarily split. Furthermore, subsequently
+resizing or deleting @var{window} may resize all other windows in its
+combination.
+
+The default is @code{nil}. Other values are reserved for future use.
+The value of this variable is ignored when
address@hidden is address@hidden (see below).
@end defopt
To illustrate the effect of @code{window-combination-resize},
@@ -857,9 +857,9 @@
@end smallexample
@noindent
-If @code{window-combination-resize} is address@hidden, splitting
address@hidden instead leaves all three live windows with approximately the
-same height:
+If @code{window-combination-resize} is @code{t}, splitting @code{W3}
+instead leaves all three live windows with approximately the same
+height:
@smallexample
@group
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-12-12 21:23:42 +0000
+++ b/lisp/ChangeLog 2011-12-13 13:37:48 +0000
@@ -1,3 +1,8 @@
+2011-12-13 Martin Rudalics <address@hidden>
+
+ * window.el (delete-other-windows): Use correct frame in call to
+ window-with-parameter.
+
2011-12-12 Daniel Pfeiffer <address@hidden>
* progmodes/make-mode.el: Bring it up to date with makepp V2.0.
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-12-11 10:38:11 +0000
+++ b/lisp/window.el 2011-12-13 13:37:48 +0000
@@ -2455,7 +2455,7 @@
(throw 'done (delete-other-windows atom-root)))
((eq window-side 'none)
;; Set side-main to the major non-side window.
- (setq side-main (window-with-parameter 'window-side 'none nil t)))
+ (setq side-main (window-with-parameter 'window-side 'none frame t)))
((memq window-side window-sides)
(error "Cannot make side window the only window")))
;; If WINDOW is the main non-side window, do nothing.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-12-11 12:08:51 +0000
+++ b/src/ChangeLog 2011-12-13 13:37:48 +0000
@@ -1,3 +1,9 @@
+2011-12-13 Martin Rudalics <address@hidden>
+
+ * window.c (Vwindow_combination_resize)
+ (Vwindow_combination_limit): Use t instead of non-nil in
+ doc-strings.
+
2011-12-11 Kenichi Handa <address@hidden>
* coding.c (Funencodable_char_position): Pay attention to the
=== modified file 'src/window.c'
--- a/src/window.c 2011-12-04 08:02:42 +0000
+++ b/src/window.c 2011-12-13 13:37:48 +0000
@@ -6506,22 +6506,24 @@
Vrecenter_redisplay = Qtty;
DEFVAR_LISP ("window-combination-resize", Vwindow_combination_resize,
- doc: /* Non-nil means resize window combinations proportionally.
+ doc: /* If t, resize window combinations proportionally.
If this variable is nil, splitting a window gets the entire screen space
for displaying the new window from the window to split. Deleting and
resizing a window preferably resizes one adjacent window only.
-If this variable is non-nil, splitting a window tries to get the space
+If this variable is t, splitting a window tries to get the space
proportionally from all windows in the same combination. This also
allows to split a window that is otherwise too small or of fixed size.
Resizing and deleting a window proportionally resize all windows in the
same combination.
+Other values are reserved for future use.
+
This variable takes no effect if `window-combination-limit' is non-nil. */);
Vwindow_combination_resize = Qnil;
DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit,
- doc: /* Non-nil means splitting a window makes a new parent
window.
+ doc: /* If t, splitting a window makes a new parent window.
If this variable is nil, splitting a window will create a new parent
window only if the window has no parent window or the window shall
become a combination orthogonal to the one it is part of.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106670: Minor fixes in window handling code and docs.,
martin rudalics <=