aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-11 17:55:00 +0200
committerLars Magne Ingebrigtsen2011-07-11 17:55:00 +0200
commit6e70ab070f8df26bfa9a8de88075cf15a5a26926 (patch)
tree1a01f22c131f28825f0d9fb39e0be52d5c839418 /src
parentdf97fd71baeb16e570b4b2e796ad479f35201ec1 (diff)
downloademacs-6e70ab070f8df26bfa9a8de88075cf15a5a26926.tar.gz
emacs-6e70ab070f8df26bfa9a8de88075cf15a5a26926.zip
Make it explicit that the mini-windows are the mini-buffer and the echo area
Fixes: debbugs:3320
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f45920a2ce7..e75a84a4a6b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * xdisp.c (syms_of_xdisp): Make it explicit that the mini-windows
4 are the mini-buffer and the echo area (bug#3320).
5
3 * term.c (init_tty): Remove support for supdup, c10 and perq 6 * term.c (init_tty): Remove support for supdup, c10 and perq
4 terminals, which are no longer supported (bug#1482). 7 terminals, which are no longer supported (bug#1482).
5 8
diff --git a/src/xdisp.c b/src/xdisp.c
index a86cca86341..d4c6743f805 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26846,13 +26846,13 @@ but does not change the fact they are interpreted as raw bytes. */);
26846 unibyte_display_via_language_environment = 0; 26846 unibyte_display_via_language_environment = 0;
26847 26847
26848 DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height, 26848 DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height,
26849 doc: /* *Maximum height for resizing mini-windows. 26849 doc: /* *Maximum height for resizing mini-windows (the minibuffer and the echo area).
26850If a float, it specifies a fraction of the mini-window frame's height. 26850If a float, it specifies a fraction of the mini-window frame's height.
26851If an integer, it specifies a number of lines. */); 26851If 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. 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