diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-08-16 21:35:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-08-16 21:35:17 +0300 |
| commit | 2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc (patch) | |
| tree | 738128da7cadae80756fe6498f6433bb3094f76b | |
| parent | 7d639f3be66e9b41f53e6349f8362ef0f1042e26 (diff) | |
| parent | 66dea652ef5f5eacb7bdec23068f0b684f69956d (diff) | |
| download | emacs-2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc.tar.gz | |
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
| -rw-r--r-- | doc/lispref/windows.texi | 6 | ||||
| -rw-r--r-- | etc/NEWS | 4 |
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 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 @@ -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 |