diff options
| author | Eli Zaretskii | 2016-03-15 19:46:26 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-03-15 19:46:26 +0200 |
| commit | 38b276d162197a5ca4bd7322ff8a823c3754edb4 (patch) | |
| tree | 7caf089a0da2b8b6222e544c0a7a8ce02936e08c /src | |
| parent | dbfbedd3d0f3afcfb811eae0e1a7b1c33fb27735 (diff) | |
| download | emacs-38b276d162197a5ca4bd7322ff8a823c3754edb4.tar.gz emacs-38b276d162197a5ca4bd7322ff8a823c3754edb4.zip | |
Fix startup of "emacs -nw" on systems that CANNOT_DUMP
* src/xdisp.c (syms_of_xdisp) <resize-mini-windows>: Initialize to
nil.
* lisp/loadup.el <resize-mini-windows>: Set to 'grow-only' after
loading window.el. (Bug#22975)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index ce992d42531..edefe3210c0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -31598,7 +31598,12 @@ A value of t means resize them to fit the text displayed in them. | |||
| 31598 | A value of `grow-only', the default, means let mini-windows grow only; | 31598 | A value of `grow-only', the default, means let mini-windows grow only; |
| 31599 | they return to their normal size when the minibuffer is closed, or the | 31599 | they return to their normal size when the minibuffer is closed, or the |
| 31600 | echo area becomes empty. */); | 31600 | echo area becomes empty. */); |
| 31601 | Vresize_mini_windows = Qgrow_only; | 31601 | /* Contrary to the doc string, we initialize this to nil, so that |
| 31602 | loading loadup.el won't try to resize windows before loading | ||
| 31603 | window.el, where some functions we need to call for this live. | ||
| 31604 | We assign the 'grow-only' value right after loading window.el | ||
| 31605 | during loadup. */ | ||
| 31606 | Vresize_mini_windows = Qnil; | ||
| 31602 | 31607 | ||
| 31603 | DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist, | 31608 | DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist, |
| 31604 | doc: /* Alist specifying how to blink the cursor off. | 31609 | doc: /* Alist specifying how to blink the cursor off. |