diff options
| author | Lars Magne Ingebrigtsen | 2012-04-06 00:26:20 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2012-04-06 00:26:20 +0200 |
| commit | f23d2c7d18471ef3c509740d9f1aa2437c9e0cec (patch) | |
| tree | e5a0939a5a65997de8e195ffd09d8e2df8999460 | |
| parent | 48cac0510d919e89e04ac33defbf3d6dd67767f7 (diff) | |
| download | emacs-f23d2c7d18471ef3c509740d9f1aa2437c9e0cec.tar.gz emacs-f23d2c7d18471ef3c509740d9f1aa2437c9e0cec.zip | |
`shrink-window' doc fix
* window.el (shrink-window): Mention the `window-min-height'
variable in the doc string.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 696e6e1eedc..9c7ba8541df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-04-05 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * window.el (shrink-window): Mention the `window-min-height' | ||
| 4 | variable in the doc string. | ||
| 5 | |||
| 1 | 2012-04-05 Bastien Guerry <bzg@altern.org> | 6 | 2012-04-05 Bastien Guerry <bzg@altern.org> |
| 2 | 7 | ||
| 3 | * color.el (color-lighten-name): Fix typo. | 8 | * color.el (color-lighten-name): Fix typo. |
diff --git a/lisp/window.el b/lisp/window.el index 42bc57272bb..c9e2469b0d2 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -2117,6 +2117,7 @@ Interactively, if no argument is given, make the selected window | |||
| 2117 | one line smaller. If optional argument HORIZONTAL is non-nil, | 2117 | one line smaller. If optional argument HORIZONTAL is non-nil, |
| 2118 | make selected window narrower by DELTA columns. If DELTA is | 2118 | make selected window narrower by DELTA columns. If DELTA is |
| 2119 | negative, enlarge selected window by -DELTA lines or columns. | 2119 | negative, enlarge selected window by -DELTA lines or columns. |
| 2120 | Also see the `window-min-height' variable. | ||
| 2120 | Return nil." | 2121 | Return nil." |
| 2121 | (interactive "p") | 2122 | (interactive "p") |
| 2122 | (cond | 2123 | (cond |