summaryrefslogtreecommitdiff
path: root/doc
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 /doc
parent5f3aea8a10773dc481ed719034ea464573845ea1 (diff)
parent66dea652ef5f5eacb7bdec23068f0b684f69956d (diff)
Merge from origin/emacs-25
66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/windows.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b2b5764243..36bccdd30a 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4395,11 +4395,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
-@code{window-size-change-functions} (@pxref{Window Hooks}), should be
+Both @code{window-configuration-change-hook} and
+@code{window-size-change-functions} (@pxref{Window Hooks}) should be
employed for this purpose.
This parameter was introduced in Emacs version 25.1 to support