aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorEli Zaretskii2016-08-16 21:35:17 +0300
committerEli Zaretskii2016-08-16 21:35:17 +0300
commit2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc (patch)
tree738128da7cadae80756fe6498f6433bb3094f76b /etc
parent7d639f3be66e9b41f53e6349f8362ef0f1042e26 (diff)
parent66dea652ef5f5eacb7bdec23068f0b684f69956d (diff)
downloademacs-2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc.tar.gz
emacs-2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc.zip
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS4
1 files changed, 2 insertions, 2 deletions
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