[Emacs-diffs] emacs-25 2e4e74e 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

[Eli Zaretskii]

branch: emacs-25
commit 2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc
Merge: 7d639f3 66dea65
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
---
 doc/lispref/windows.texi |    6 +++---
 etc/NEWS                 |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 386584b..78094e9 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
 window can be split or shrunk horizontally.
 
 Emacs never auto-adjusts the margins of any window after splitting or
-resizing it.  It is sole responsibility of the application that has set
+resizing it.  It is the sole responsibility of any application setting
 this parameter to adjust the margins of this window as well as those of
 any new window that inherits this window's margins due to a split.
-Both, @code{window-configuration-change-hook} and
address@hidden (@pxref{Window Hooks}), should be
+Both @code{window-configuration-change-hook} and
address@hidden (@pxref{Window Hooks}) should be
 employed for this purpose.
 
 This parameter was introduced in Emacs version 25.1 to support
diff --git a/etc/NEWS b/etc/NEWS
index 8758826..9f97d76 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1631,9 +1631,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