aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2010-07-11 10:44:34 +0200
committerAndreas Schwab2010-07-11 10:44:34 +0200
commitbb8e180f2ce13346ee082b35d557d244e73f281c (patch)
treef6c8f59152dd646107bc1d926f7f082ff9b4c0fd
parent83380e65cd442753510a604b3ab72c897e127a4f (diff)
downloademacs-bb8e180f2ce13346ee082b35d557d244e73f281c.tar.gz
emacs-bb8e180f2ce13346ee082b35d557d244e73f281c.zip
Fix indentation problem
-rw-r--r--src/ChangeLog2
-rw-r--r--src/eval.c71
2 files changed, 37 insertions, 36 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 415ef5ea5ed..8ad8075fb83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-07-11 Andreas Schwab <schwab@linux-m68k.org> 12010-07-11 Andreas Schwab <schwab@linux-m68k.org>
2 2
3 * eval.c: Fix indentation problem.
4
3 * keyboard.c: Include "process.h" 5 * keyboard.c: Include "process.h"
4 6
5 * eval.c: Remove obsolete noinline declaration. 7 * eval.c: Remove obsolete noinline declaration.
diff --git a/src/eval.c b/src/eval.c
index 7f686c045fb..e90c7f2211b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,7 +1,7 @@
1/* Evaluator for GNU Emacs Lisp interpreter. 1/* Evaluator for GNU Emacs Lisp interpreter.
2 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001, 2 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
4 Free Software Foundation, Inc. 4 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
@@ -427,7 +427,7 @@ usage: (prog1 FIRST BODY...) */)
427 do 427 do
428 { 428 {
429 if (!(argnum++)) 429 if (!(argnum++))
430 val = Feval (Fcar (args_left)); 430 val = Feval (Fcar (args_left));
431 else 431 else
432 Feval (Fcar (args_left)); 432 Feval (Fcar (args_left));
433 args_left = Fcdr (args_left); 433 args_left = Fcdr (args_left);
@@ -462,7 +462,7 @@ usage: (prog2 FORM1 FORM2 BODY...) */)
462 do 462 do
463 { 463 {
464 if (!(argnum++)) 464 if (!(argnum++))
465 val = Feval (Fcar (args_left)); 465 val = Feval (Fcar (args_left));
466 else 466 else
467 Feval (Fcar (args_left)); 467 Feval (Fcar (args_left));
468 args_left = Fcdr (args_left); 468 args_left = Fcdr (args_left);
@@ -936,30 +936,30 @@ chain of symbols. */)
936 /* If indirect and there's an alias loop, don't check anything else. */ 936 /* If indirect and there's an alias loop, don't check anything else. */
937 if (XSYMBOL (variable)->redirect == SYMBOL_VARALIAS 937 if (XSYMBOL (variable)->redirect == SYMBOL_VARALIAS
938 && NILP (internal_condition_case_1 (lisp_indirect_variable, variable, 938 && NILP (internal_condition_case_1 (lisp_indirect_variable, variable,
939 Qt, user_variable_p_eh))) 939 Qt, user_variable_p_eh)))
940 return Qnil; 940 return Qnil;
941 941
942 while (1) 942 while (1)
943 { 943 {
944 documentation = Fget (variable, Qvariable_documentation); 944 documentation = Fget (variable, Qvariable_documentation);
945 if (INTEGERP (documentation) && XINT (documentation) < 0) 945 if (INTEGERP (documentation) && XINT (documentation) < 0)
946 return Qt; 946 return Qt;
947 if (STRINGP (documentation) 947 if (STRINGP (documentation)
948 && ((unsigned char) SREF (documentation, 0) == '*')) 948 && ((unsigned char) SREF (documentation, 0) == '*'))
949 return Qt; 949 return Qt;
950 /* If it is (STRING . INTEGER), a negative integer means a user variable. */ 950 /* If it is (STRING . INTEGER), a negative integer means a user variable. */
951 if (CONSP (documentation) 951 if (CONSP (documentation)
952 && STRINGP (XCAR (documentation)) 952 && STRINGP (XCAR (documentation))
953 && INTEGERP (XCDR (documentation)) 953 && INTEGERP (XCDR (documentation))
954 && XINT (XCDR (documentation)) < 0) 954 && XINT (XCDR (documentation)) < 0)
955 return Qt; 955 return Qt;
956 /* Customizable? See `custom-variable-p'. */ 956 /* Customizable? See `custom-variable-p'. */
957 if ((!NILP (Fget (variable, intern ("standard-value")))) 957 if ((!NILP (Fget (variable, intern ("standard-value"))))
958 || (!NILP (Fget (variable, intern ("custom-autoload"))))) 958 || (!NILP (Fget (variable, intern ("custom-autoload")))))
959 return Qt; 959 return Qt;
960 960
961 if (!(XSYMBOL (variable)->redirect == SYMBOL_VARALIAS)) 961 if (!(XSYMBOL (variable)->redirect == SYMBOL_VARALIAS))
962 return Qnil; 962 return Qnil;
963 963
964 /* An indirect variable? Let's follow the chain. */ 964 /* An indirect variable? Let's follow the chain. */
965 XSETSYMBOL (variable, SYMBOL_ALIAS (XSYMBOL (variable))); 965 XSETSYMBOL (variable, SYMBOL_ALIAS (XSYMBOL (variable)));
@@ -1246,7 +1246,7 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value)
1246 last_time = catchlist == catch; 1246 last_time = catchlist == catch;
1247 1247
1248 /* Unwind the specpdl stack, and then restore the proper set of 1248 /* Unwind the specpdl stack, and then restore the proper set of
1249 handlers. */ 1249 handlers. */
1250 unbind_to (catchlist->pdlcount, Qnil); 1250 unbind_to (catchlist->pdlcount, Qnil);
1251 handlerlist = catchlist->handlerlist; 1251 handlerlist = catchlist->handlerlist;
1252 catchlist = catchlist->next; 1252 catchlist = catchlist->next;
@@ -1257,8 +1257,8 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value)
1257 /* If x_catch_errors was done, turn it off now. 1257 /* If x_catch_errors was done, turn it off now.
1258 (First we give unbind_to a chance to do that.) */ 1258 (First we give unbind_to a chance to do that.) */
1259#if 0 /* This would disable x_catch_errors after x_connection_closed. 1259#if 0 /* This would disable x_catch_errors after x_connection_closed.
1260 * The catch must remain in effect during that delicate 1260 The catch must remain in effect during that delicate
1261 * state. --lorentey */ 1261 state. --lorentey */
1262 x_fully_uncatch_errors (); 1262 x_fully_uncatch_errors ();
1263#endif 1263#endif
1264#endif 1264#endif
@@ -1334,13 +1334,13 @@ instead of a single condition name. Then it handles all of them.
1334When a handler handles an error, control returns to the `condition-case' 1334When a handler handles an error, control returns to the `condition-case'
1335and it executes the handler's BODY... 1335and it executes the handler's BODY...
1336with VAR bound to (ERROR-SYMBOL . SIGNAL-DATA) from the error. 1336with VAR bound to (ERROR-SYMBOL . SIGNAL-DATA) from the error.
1337(If VAR is nil, the handler can't access that information.) 1337\(If VAR is nil, the handler can't access that information.)
1338Then the value of the last BODY form is returned from the `condition-case' 1338Then the value of the last BODY form is returned from the `condition-case'
1339expression. 1339expression.
1340 1340
1341See also the function `signal' for more info. 1341See also the function `signal' for more info.
1342usage: (condition-case VAR BODYFORM &rest HANDLERS) */) 1342usage: (condition-case VAR BODYFORM &rest HANDLERS) */)
1343(Lisp_Object args) 1343 (Lisp_Object args)
1344{ 1344{
1345 register Lisp_Object bodyform, handlers; 1345 register Lisp_Object bodyform, handlers;
1346 volatile Lisp_Object var; 1346 volatile Lisp_Object var;
@@ -1389,7 +1389,7 @@ internal_lisp_condition_case (volatile Lisp_Object var, Lisp_Object bodyform,
1389 if (_setjmp (c.jmp)) 1389 if (_setjmp (c.jmp))
1390 { 1390 {
1391 if (!NILP (h.var)) 1391 if (!NILP (h.var))
1392 specbind (h.var, c.val); 1392 specbind (h.var, c.val);
1393 val = Fprogn (Fcdr (h.chosen_clause)); 1393 val = Fprogn (Fcdr (h.chosen_clause));
1394 1394
1395 /* Note that this just undoes the binding of h.var; whoever 1395 /* Note that this just undoes the binding of h.var; whoever
@@ -1611,7 +1611,7 @@ internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*),
1611 1611
1612 1612
1613static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object, 1613static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object,
1614 Lisp_Object, Lisp_Object); 1614 Lisp_Object, Lisp_Object);
1615 1615
1616DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, 1616DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0,
1617 doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. 1617 doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA.
@@ -2508,7 +2508,7 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
2508 2508
2509enum run_hooks_condition {to_completion, until_success, until_failure}; 2509enum run_hooks_condition {to_completion, until_success, until_failure};
2510static Lisp_Object run_hook_with_args (int, Lisp_Object *, 2510static Lisp_Object run_hook_with_args (int, Lisp_Object *,
2511 enum run_hooks_condition); 2511 enum run_hooks_condition);
2512 2512
2513DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, 2513DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0,
2514 doc: /* Run each hook in HOOKS. 2514 doc: /* Run each hook in HOOKS.
@@ -3246,18 +3246,17 @@ specbind (Lisp_Object symbol, Lisp_Object value)
3246 case SYMBOL_VARALIAS: 3246 case SYMBOL_VARALIAS:
3247 sym = indirect_variable (sym); XSETSYMBOL (symbol, sym); goto start; 3247 sym = indirect_variable (sym); XSETSYMBOL (symbol, sym); goto start;
3248 case SYMBOL_PLAINVAL: 3248 case SYMBOL_PLAINVAL:
3249 { /* The most common case is that of a non-constant symbol with a 3249 /* The most common case is that of a non-constant symbol with a
3250 trivial value. Make that as fast as we can. */ 3250 trivial value. Make that as fast as we can. */
3251 specpdl_ptr->symbol = symbol; 3251 specpdl_ptr->symbol = symbol;
3252 specpdl_ptr->old_value = SYMBOL_VAL (sym); 3252 specpdl_ptr->old_value = SYMBOL_VAL (sym);
3253 specpdl_ptr->func = NULL; 3253 specpdl_ptr->func = NULL;
3254 ++specpdl_ptr; 3254 ++specpdl_ptr;
3255 if (!sym->constant) 3255 if (!sym->constant)
3256 SET_SYMBOL_VAL (sym, value); 3256 SET_SYMBOL_VAL (sym, value);
3257 else 3257 else
3258 set_internal (symbol, value, Qnil, 1); 3258 set_internal (symbol, value, Qnil, 1);
3259 break; 3259 break;
3260 }
3261 case SYMBOL_LOCALIZED: 3260 case SYMBOL_LOCALIZED:
3262 if (SYMBOL_BLV (sym)->frame_local) 3261 if (SYMBOL_BLV (sym)->frame_local)
3263 error ("Frame-local vars cannot be let-bound"); 3262 error ("Frame-local vars cannot be let-bound");
@@ -3367,7 +3366,7 @@ unbind_to (int count, Lisp_Object value)
3367 bound a variable that had a buffer-local or frame-local 3366 bound a variable that had a buffer-local or frame-local
3368 binding. WHERE nil means that the variable had the default 3367 binding. WHERE nil means that the variable had the default
3369 value when it was bound. CURRENT-BUFFER is the buffer that 3368 value when it was bound. CURRENT-BUFFER is the buffer that
3370 was current when the variable was bound. */ 3369 was current when the variable was bound. */
3371 else if (CONSP (this_binding.symbol)) 3370 else if (CONSP (this_binding.symbol))
3372 { 3371 {
3373 Lisp_Object symbol, where; 3372 Lisp_Object symbol, where;