aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-07-11 23:04:06 -0400
committerChong Yidong2011-07-11 23:04:06 -0400
commitb1f5845471eeb5fc41bb6fb7777b2b31beadc726 (patch)
tree208f596af7cb3a9d596fd1f97646a6174467587d /src
parentf69fd0d2fb66ec97cf315e7ef5b0e6b402822af0 (diff)
downloademacs-b1f5845471eeb5fc41bb6fb7777b2b31beadc726.tar.gz
emacs-b1f5845471eeb5fc41bb6fb7777b2b31beadc726.zip
* xdisp.c (Vresize_mini_windows): Incredibly minor doc fix (Bug#3300).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e75a84a4a6b..4f285c069cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-07-12 Chong Yidong <cyd@stupidchicken.com>
2
3 * xdisp.c (Vresize_mini_windows): Minor doc fix (Bug#3300).
4
12011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * xdisp.c (syms_of_xdisp): Make it explicit that the mini-windows 7 * xdisp.c (syms_of_xdisp): Make it explicit that the mini-windows
diff --git a/src/xdisp.c b/src/xdisp.c
index d4c6743f805..685386bc40c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26852,12 +26852,12 @@ If an integer, it specifies a number of lines. */);
26852 Vmax_mini_window_height = make_float (0.25); 26852 Vmax_mini_window_height = make_float (0.25);
26853 26853
26854 DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows, 26854 DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows,
26855 doc: /* *How to resize mini-windows (the minibuffer and the echo area). 26855 doc: /* How to resize mini-windows (the minibuffer and the echo area).
26856A value of nil means don't automatically resize mini-windows. 26856A value of nil means don't automatically resize mini-windows.
26857A value of t means resize them to fit the text displayed in them. 26857A value of t means resize them to fit the text displayed in them.
26858A value of `grow-only', the default, means let mini-windows grow 26858A value of `grow-only', the default, means let mini-windows grow only;
26859only, until their display becomes empty, at which point the windows 26859they return to their normal size when the minibuffer is closed, or the
26860go back to their normal size. */); 26860echo area becomes empty. */);
26861 Vresize_mini_windows = Qgrow_only; 26861 Vresize_mini_windows = Qgrow_only;
26862 26862
26863 DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist, 26863 DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,