aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKan-Ru Chen2014-09-12 08:26:46 +0200
committerMartin Rudalics2014-09-12 08:26:46 +0200
commitc4ea7c96121ec50db8dbfcb4bfe961f23760e3f9 (patch)
tree657abba4c5b1d062a5c21b959b3305d5f30506d8
parentab10393e755d0e263760672e0af60287fe472bb7 (diff)
downloademacs-c4ea7c96121ec50db8dbfcb4bfe961f23760e3f9.tar.gz
emacs-c4ea7c96121ec50db8dbfcb4bfe961f23760e3f9.zip
Fix fit-window-to-buffer doc-string.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/window.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46cb4ba0d68..822abf9c0fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-09-12 Kan-Ru Chen <kanru@kanru.info>
2
3 * window.el (fit-window-to-buffer): Doc fix.
4
12014-09-10 Ivan Shmakov <ivan@siamics.net> (tiny change) 52014-09-10 Ivan Shmakov <ivan@siamics.net> (tiny change)
2 6
3 * desktop.el (desktop-create-buffer): Check that buffers are still live 7 * desktop.el (desktop-create-buffer): Check that buffers are still live
diff --git a/lisp/window.el b/lisp/window.el
index c73f019870b..4dc30ff968c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7173,7 +7173,7 @@ and header line and a bottom divider, if any.
7173 7173
7174If WINDOW is part of a horizontal combination and the value of 7174If WINDOW is part of a horizontal combination and the value of
7175the option `fit-window-to-buffer-horizontally' is non-nil, adjust 7175the option `fit-window-to-buffer-horizontally' is non-nil, adjust
7176WINDOW's height. The new width of WINDOW is calculated from the 7176WINDOW's width. The new width of WINDOW is calculated from the
7177maximum length of its buffer's lines that follow the current 7177maximum length of its buffer's lines that follow the current
7178start position of WINDOW. The optional argument MAX-WIDTH 7178start position of WINDOW. The optional argument MAX-WIDTH
7179specifies a maximum width and defaults to the width of WINDOW's 7179specifies a maximum width and defaults to the width of WINDOW's