[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/minibuf.c,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/minibuf.c,v |
Date: |
Tue, 30 Jan 2007 23:49:33 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 07/01/30 23:49:33
Index: minibuf.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/minibuf.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -b -r1.321 -r1.322
--- minibuf.c 28 Jan 2007 07:16:39 -0000 1.321
+++ minibuf.c 30 Jan 2007 23:49:33 -0000 1.322
@@ -135,6 +135,11 @@
/* 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,7 +576,9 @@
specpdl slots. */
minibuf_save_list
= Fcons (Voverriding_local_map,
- Fcons (minibuf_window, minibuf_save_list));
+ Fcons (minibuf_window,
+ Fcons (Vminibuffer_completing_file_name,
+ minibuf_save_list)));
minibuf_save_list
= Fcons (minibuf_prompt,
Fcons (make_number (minibuf_prompt_width),
@@ -597,6 +604,9 @@
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,6 +928,8 @@
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,11 +1696,6 @@
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.
- [Emacs-diffs] Changes to emacs/src/minibuf.c,v, Richard M. Stallman, 2007/01/02
- [Emacs-diffs] Changes to emacs/src/minibuf.c,v, Glenn Morris, 2007/01/20
- [Emacs-diffs] Changes to emacs/src/minibuf.c,v, Eli Zaretskii, 2007/01/27
- [Emacs-diffs] Changes to emacs/src/minibuf.c,v, Richard M. Stallman, 2007/01/28
- [Emacs-diffs] Changes to emacs/src/minibuf.c,v,
Richard M. Stallman <=