Mercurial > emacs

comparison src/minibuf.c @ 3690:2d6cd35210f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
author Richard M. Stallman <rms@gnu.org>
date Sat, 12 Jun 1993 17:16:00 +0000
parents e94a593c3952
children 11500459af1d
comparison
equal deleted inserted replaced
3689:82856e3ea14d 3690:2d6cd35210f3
104 Lisp_Object 104 Lisp_Object
105 read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos) 105 read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
106 Lisp_Object map; 106 Lisp_Object map;
107 Lisp_Object initial; 107 Lisp_Object initial;
108 Lisp_Object prompt; 108 Lisp_Object prompt;
109 int backup_n; 109 Lisp_Object backup_n;
110 int expflag; 110 int expflag;
111 Lisp_Object histvar; 111 Lisp_Object histvar;
112 Lisp_Object histpos; 112 Lisp_Object histpos;
113 { 113 {
114 register Lisp_Object val; 114 register Lisp_Object val;
115 int count = specpdl_ptr - specpdl; 115 int count = specpdl_ptr - specpdl;
116 Lisp_Object mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); 116 Lisp_Object mini_frame;
117 struct gcpro gcpro1, gcpro2; 117 struct gcpro gcpro1, gcpro2;
118 118
119 if (XTYPE (prompt) != Lisp_String) 119 if (XTYPE (prompt) != Lisp_String)
120 prompt = build_string (""); 120 prompt = build_string ("");
121 121
151 record_unwind_protect (Fset_window_configuration, 151 record_unwind_protect (Fset_window_configuration,
152 Fcurrent_window_configuration (Qnil)); 152 Fcurrent_window_configuration (Qnil));
153 153
154 /* If the minibuffer window is on a different frame, save that 154 /* If the minibuffer window is on a different frame, save that
155 frame's configuration too. */ 155 frame's configuration too. */
156 #ifdef MULTI_FRAME
157 XSET (mini_frame, Lisp_Frame, WINDOW_FRAME (XWINDOW (minibuf_window)));
156 if (XFRAME (mini_frame) != selected_frame) 158 if (XFRAME (mini_frame) != selected_frame)
157 { 159 record_unwind_protect (Fset_window_configuration,
158 record_unwind_protect (Fset_window_configuration, 160 Fcurrent_window_configuration (mini_frame));
159 Fcurrent_window_configuration (mini_frame)); 161 #endif
160 }
161 162
162 val = current_buffer->directory; 163 val = current_buffer->directory;
163 Fset_buffer (get_minibuffer (minibuf_level)); 164 Fset_buffer (get_minibuffer (minibuf_level));
164 165
165 /* The current buffer's default directory is usually the right thing 166 /* The current buffer's default directory is usually the right thing