diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-06-12 17:16:00 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-06-12 17:16:00 +0000 |
| commit | 5061d9c33d7086086be1f69ef37c5c0dbd586eb3 (patch) | |
| tree | 73e3b6d816d9979e0f0198452f69f0506981b9c1 /src/minibuf.c | |
| parent | b2a7698263036b1986825065baa36c8ae5aabcbd (diff) | |
| download | emacs-5061d9c33d7086086be1f69ef37c5c0dbd586eb3.tar.gz emacs-5061d9c33d7086086be1f69ef37c5c0dbd586eb3.tar.bz2 emacs-5061d9c33d7086086be1f69ef37c5c0dbd586eb3.zip | |
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 9987b71578e..f7043d8afa6 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -106,14 +106,14 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos) Lisp_Object map; Lisp_Object initial; Lisp_Object prompt; - int backup_n; + Lisp_Object backup_n; int expflag; Lisp_Object histvar; Lisp_Object histpos; { register Lisp_Object val; int count = specpdl_ptr - specpdl; - Lisp_Object mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); + Lisp_Object mini_frame; struct gcpro gcpro1, gcpro2; if (XTYPE (prompt) != Lisp_String) @@ -153,11 +153,12 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos) /* If the minibuffer window is on a different frame, save that frame's configuration too. */ +#ifdef MULTI_FRAME + XSET (mini_frame, Lisp_Frame, WINDOW_FRAME (XWINDOW (minibuf_window))); if (XFRAME (mini_frame) != selected_frame) - { - record_unwind_protect (Fset_window_configuration, - Fcurrent_window_configuration (mini_frame)); - } + record_unwind_protect (Fset_window_configuration, + Fcurrent_window_configuration (mini_frame)); +#endif val = current_buffer->directory; Fset_buffer (get_minibuffer (minibuf_level)); |