emacs: src/minibuf.c comparison

comparison src/minibuf.c @ 83556:07774e5c3ff5

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-619 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-620 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-621 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-622 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-623 Remove RCS keywords * emacs@sv.gnu.org/emacs--devo--0--patch-624 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-625 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-626 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-627 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-628 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-629 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-630 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-631 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-632 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-633 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-634 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-635 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-636 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-637 Remove RCS keywords * emacs@sv.gnu.org/emacs--devo--0--patch-638 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-639 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-640 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-641 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-642 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-643 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-644 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-645 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-646 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-647 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-648 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-649 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-197 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-198 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-199 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-200 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-201 Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. * emacs@sv.gnu.org/gnus--rel--5.10--patch-202 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-596

author	Karoly Lorentey <karoly@lorentey.hu>
date	Sat, 24 Feb 2007 19:26:54 +0000
parents	b8d9a391daf3 c76aa2fa987a
children	738ce3540ffb

comparison

equal deleted inserted replaced

-:053bf1a38bfa
+:07774e5c3ff5
 static Lisp_Object last_exact_completion;
 /* 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;
 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;
 #ifdef HAVE_X_WINDOWS
 if (display_hourglass_p)
 cancel_hourglass ();
 #endif
 /* Arrange to restore a number of minibuffer-related variables.
 We could bind each variable separately, but that would use lots of
 specpdl slots.  */
 minibuf_save_list
 = Fcons (Voverriding_local_map,
-	     Fcons (minibuf_window, minibuf_save_list));
+	     Fcons (minibuf_window,
+		    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, that doesn't mean
+recursive ones are.  But we cannot set it to nil, because
+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.  */
 }
 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.
 COLLECTION can be a list of strings, an alist, an obarray or a hash table.
 COLLECTION can also be a function to do the completion itself.
 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));
 }
 /* Like assoc but assumes KEY is a string, and ignores case if appropriate.  */
 DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0,
-doc: /* Like `assoc' but specifically for strings.
+doc: /* Like `assoc' but specifically for strings (and symbols).
-Unibyte strings are converted to multibyte for comparison.
+Symbols are converted to strings, and unibyte strings are converted to
-And case is ignored if CASE-FOLD is non-nil.
+multibyte for comparison.
+Case is ignored if optional arg CASE-FOLD is non-nil.
 As opposed to `assoc', it will also match an entry consisting of a single
 string rather than a cons cell whose car is a string.  */)
 (key, list, case_fold)
 register Lisp_Object key;
 Lisp_Object list, case_fold;
 {
 register Lisp_Object tail;
+if (SYMBOLP (key))
+key = Fsymbol_name (key);
 for (tail = list; !NILP (tail); tail = Fcdr (tail))
 {
 register Lisp_Object elt, tem, thiscar;
 elt = Fcar (tail);
 thiscar = CONSP (elt) ? XCAR (elt) : elt;
-if (!STRINGP (thiscar))
+if (SYMBOLP (thiscar))
+	thiscar = Fsymbol_name (thiscar);
+else if (!STRINGP (thiscar))
 	continue;
 tem = Fcompare_strings (thiscar, make_number (0), Qnil,
 			      key, make_number (0), Qnil,
 			      case_fold);
 if (EQ (tem, Qt))
 	       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 @ 83556:07774e5c3ff5