diff options
| -rw-r--r-- | lisp/loadup.el | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index bd47bed3160..21c64a8c3b4 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -117,6 +117,10 @@ (load "format") (load "bindings") (load "window") ; Needed here for `replace-buffer-in-windows'. +;; We are now capable of resizing the mini-windows, so give the +;; variable its advertised default value (it starts as nil, see +;; xdisp.c). +(setq resize-mini-windows 'grow-only) (setq load-source-file-function 'load-with-code-conversion) (load "files") 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. A value of `grow-only', the default, means let mini-windows grow only; they return to their normal size when the minibuffer is closed, or the echo area becomes empty. */); - Vresize_mini_windows = Qgrow_only; + /* Contrary to the doc string, we initialize this to nil, so that + loading loadup.el won't try to resize windows before loading + window.el, where some functions we need to call for this live. + We assign the 'grow-only' value right after loading window.el + during loadup. */ + Vresize_mini_windows = Qnil; DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist, doc: /* Alist specifying how to blink the cursor off. |