Mercurial > emacs
comparison src/eval.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | d9a022ec322c |
| children | b668431e0039 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 1627 /* When memory is full, ERROR-SYMBOL is nil, | 1627 /* When memory is full, ERROR-SYMBOL is nil, |
| 1628 and DATA is (REAL-ERROR-SYMBOL . REAL-DATA). | 1628 and DATA is (REAL-ERROR-SYMBOL . REAL-DATA). |
| 1629 That is a special case--don't do this in other situations. */ | 1629 That is a special case--don't do this in other situations. */ |
| 1630 register struct handler *allhandlers = handlerlist; | 1630 register struct handler *allhandlers = handlerlist; |
| 1631 Lisp_Object conditions; | 1631 Lisp_Object conditions; |
| 1632 extern int waiting_for_input; | |
| 1633 Lisp_Object string; | 1632 Lisp_Object string; |
| 1634 Lisp_Object real_error_symbol; | 1633 Lisp_Object real_error_symbol; |
| 1635 struct backtrace *bp; | 1634 struct backtrace *bp; |
| 1636 | 1635 |
| 1637 immediate_quit = handling_signal = 0; | 1636 immediate_quit = handling_signal = 0; |
| 3430 { | 3429 { |
| 3431 register struct backtrace *backlist = backtrace_list; | 3430 register struct backtrace *backlist = backtrace_list; |
| 3432 register int i; | 3431 register int i; |
| 3433 Lisp_Object tail; | 3432 Lisp_Object tail; |
| 3434 Lisp_Object tem; | 3433 Lisp_Object tem; |
| 3435 extern Lisp_Object Vprint_level; | |
| 3436 struct gcpro gcpro1; | 3434 struct gcpro gcpro1; |
| 3437 | 3435 |
| 3438 XSETFASTINT (Vprint_level, 3); | 3436 XSETFASTINT (Vprint_level, 3); |
| 3439 | 3437 |
| 3440 tail = Qnil; | 3438 tail = Qnil; |
