aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-08-16 08:40:02 -0700
committerGlenn Morris2016-08-16 08:40:02 -0700
commit66dea652ef5f5eacb7bdec23068f0b684f69956d (patch)
treefc51f6e278e24379f6ac8a0d99a81bcefd5af5dd
parent4225b786746e170477ddd64deaf18facf11955f4 (diff)
downloademacs-66dea652ef5f5eacb7bdec23068f0b684f69956d.tar.gz
emacs-66dea652ef5f5eacb7bdec23068f0b684f69956d.zip
; * doc/lispref/windows.texi (Window Parameters): Grammar tweaks.
* etc/NEWS: Likewise.
-rw-r--r--doc/lispref/windows.texi6
-rw-r--r--etc/NEWS4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 386584bf9e5..78094e95f4d 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4358,11 +4358,11 @@ values instead of the actual margin widths for determining whether a
4358window can be split or shrunk horizontally. 4358window can be split or shrunk horizontally.
4359 4359
4360Emacs never auto-adjusts the margins of any window after splitting or 4360Emacs never auto-adjusts the margins of any window after splitting or
4361resizing it. It is sole responsibility of the application that has set 4361resizing it. It is the sole responsibility of any application setting
4362this parameter to adjust the margins of this window as well as those of 4362this parameter to adjust the margins of this window as well as those of
4363any new window that inherits this window's margins due to a split. 4363any new window that inherits this window's margins due to a split.
4364Both, @code{window-configuration-change-hook} and 4364Both @code{window-configuration-change-hook} and
4365@code{window-size-change-functions} (@pxref{Window Hooks}), should be 4365@code{window-size-change-functions} (@pxref{Window Hooks}) should be
4366employed for this purpose. 4366employed for this purpose.
4367 4367
4368This parameter was introduced in Emacs version 25.1 to support 4368This parameter was introduced in Emacs version 25.1 to support
diff --git a/etc/NEWS b/etc/NEWS
index 87588266b42..9f97d764aee 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1631,9 +1631,9 @@ frames.
1631'window-divider-default-places', 'window-divider-default-bottom-width' 1631'window-divider-default-places', 'window-divider-default-bottom-width'
1632and 'window-divider-default-right-width'. 1632and 'window-divider-default-right-width'.
1633 1633
1634*** When a window is shrunk horizontally its margins are no more removed 1634*** When a window is shrunk horizontally its margins are no longer removed
1635automatically. Rather, Emacs refuses to split or resize windows when 1635automatically. Rather, Emacs refuses to split or resize windows when
1636this would cause margins to no more fit into the width reserved for the 1636this would cause margins to no longer fit into the width reserved for the
1637corresponding window. An application can override this behavior for a 1637corresponding window. An application can override this behavior for a
1638particular window by setting that window's 'min-margins' parameter. As 1638particular window by setting that window's 'min-margins' parameter. As
1639a consequence, the application becomes fully responsible for trimming 1639a consequence, the application becomes fully responsible for trimming