comparison src/minibuf.c @ 11004:0f6b7b33340a

(read_minibuf): Save Voverriding_local_map. (read_minibuf_unwind): Restore Voverriding_local_map.
author Richard M. Stallman <rms@gnu.org>
date Tue, 14 Mar 1995 21:15:08 +0000
parents 1af826d1d91d
children 5407034f6ece
comparison
equal deleted inserted replaced
11003:71304a70d0f6 11004:0f6b7b33340a
96 Lisp_Object Quser_variable_p; 96 Lisp_Object Quser_variable_p;
97 97
98 /* Non-nil means it is the window for C-M-v to scroll 98 /* Non-nil means it is the window for C-M-v to scroll
99 when the minibuffer is selected. */ 99 when the minibuffer is selected. */
100 extern Lisp_Object Vminibuf_scroll_window; 100 extern Lisp_Object Vminibuf_scroll_window;
101
102 extern Lisp_Object Voverriding_local_map;
101 103
102 /* Actual minibuffer invocation. */ 104 /* Actual minibuffer invocation. */
103 105
104 void read_minibuf_unwind (); 106 void read_minibuf_unwind ();
105 Lisp_Object get_minibuffer (); 107 Lisp_Object get_minibuffer ();
158 Fcons (make_number (minibuf_prompt_width), 160 Fcons (make_number (minibuf_prompt_width),
159 Fcons (Vhelp_form, 161 Fcons (Vhelp_form,
160 Fcons (Vcurrent_prefix_arg, 162 Fcons (Vcurrent_prefix_arg,
161 Fcons (Vminibuffer_history_position, 163 Fcons (Vminibuffer_history_position,
162 Fcons (Vminibuffer_history_variable, 164 Fcons (Vminibuffer_history_variable,
163 minibuf_save_list)))))); 165 Fcons (Voverriding_local_map,
166 minibuf_save_list)))))));
164 minibuf_prompt_width = 0; /* xdisp.c puts in the right value. */ 167 minibuf_prompt_width = 0; /* xdisp.c puts in the right value. */
165 minibuf_prompt = Fcopy_sequence (prompt); 168 minibuf_prompt = Fcopy_sequence (prompt);
166 Vminibuffer_history_position = histpos; 169 Vminibuffer_history_position = histpos;
167 Vminibuffer_history_variable = histvar; 170 Vminibuffer_history_variable = histvar;
168 171
400 Vcurrent_prefix_arg = Fcar (minibuf_save_list); 403 Vcurrent_prefix_arg = Fcar (minibuf_save_list);
401 minibuf_save_list = Fcdr (minibuf_save_list); 404 minibuf_save_list = Fcdr (minibuf_save_list);
402 Vminibuffer_history_position = Fcar (minibuf_save_list); 405 Vminibuffer_history_position = Fcar (minibuf_save_list);
403 minibuf_save_list = Fcdr (minibuf_save_list); 406 minibuf_save_list = Fcdr (minibuf_save_list);
404 Vminibuffer_history_variable = Fcar (minibuf_save_list); 407 Vminibuffer_history_variable = Fcar (minibuf_save_list);
408 minibuf_save_list = Fcdr (minibuf_save_list);
409 Voverriding_local_map = Fcar (minibuf_save_list);
405 minibuf_save_list = Fcdr (minibuf_save_list); 410 minibuf_save_list = Fcdr (minibuf_save_list);
406 } 411 }
407 412
408 413
409 /* This comment supplies the doc string for read-from-minibuffer, 414 /* This comment supplies the doc string for read-from-minibuffer,