diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-07-30 21:42:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-07-30 21:42:34 -0700 |
| commit | 1ac0cfa2642ac026e09a7555f000e895b49289d5 (patch) | |
| tree | 952416b5746614ea4e961dca70a00162421de36f /lisp/window.el | |
| parent | 77fb84e6db96cbaa70e230f4881e4ede6e028f15 (diff) | |
| parent | 8fbe46252f5f241d274b59c6b1aaecd3ee58cc6a (diff) | |
| download | emacs-1ac0cfa2642ac026e09a7555f000e895b49289d5.tar.gz | |
Merge from origin/emacs-26
8fbe462 (origin/emacs-26) ; * doc/lispref/positions.texi (List Motion...
1d9efc0 Add index for "\( in strings" (Bug#25195)
304e96f Fix doc-string of 'fit-window-to-buffer' (Bug#36848)
d4c4987 Update view-mode docstring
d6ca1fc ; * lisp/term.el: Add missing / to esc seq commentary.
b3e2073 Fix subproc listening when setting filter to non-t (Bug#36591)
f671950 * etc/NEWS.25: Belatedly announce rcirc-reconnect-delay.
7f42277 Mention term.el's \032 dir tracking in commentary (Bug#19524)
16a529e Remove upload functionality of package-x from the elisp manual
78e6c2a * etc/AUTHORS: Update.
086a56e Clarify Gravatar docs
0592467 * doc/lispref/display.texi (Defining Faces): Say a face can't...
# Conflicts:
# doc/emacs/programs.texi
# etc/AUTHORS
# lisp/term.el
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index 8597f870a5b..8b12c4381f4 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -8685,7 +8685,7 @@ and defaults to `window-min-width'. Both MAX-WIDTH and MIN-WIDTH are specified in columns and include fringes, margins, a scrollbar and a vertical divider, if any. -If the optional argument `preserve-size' is non-nil, preserve the +Optional argument PRESERVE-SIZE non-nil means to preserve the size of WINDOW (see `window-preserve-size'). Fit pixelwise if the option `window-resize-pixelwise' is non-nil. |