summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-22 14:38:50 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-22 14:38:50 -0700
commitbde5e3fa83a0275bc6b54af23906fc3a8b313888 (patch)
tree2f3232e658c463648621731143e696847fe8a928 /etc
parent5f3aea8a10773dc481ed719034ea464573845ea1 (diff)
parent66dea652ef5f5eacb7bdec23068f0b684f69956d (diff)
Merge from origin/emacs-25
66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...
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 1c3c036fbb..694a0eadff 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2215,9 +2215,9 @@ frames.
'window-divider-default-places', 'window-divider-default-bottom-width'
and 'window-divider-default-right-width'.
-*** When a window is shrunk horizontally its margins are no more removed
+*** When a window is shrunk horizontally its margins are no longer removed
automatically. Rather, Emacs refuses to split or resize windows when
-this would cause margins to no more fit into the width reserved for the
+this would cause margins to no longer fit into the width reserved for the
corresponding window. An application can override this behavior for a
particular window by setting that window's 'min-margins' parameter. As
a consequence, the application becomes fully responsible for trimming