xemacs-beta: src/eval.c comparison

comparison src/eval.c @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1

author	cvs
date	Mon, 13 Aug 2007 11:03:08 +0200
parents	a4f53d9b3154
children	8626e4521993

comparison

equal deleted inserted replaced

-:bd866891f083
+:cc15677e0335
 void.)
 If SYMBOL is buffer-local, its default value is what is set;
 buffer-local values are not affected.
 INITVALUE and DOCSTRING are optional.
 If DOCSTRING starts with *, this variable is identified as a user option.
-This means that M-x set-variable recognizes it.
+This means that M-x set-variable and M-x edit-options recognize it.
 If INITVALUE is missing, SYMBOL's value is not set.
 In lisp-interaction-mode defvar is treated as defconst.
 */
 (args))
 Always sets the value of SYMBOL to the result of evalling INITVALUE.
 If SYMBOL is buffer-local, its default value is what is set;
 buffer-local values are not affected.
 DOCSTRING is optional.
 If DOCSTRING starts with *, this variable is identified as a user option.
-This means that M-x set-variable recognizes it.
+This means that M-x set-variable and M-x edit-options recognize it.
 Note: do not use `defconst' for user options in libraries that are not
 normally loaded, since it is useful for users to be able to specify
 their own values for such variables before loading the library.
 Since `defconst' unconditionally assigns the variable,
 Return result of expanding macros at top level of FORM.
 If FORM is not a macro call, it is returned unchanged.
 Otherwise, the macro is expanded and the expansion is considered
 in place of FORM.  When a non-macro-call results, it is returned.
-The second optional arg ENVIRONMENT specifies an environment of macro
+The second optional arg ENVIRONMENT species an environment of macro
 definitions to shadow the loaded ones for use in file byte-compilation.
 */
-(form, environment))
+(form, env))
 {
 /* This function can GC */
 /* With cleanups from Hallvard Furuseth.  */
 REGISTER Lisp_Object expander, sym, def, tem;
 	 until we get a symbol that is not an alias.  */
 while (SYMBOLP (def))
 	{
 	  QUIT;
 	  sym = def;
-	  tem = Fassq (sym, environment);
+	  tem = Fassq (sym, env);
 	  if (NILP (tem))
 	    {
 	      def = XSYMBOL (sym)->function;
 	      if (!UNBOUNDP (def))
 		continue;
 	    }
 	  break;
 	}
-/* Right now TEM is the result from SYM in ENVIRONMENT,
+/* Right now TEM is the result from SYM in ENV,
 	 and if TEM is nil then DEF is SYM's function definition.  */
 if (NILP (tem))
 	{
-	  /* SYM is not mentioned in ENVIRONMENT.
+	  /* SYM is not mentioned in ENV.
 	     Look at its function definition.  */
 	  if (UNBOUNDP (def)
 	      || !CONSP (def))
 	    /* Not defined or definition not suitable */
 	    break;
 	  function = XCDR (function);
 	  goto retry;
 	}
 if (EQ (funcar, Qautoload))
 	{
-	  struct gcpro gcpro1;
-	  GCPRO1 (function);
 	  do_autoload (function, orig_function);
-	  UNGCPRO;
-	  function = orig_function;
 	  goto retry;
 	}
 if (EQ (funcar, Qlambda))
 	arglist = Fcar (XCDR (function));
 else
 	  function = XCDR (function);
 	  goto retry;
 	}
 if (EQ (funcar, Qautoload))
 	{
-	  struct gcpro gcpro1;
-	  GCPRO1 (function);
 	  do_autoload (function, orig_function);
-	  UNGCPRO;
-	  function = orig_function;
 	  goto retry;
 	}
 if (EQ (funcar, Qlambda))
 	arglist = Fcar (XCDR (function));
 else
 value, that value may be a function or a list of functions to be
 called to run the hook.  If the value is a function, it is called with
 the given arguments and its return value is returned.  If it is a list
 of functions, those functions are called, in order,
 with the given arguments ARGS.
-It is best not to depend on the value returned by `run-hook-with-args',
+It is best not to depend on the value return by `run-hook-with-args',
 as that may change.
 To make a hook variable buffer-local, use `make-local-hook',
 not `make-local-variable'.
 */
 Lisp_Object
 run_hook_with_args_in_buffer (struct buffer *buf, int nargs, Lisp_Object *args,
 			      enum run_hooks_condition cond)
 {
 Lisp_Object sym, val, ret;
+struct gcpro gcpro1, gcpro2;
 if (!initialized || preparing_for_armageddon)
 /* We need to bail out of here pronto. */
 return Qnil;
 args[0] = val;
 return Ffuncall (nargs, args);
 }
 else
 {
-struct gcpro gcpro1, gcpro2, gcpro3;
+GCPRO2 (sym, val);
-Lisp_Object globals = Qnil;
-GCPRO3 (sym, val, globals);
 for (;
 	   CONSP (val) && ((cond == RUN_HOOKS_TO_COMPLETION)
 			   || (cond == RUN_HOOKS_UNTIL_SUCCESS ? NILP (ret)
 			       : !NILP (ret)));
 	{
 	  if (EQ (XCAR (val), Qt))
 	    {
 	      /* t indicates this hook has a local binding;
 		 it means to run the global binding too.  */
-	      globals = Fdefault_value (sym);
+	      Lisp_Object globals = Fdefault_value (sym);
 	      if ((! CONSP (globals) || EQ (XCAR (globals), Qlambda)) &&
 		  ! NILP (globals))
 		{
 		  args[0] = globals;
 if (printing_bindings) write_c_string (")\n", stream);
 }
 DEFUN ("backtrace", Fbacktrace, 0, 2, "", /*
 Print a trace of Lisp function calls currently active.
-Optional arg STREAM specifies the output stream to send the backtrace to,
+Option arg STREAM specifies the output stream to send the backtrace to,
 and defaults to the value of `standard-output'.  Optional second arg
 DETAILED means show places where currently active variable bindings,
 catches, condition-cases, and unwind-protects were made as well as
 function calls.
 */
 for (;;)
 {
 if (!NILP (detailed) && catches && catches->backlist == backlist)
 	{
 int catchpdl = catches->pdlcount;
-if (speccount > catchpdl
+if (specpdl[catchpdl].func == condition_case_unwind
-	      && specpdl[catchpdl].func == condition_case_unwind)
+&& speccount > catchpdl)
 /* This is a condition-case catchpoint */
 catchpdl = catchpdl + 1;
 backtrace_specials (speccount, catchpdl, stream);
 specpdl_size = 50;
 specpdl_depth_counter = 0;
 specpdl = xnew_array (struct specbinding, specpdl_size);
 /* XEmacs change: increase these values. */
 max_specpdl_size = 3000;
-max_lisp_eval_depth = 1000;
+max_lisp_eval_depth = 500;
 throw_level = 0;
 reinit_eval ();
 }

Mercurial > hg > xemacs-beta

comparison src/eval.c @ 371:cc15677e0335 r21-2b1