xemacs-beta: src/callint.c comparison

comparison src/callint.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19

author	cvs
date	Mon, 13 Aug 2007 09:55:28 +0200
parents	9ad43877534d
children	2c611d1463a6

comparison

equal deleted inserted replaced

-:bcd2674570bf
+:3d6bfa290dbd
 /* ARGSUSED */
 DEFUN ("interactive", Finteractive, 0, UNEVALLED, 0, /*
 Specify a way of parsing arguments for interactive use of a function.
 For example, write
-(defun foo (arg) \"Doc string\" (interactive \"p\") ...use arg...)
+(defun foo (arg) "Doc string" (interactive "p") ...use arg...)
 to make ARG be the prefix argument when `foo' is called as a command.
-The \"call\" to `interactive' is actually a declaration rather than a function;
+The "call" to `interactive' is actually a declaration rather than a function;
 it tells `call-interactively' how to read arguments
 to pass to the function.
 When actually called, `interactive' just returns nil.
 The argument of `interactive' is usually a string containing a code letter
 {
 Lisp_Object s = make_string (prompt_start, prompt_length);
 struct gcpro gcpro1;
 /* Fformat no longer smashes its arg vector, so no need to copy it. */
 if (!strchr ((char *) XSTRING_DATA (s), '%'))
 return s;
 GCPRO1 (s);
 RETURN_UNGCPRO (emacs_doprnt_string_lisp (0, s, 0, nargs, args));
 }
 		      Lisp_Object elt;
 		      elt = Fcar (intail);
 		      if (CONSP (elt))
 			{
 			  Lisp_Object eltcar = Fcar (elt);
-			  if (EQ (eltcar, Qpoint)
+			  if (EQ (eltcar, Qpoint) ||
-			      || EQ (eltcar, Qmark)
+			      EQ (eltcar, Qmark)  ||
-			      || EQ (eltcar, Qregion_beginning)
+			      EQ (eltcar, Qregion_beginning) ||
-			      || EQ (eltcar, Qregion_end))
+			      EQ (eltcar, Qregion_end))
 			    Fsetcar (valtail, Fcar (intail));
 			}
 		    }
 		}
 	    }
 for (;;)
 {
 	if (STRINGP (specs))
 	  prompt_data = (CONST char *) XSTRING_DATA (specs);
 	if (prompt_data[prompt_index] == '+')
 	  error ("`+' is not used in `interactive' for ordinary commands");
 	else if (prompt_data[prompt_index] == '*')
 	  {
 	    prompt_index++;
 	      event = extract_this_command_keys_nth_mouse_event (0);
 #else
 	      /* Doesn't work; see below */
 	      event = Vcurrent_mouse_event;
 #endif
 	    if (! NILP (event))
 	      {
 		Lisp_Object window = Fevent_window (event);
 		if (!NILP (window))
 		  {
 		    if (MINI_WINDOW_P (XWINDOW (window))
 int alloca_size = (1	/* function to call */
 + argcount /* actual arguments */
 + argcount /* visargs */
 + argcount /* varies */
 );
-Lisp_Object *args
+Lisp_Object *args = alloca_array (Lisp_Object, alloca_size) + 1;
-= (((Lisp_Object *) alloca (sizeof (Lisp_Object) * alloca_size))
-+ 1);
 /* visargs is an array of either Qnil or user-friendlier versions (often
-*  strings) of previous arguments, to use in prompts for succesive
+*  strings) of previous arguments, to use in prompts for successive
 *  arguments.  ("Often strings" because emacs didn't used to have
 *  format %S and prin1-to-string.) */
 Lisp_Object *visargs = args + argcount;
 /* If varies[i] is non-null, the i'th argument shouldn't just have
 its value in this call quoted in the command history.  It should be
 for (argnum = 0; ; argnum++)
 {
 	CONST char *prompt_start = prompt_data + prompt_index + 1;
 	CONST char *prompt_limit = (CONST char *) strchr (prompt_start, '\n');
 	int prompt_length;
 	prompt_length = ((prompt_limit)
 			 ? (prompt_limit - prompt_start)
 			 : strlen (prompt_start));
 	if (prompt_limit && prompt_limit[1] == 0)
 	  {
 	    prompt_limit = 0;	/* "sfoo:\n" -- strip tailing return */
 		   */
 		  tem = Fintern (tem, Qnil);
 		  args[argnum] = tem;
 		  if (string_length (XSYMBOL (tem)->name) > 0)
 		    /* Don't accept the empty-named symbol.  If the loser
 		       really wants this s/he can call completing-read
 directly */
 		    break;
 		}
 #endif /* 1 */
 	      arg_from_tty = 1;
 #ifdef MULE
 	      if (NILP (prefix))
 		{
 		  args[argnum] = Qnil;
 		}
 	      else
 		{
 		  args[argnum] =
 		    call1 (Qread_non_nil_coding_system, PROMPT ());
 		  arg_from_tty = 1;
 		}
 if (EQ (record_flag, Qlambda))
 {
 	RETURN_UNGCPRO (Flist (argcount, args));
 }
 if (arg_from_tty || !NILP (record_flag))
 {
 /* Reuse visargs as a temporary for constructing the command history */
 	for (argnum = 0; argnum < argcount; argnum++)
 	  {
 }
 }
 DEFUN ("prefix-numeric-value", Fprefix_numeric_value, 1, 1, 0, /*
 Return numeric meaning of raw prefix argument ARG.
-A raw prefix argument is what you get from `(interactive \"P\")'.
+A raw prefix argument is what you get from `(interactive "P")'.
-Its numeric meaning is what you would get from `(interactive \"p\")'.
+Its numeric meaning is what you would get from `(interactive "p")'.
 */
 (raw))
 {
-int val;
 if (NILP (raw))
-val = 1;
+return make_int (1);
-else if (EQ (raw, Qminus))
+if (EQ (raw, Qminus))
-val = -1;
+return make_int (-1);
-else if (INTP (raw))
+if (INTP (raw))
-val = XINT (raw);
+return raw;
-else if (CONSP (raw) && INTP (XCAR (raw)))
+if (CONSP (raw) && INTP (XCAR (raw)))
-val = XINT (XCAR (raw));
+return XCAR (raw);
-else
-val = 1;
+return make_int (1);
-return make_int (val);
 }
 void
 syms_of_callint (void)
 {
 DEFVAR_LISP ("current-prefix-arg", &Vcurrent_prefix_arg /*
 The value of the prefix argument for this editing command.
 It may be a number, or the symbol `-' for just a minus sign as arg,
 or a list whose car is a number for just one or more C-U's
 or nil if no argument has been specified.
-This is what `(interactive \"P\")' returns.
+This is what `(interactive "P")' returns.
 */ );
 Vcurrent_prefix_arg = Qnil;
 DEFVAR_LISP ("command-history", &Vcommand_history /*
 List of recent commands that read arguments from terminal.
 may be set by the debugger as a reminder for itself.
 */ );
 Vcommand_debug_status = Qnil;
 #if 0 /* FSFmacs */
 xxDEFVAR_LISP ("mark-even-if-inactive", &Vmark_even_if_inactive /*
 *Non-nil means you can use the mark even when inactive.
 This option makes a difference in Transient Mark mode.
 When the option is non-nil, deactivation of the mark
 turns off region highlighting, but commands that use the mark
 behave as if the mark were still active.

Mercurial > hg > xemacs-beta

comparison src/callint.c @ 185:3d6bfa290dbd r20-3b19