[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: keybindings change for recursive minibuffers
From: |
Richard Stallman |
Subject: |
Re: keybindings change for recursive minibuffers |
Date: |
Sun, 28 Jan 2007 14:48:53 -0500 |
Does this patch fix it?
*** minibuf.c 28 Jan 2007 02:17:22 -0500 1.321
--- minibuf.c 28 Jan 2007 14:50:13 -0500
***************
*** 135,140 ****
--- 135,145 ----
/* Keymap for reading expressions. */
Lisp_Object Vread_expression_map;
+ Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table;
+ Lisp_Object Vminibuffer_completion_predicate,
Qminibuffer_completion_predicate;
+ Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm;
+ Lisp_Object Vminibuffer_completing_file_name;
+
Lisp_Object Quser_variable_p;
Lisp_Object Qminibuffer_default;
***************
*** 571,577 ****
specpdl slots. */
minibuf_save_list
= Fcons (Voverriding_local_map,
! Fcons (minibuf_window, minibuf_save_list));
minibuf_save_list
= Fcons (minibuf_prompt,
Fcons (make_number (minibuf_prompt_width),
--- 576,584 ----
specpdl slots. */
minibuf_save_list
= Fcons (Voverriding_local_map,
! Fcons (minibuf_window,
! Fcons (Vminibuffer_completing_file_name,
! minibuf_save_list)));
minibuf_save_list
= Fcons (minibuf_prompt,
Fcons (make_number (minibuf_prompt_width),
***************
*** 597,602 ****
--- 604,612 ----
Vminibuffer_history_position = histpos;
Vminibuffer_history_variable = histvar;
Vhelp_form = Vminibuffer_help_form;
+ /* If this minibuffer is reading a file name,
+ that doesn't mean recursive ones are. */
+ Vminibuffer_completing_file_name = Qnil;
if (inherit_input_method)
{
***************
*** 918,923 ****
--- 928,935 ----
minibuf_window = temp;
#endif
minibuf_save_list = Fcdr (minibuf_save_list);
+ Vminibuffer_completing_file_name = Fcar (minibuf_save_list);
+ minibuf_save_list = Fcdr (minibuf_save_list);
/* Erase the minibuffer we were using at this level. */
{
***************
*** 1684,1694 ****
return Fnreverse (allmatches);
}
- Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table;
- Lisp_Object Vminibuffer_completion_predicate,
Qminibuffer_completion_predicate;
- Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm;
- Lisp_Object Vminibuffer_completing_file_name;
-
DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
doc: /* Read a string in the minibuffer, with completion.
PROMPT is a string to prompt with; normally it ends in a colon and a space.
--- 1696,1701 ----