emacs: src/minibuf.c comparison

comparison src/minibuf.c @ 9120:ed766dfb4efe

(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion, Ftry_completion, Fall_completions, Fcompleting_read, do_completion, assoc_for_completion, Fminibuffer_complete_word, Fdisplay_completion_list, Fself_insert_and_exit): Use type test macros.

author	Karl Heuer <kwzh@gnu.org>
date	Tue, 27 Sep 1994 02:12:02 +0000
parents	522a9e03ca05
children	f49aca34b7ae

comparison

equal deleted inserted replaced

-:0c3c25c2456e
+:ed766dfb4efe
 {
 register Lisp_Object val;
 int count = specpdl_ptr - specpdl;
 Lisp_Object mini_frame;
-if (XTYPE (prompt) != Lisp_String)
+if (!STRINGP (prompt))
 prompt = build_string ("");
 /* Emacs in -batch mode calls minibuffer: print the prompt.  */
-if (noninteractive && XTYPE (prompt) == Lisp_String)
+if (noninteractive && STRINGP (prompt))
 printf ("%s", XSTRING (prompt)->data);
 if (!enable_recursive_minibuffers
 && minibuf_level > 0
 && (EQ (selected_window, minibuf_window)))
 the current_buffer, so reset_buffer leaves buf's default
 directory unchanged.  This is a bummer when you've just started
 up Emacs and buf's default directory is Qnil.  Here's a hack; can
 you think of something better to do?  Find another buffer with a
 better directory, and use that one instead.  */
-if (XTYPE (val) == Lisp_String)
+if (STRINGP (val))
 current_buffer->directory = val;
 else
 {
 Lisp_Object buf_list;
 	   buf_list = XCONS (buf_list)->cdr)
 	{
 	  Lisp_Object other_buf;
 	  other_buf = XCONS (XCONS (buf_list)->car)->cdr;
-	  if (XTYPE (XBUFFER (other_buf)->directory) == Lisp_String)
+	  if (STRINGP (XBUFFER (other_buf)->directory))
 	    {
 	      current_buffer->directory = XBUFFER (other_buf)->directory;
 	      break;
 	    }
 	}
 minibuf_level++;
 if (!NILP (initial))
 {
 Finsert (1, &initial);
-if (!NILP (backup_n) && XTYPE (backup_n) == Lisp_Int)
+if (!NILP (backup_n) && INTEGERP (backup_n))
 	Fforward_char (backup_n);
 }
 minibuf_prompt = Fcopy_sequence (prompt);
 echo_area_glyphs = 0;
 /* VAL is the string of minibuffer text.  */
 last_minibuf_string = val;
 /* Add the value to the appropriate history list unless it is empty.  */
 if (XSTRING (val)->size != 0
-&& XTYPE (Vminibuffer_history_variable) == Lisp_Symbol
+&& SYMBOLP (Vminibuffer_history_variable)
 && ! EQ (XSYMBOL (Vminibuffer_history_variable)->value, Qunbound))
 {
 /* If the caller wanted to save the value read on a history list,
 	 then do so if the value is not already the front of the list.  */
 Lisp_Object histval;
 position = Qnil;
 CHECK_STRING (prompt, 0);
 if (!NILP (initial_contents))
 {
-if (XTYPE (initial_contents) == Lisp_Cons)
+if (CONSP (initial_contents))
 	{
 	  position = Fcdr (initial_contents);
 	  initial_contents = Fcar (initial_contents);
 	}
 CHECK_STRING (initial_contents, 1);
 if (NILP (keymap))
 keymap = Vminibuffer_local_map;
 else
 keymap = get_keymap (keymap,2);
-if (XTYPE (hist) == Lisp_Symbol)
+if (SYMBOLP (hist))
 {
 histvar = hist;
 histpos = Qnil;
 }
 else
 {
 Lisp_Object tem;
 Lisp_Object args[3];
 struct gcpro gcpro1;
-if (XTYPE (def) == Lisp_Buffer)
+if (BUFFERP (def))
 def = XBUFFER (def)->name;
 if (!NILP (def))
 {
 args[0] = build_string ("%s(default %s) ");
 args[1] = prompt;
 int matchcount = 0;
 Lisp_Object bucket, zero, end, tem;
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 CHECK_STRING (string, 0);
-if (!list && XTYPE (alist) != Lisp_Vector)
+if (!list && !VECTORP (alist))
 return call3 (alist, string, pred, Qnil);
 bestmatch = Qnil;
 /* If ALIST is not a list, set TAIL just for gc pro.  */
 	    }
 	}
 /* Is this element a possible completion? */
-if (XTYPE (eltstring) == Lisp_String
+if (STRINGP (eltstring)
 	  && XSTRING (string)->size <= XSTRING (eltstring)->size
 	  && 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data,
 		       XSTRING (string)->size))
 	{
 	  /* Yes. */
 int index, obsize;
 Lisp_Object bucket, tem;
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 CHECK_STRING (string, 0);
-if (!list && XTYPE (alist) != Lisp_Vector)
+if (!list && !VECTORP (alist))
 {
 return call3 (alist, string, pred, Qt);
 }
 allmatches = Qnil;
 	    }
 	}
 /* Is this element a possible completion? */
-if (XTYPE (eltstring) == Lisp_String
+if (STRINGP (eltstring)
 	  && XSTRING (string)->size <= XSTRING (eltstring)->size
 	  /* Reject alternatives that start with space
 	     unless the input starts with space.  */
 	  && ((XSTRING (string)->size > 0 && XSTRING (string)->data[0] == ' ')
 	      || XSTRING (eltstring)->data[0] != ' ')
 last_exact_completion = Qnil;
 position = Qnil;
 if (!NILP (init))
 {
-if (XTYPE (init) == Lisp_Cons)
+if (CONSP (init))
 	{
 	  position = Fcdr (init);
 	  init = Fcar (init);
 	}
 CHECK_STRING (init, 0);
 	  /* Convert to distance from end of input.  */
 	  pos = XINT (position) - XSTRING (init)->size;
 	}
 }
-if (XTYPE (hist) == Lisp_Symbol)
+if (SYMBOLP (hist))
 {
 histvar = hist;
 histpos = Qnil;
 }
 else
 /* It did find a match.  Do we match some possibility exactly now? */
 if (CONSP (Vminibuffer_completion_table)
 || NILP (Vminibuffer_completion_table))
 tem = assoc_for_completion (Fbuffer_string (),
 				Vminibuffer_completion_table);
-else if (XTYPE (Vminibuffer_completion_table) == Lisp_Vector)
+else if (VECTORP (Vminibuffer_completion_table))
 {
 /* the primitive used by Fintern_soft */
 extern Lisp_Object oblookup ();
 tem = Fbuffer_string ();
 /* Bypass intern-soft as that loses for nil */
 tem = oblookup (Vminibuffer_completion_table,
 		      XSTRING (tem)->data, XSTRING (tem)->size);
-if (XTYPE (tem) != Lisp_Symbol)
+if (!SYMBOLP (tem))
 	tem = Qnil;
 else if (!NILP (Vminibuffer_completion_predicate))
 	tem = call1 (Vminibuffer_completion_predicate, tem);
 else
 	tem = Qt;
 {
 register Lisp_Object elt, tem, thiscar;
 elt = Fcar (tail);
 if (!CONSP (elt)) continue;
 thiscar = Fcar (elt);
-if (XTYPE (thiscar) != Lisp_String)
+if (!STRINGP (thiscar))
 	continue;
 if (completion_ignore_case)
 	thiscar = Fupcase (thiscar);
 tem = Fequal (thiscar, key);
 if (!NILP (tem)) return elt;
 tem = Ftry_completion (concat2 (Fbuffer_string (), build_string (" ")),
 			     Vminibuffer_completion_table,
 			     Vminibuffer_completion_predicate);
 UNGCPRO;
-if (XTYPE (tem) == Lisp_String)
+if (STRINGP (tem))
 	completion = tem;
 else
 	{
 	  GCPRO1 (completion);
 	  tem =
 	    Ftry_completion (concat2 (Fbuffer_string (), build_string ("-")),
 			     Vminibuffer_completion_table,
 			     Vminibuffer_completion_predicate);
 	  UNGCPRO;
-	  if (XTYPE (tem) == Lisp_String)
+	  if (STRINGP (tem))
 	    completion = tem;
 	}
 }
 /* Now find first word-break in the stuff found by completion.
 /* Note that (when it matters) every variable
 points to a non-string that is pointed to by COMPLETIONS.  */
 GCPRO1 (completions);
-if (XTYPE (Vstandard_output) == Lisp_Buffer)
+if (BUFFERP (Vstandard_output))
 set_buffer_internal (XBUFFER (Vstandard_output));
 if (NILP (completions))
 write_string ("There are no possible completions of what you have typed.",
 		  -1);
 	     and/or narrow windows */
 	  /* Sadly, the window it will appear in is not known
 	     until after the text has been made. */
 	  if (i & 1)
 	    {
-	      if (XTYPE (Vstandard_output) == Lisp_Buffer)
+	      if (BUFFERP (Vstandard_output))
 		Findent_to (make_number (35), make_number (2));
 	      else
 		{
 		  do
 		    {
 	      column = 0;
 	    }
 	  elt = Fcar (tail);
 	  if (CONSP (elt))
 	    {
-	      if (XTYPE (Vstandard_output) != Lisp_Buffer)
+	      if (!BUFFERP (Vstandard_output))
 		{
 		  Lisp_Object tem;
 		  tem = Flength (Fcar (elt));
 		  column += XINT (tem);
 		  tem = Flength (Fcar (Fcdr (elt)));
 	      Fprinc (Fcar (elt), Qnil);
 	      Fprinc (Fcar (Fcdr (elt)), Qnil);
 	    }
 	  else
 	    {
-	      if (XTYPE (Vstandard_output) != Lisp_Buffer)
+	      if (!BUFFERP (Vstandard_output))
 		{
 		  Lisp_Object tem;
 		  tem = Flength (elt);
 		  column += XINT (tem);
 		}
 	}
 }
 UNGCPRO;
-if (XTYPE (Vstandard_output) == Lisp_Buffer)
+if (BUFFERP (Vstandard_output))
 set_buffer_internal (old);
 if (!NILP (Vrun_hooks))
 call1 (Vrun_hooks, intern ("completion-setup-hook"));
 DEFUN ("self-insert-and-exit", Fself_insert_and_exit, Sself_insert_and_exit, 0, 0, "",
 "Terminate minibuffer input.")
 ()
 {
-if (XTYPE (last_command_char) == Lisp_Int)
+if (INTEGERP (last_command_char))
 internal_self_insert (last_command_char, 0);
 else
 bitch_at_user ();
 Fthrow (Qexit, Qnil);

Mercurial > emacs

comparison src/minibuf.c @ 9120:ed766dfb4efe