aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-04-10 01:51:27 +0000
committerRichard M. Stallman1996-04-10 01:51:27 +0000
commit57ceaa8a70a029d0f673c63768428d19d1b946fe (patch)
tree38767d11d3e75f9be9188a19815d6e18dfdf0040 /src
parent18198bb2094e73df6db684301b2c152a16dbb010 (diff)
downloademacs-57ceaa8a70a029d0f673c63768428d19d1b946fe.tar.gz
emacs-57ceaa8a70a029d0f673c63768428d19d1b946fe.zip
(read_minibuf): GCPRO ambient_dir.
Diffstat (limited to 'src')
-rw-r--r--src/minibuf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index 24cabccee30..9a65e2c9df5 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -176,15 +176,17 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
176 Lisp_Object val; 176 Lisp_Object val;
177 int count = specpdl_ptr - specpdl; 177 int count = specpdl_ptr - specpdl;
178 Lisp_Object mini_frame, ambient_dir; 178 Lisp_Object mini_frame, ambient_dir;
179 struct gcpro gcpro1, gcpro2, gcpro3; 179 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
180 180
181 single_kboard_state (); 181 single_kboard_state ();
182 182
183 val = Qnil; 183 val = Qnil;
184 ambient_dir = current_buffer->directory;
185
184 /* Don't need to protect PROMPT, HISTVAR, and HISTPOS because we 186 /* Don't need to protect PROMPT, HISTVAR, and HISTPOS because we
185 store them away before we can GC. Don't need to protect 187 store them away before we can GC. Don't need to protect
186 BACKUP_N because we use the value only if it is an integer. */ 188 BACKUP_N because we use the value only if it is an integer. */
187 GCPRO3 (map, initial, val); 189 GCPRO4 (map, initial, val, ambient_dir);
188 190
189 if (!STRINGP (prompt)) 191 if (!STRINGP (prompt))
190 prompt = build_string (""); 192 prompt = build_string ("");
@@ -194,8 +196,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
194 && (EQ (selected_window, minibuf_window))) 196 && (EQ (selected_window, minibuf_window)))
195 error ("Command attempted to use minibuffer while in minibuffer"); 197 error ("Command attempted to use minibuffer while in minibuffer");
196 198
197 ambient_dir = current_buffer->directory;
198
199 /* Choose the minibuffer window and frame, and take action on them. */ 199 /* Choose the minibuffer window and frame, and take action on them. */
200 200
201 choose_minibuf_frame (); 201 choose_minibuf_frame ();