emacs: src/minibuf.c comparison

comparison src/minibuf.c @ 75720:d93f8cf55f80

(read_minibuf): Fix 2007-01-30 change. Use Qlambda as interrim value of Vminibuffer_completing_file_name. (Fcompleting_read, do_completion, Fminibuffer_complete_word): If Vminibuffer_completing_file_name equals Qlambda, treat it as Qnil. (syms_of_minibuf) <minibuffer-completing-file-name>: Document lambda.

author	Kim F. Storm <storm@cua.dk>
date	Thu, 08 Feb 2007 00:06:43 +0000
parents	f7b5b15084ef
children	55bd832be66b

comparison

equal deleted inserted replaced

-:a8fd93a515a2
+:d93f8cf55f80
 int count = SPECPDL_INDEX ();
 Lisp_Object mini_frame, ambient_dir, minibuffer, input_method;
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
 Lisp_Object enable_multibyte;
 int pos = INTEGERP (backup_n) ? XINT (backup_n) : 0;
 /* String to add to the history.  */
 Lisp_Object histstring;
 Lisp_Object empty_minibuf;
 Lisp_Object dummy, frame;
 extern Lisp_Object Qfront_sticky;
 extern Lisp_Object Qrear_nonsticky;
 specbind (Qminibuffer_default, defalt);
+/* If Vminibuffer_completing_file_name is `lambda' on entry, it was t
+in previous recursive minibuffer, but was not set explicitly
+to t for this invocation, so set it to nil in this minibuffer.
+Save the old value now, before we change it.  */
+specbind (intern ("minibuffer-completing-file-name"), Vminibuffer_completing_file_name);
+if (EQ (Vminibuffer_completing_file_name, Qlambda))
+Vminibuffer_completing_file_name = Qnil;
 single_kboard_state ();
 #ifdef HAVE_X_WINDOWS
 if (display_hourglass_p)
 cancel_hourglass ();
 We could bind each variable separately, but that would use lots of
 specpdl slots.  */
 minibuf_save_list
 = Fcons (Voverriding_local_map,
 	     Fcons (minibuf_window,
-		    Fcons (Vminibuffer_completing_file_name,
+		    minibuf_save_list));
-			   minibuf_save_list)));
 minibuf_save_list
 = Fcons (minibuf_prompt,
 	     Fcons (make_number (minibuf_prompt_width),
 		    Fcons (Vhelp_form,
 			   Fcons (Vcurrent_prefix_arg,
 minibuf_prompt_width = 0;
 minibuf_prompt = Fcopy_sequence (prompt);
 Vminibuffer_history_position = histpos;
 Vminibuffer_history_variable = histvar;
 Vhelp_form = Vminibuffer_help_form;
-/* If this minibuffer is reading a file name,
+/* If this minibuffer is reading a file name, that doesn't mean
-that doesn't mean recursive ones are.  */
+recursive ones are.  But we cannot set it to nil, because
-Vminibuffer_completing_file_name = Qnil;
+completion code still need to know the minibuffer is completing a
+file name.  So use `lambda' as intermediate value meaning
+"t" in this minibuffer, but "nil" in next minibuffer.  */
+if (!NILP (Vminibuffer_completing_file_name))
+Vminibuffer_completing_file_name = Qlambda;
 if (inherit_input_method)
 {
 /* `current-input-method' is buffer local.  So, remember it in
 	 INPUT_METHOD before changing the current buffer.  */
 #if 0
 temp = Fcar (minibuf_save_list);
 if (FRAME_LIVE_P (XFRAME (WINDOW_FRAME (XWINDOW (temp)))))
 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.  */
 {
 int count = SPECPDL_INDEX ();
 if (NILP (histpos))
 XSETFASTINT (histpos, 0);
 val = read_minibuf (NILP (require_match)
 		      ? (NILP (Vminibuffer_completing_file_name)
+			 || EQ (Vminibuffer_completing_file_name, Qlambda)
 			 ? Vminibuffer_local_completion_map
 			 : Vminibuffer_local_filename_completion_map)
 		      : (NILP (Vminibuffer_completing_file_name)
+			 || EQ (Vminibuffer_completing_file_name, Qlambda)
 			 ? Vminibuffer_local_must_match_map
 			 : Vminibuffer_local_must_match_filename_map),
 		      init, prompt, make_number (pos), 0,
 		      histvar, histpos, def, 0,
 		      !NILP (inherit_input_method));
 {
 int prompt_end = XINT (Fminibuffer_prompt_end ());
 /* Some completion happened */
 if (! NILP (Vminibuffer_completing_file_name)
+	  && ! EQ (Vminibuffer_completing_file_name, Qlambda)
 	  && SREF (completion, SBYTES (completion) - 1) == '/'
 	  && PT < ZV
 	  && FETCH_CHAR (PT_BYTE) == '/')
 	{
 	  del_range (prompt_end, PT + 1);
 CHECK_STRING (completion);
 tem = Fminibuffer_completion_contents ();
 GCPRO2 (completion, tem);
 /* If reading a file name,
 expand any $ENVVAR refs in the buffer and in TEM.  */
-if (! NILP (Vminibuffer_completing_file_name))
+if (! NILP (Vminibuffer_completing_file_name)
+	&& ! EQ (Vminibuffer_completing_file_name, Qlambda))
 {
 	Lisp_Object substituted;
 	substituted = Fsubstitute_in_file_name (tem);
 	if (! EQ (substituted, tem))
 	  {
 }
 /* Otherwise insert in minibuffer the chars we got */
 if (! NILP (Vminibuffer_completing_file_name)
+&& ! EQ (Vminibuffer_completing_file_name, Qlambda)
 && SREF (completion, SBYTES (completion) - 1) == '/'
 && PT < ZV
 && FETCH_CHAR (PT_BYTE) == '/')
 {
 del_range (prompt_end_charpos, PT + 1);
 	       doc: /* Non-nil means to demand confirmation of completion before exiting minibuffer.  */);
 Vminibuffer_completion_confirm = Qnil;
 DEFVAR_LISP ("minibuffer-completing-file-name",
 	       &Vminibuffer_completing_file_name,
-	       doc: /* Non-nil means completing file names.  */);
+	       doc: /* Non-nil and non-`lambda' means completing file names.  */);
 Vminibuffer_completing_file_name = Qnil;
 DEFVAR_LISP ("minibuffer-help-form", &Vminibuffer_help_form,
 	       doc: /* Value that `help-form' takes on inside the minibuffer.  */);
 Vminibuffer_help_form = Qnil;

Mercurial > emacs

comparison src/minibuf.c @ 75720:d93f8cf55f80