aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-11-08 20:06:29 +0100
committerMartin Rudalics2011-11-08 20:06:29 +0100
commitb3f4a882bf9598be109d9435ed1fdaaf5883fe48 (patch)
tree3a7fcb8ea2acef419e5a0f38416b597c55352b7f
parent4b0d61e31050ecdaf003c4c3a9efd175f2b8afdd (diff)
downloademacs-b3f4a882bf9598be109d9435ed1fdaaf5883fe48.tar.gz
emacs-b3f4a882bf9598be109d9435ed1fdaaf5883fe48.zip
Fix doc-string typo in window-min-delta
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/window.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23d33e81934..44f81a92237 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,7 @@
14 * window.el (display-buffer-function, special-display-function): 14 * window.el (display-buffer-function, special-display-function):
15 Mention display-buffer-record-window but do not mention 15 Mention display-buffer-record-window but do not mention
16 help-setup parameter in doc-strings. 16 help-setup parameter in doc-strings.
17 (window-min-delta): Fix doc-string typo.
17 18
182011-11-08 Chong Yidong <cyd@gnu.org> 192011-11-08 Chong Yidong <cyd@gnu.org>
19 20
diff --git a/lisp/window.el b/lisp/window.el
index 3242f1fd04f..1e95a647b1f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -772,7 +772,7 @@ tree but try to enlarge windows within WINDOW's combination only.
772 772
773Optional argument NODOWN non-nil means don't check whether WINDOW 773Optional argument NODOWN non-nil means don't check whether WINDOW
774itself \(and its child windows) can be shrunk; check only whether 774itself \(and its child windows) can be shrunk; check only whether
775at least one other windows can be enlarged appropriately." 775at least one other window can be enlarged appropriately."
776 (setq window (window-normalize-window window)) 776 (setq window (window-normalize-window window))
777 (let ((size (window-total-size window horizontal)) 777 (let ((size (window-total-size window horizontal))
778 (minimum (window-min-size window horizontal ignore))) 778 (minimum (window-min-size window horizontal ignore)))