diff options
| author | Chong Yidong | 2011-08-17 17:40:13 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-08-17 17:40:13 -0400 |
| commit | 72ad093b970be68fea2224dd17239b006ede6fba (patch) | |
| tree | e83e9e9fb16d2ece3d841ea2be66525d16115fed /src/eval.c | |
| parent | 57173b965f2fb2265f4aeb65b5076b4a63816394 (diff) | |
| download | emacs-72ad093b970be68fea2224dd17239b006ede6fba.tar.gz emacs-72ad093b970be68fea2224dd17239b006ede6fba.zip | |
Remove aborts from internal_condition_case*.
* src/eval.c (internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n): Remove
unnecessary aborts.
Fixes: debbugs:9081
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/eval.c b/src/eval.c index ef169e80e27..e37425020c9 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1461,13 +1461,6 @@ internal_condition_case (Lisp_Object (*bfun) (void), Lisp_Object handlers, | |||
| 1461 | struct catchtag c; | 1461 | struct catchtag c; |
| 1462 | struct handler h; | 1462 | struct handler h; |
| 1463 | 1463 | ||
| 1464 | /* Since Fsignal will close off all calls to x_catch_errors, | ||
| 1465 | we will get the wrong results if some are not closed now. */ | ||
| 1466 | #if HAVE_X_WINDOWS | ||
| 1467 | if (x_catching_errors ()) | ||
| 1468 | abort (); | ||
| 1469 | #endif | ||
| 1470 | |||
| 1471 | c.tag = Qnil; | 1464 | c.tag = Qnil; |
| 1472 | c.val = Qnil; | 1465 | c.val = Qnil; |
| 1473 | c.backlist = backtrace_list; | 1466 | c.backlist = backtrace_list; |
| @@ -1506,13 +1499,6 @@ internal_condition_case_1 (Lisp_Object (*bfun) (Lisp_Object), Lisp_Object arg, | |||
| 1506 | struct catchtag c; | 1499 | struct catchtag c; |
| 1507 | struct handler h; | 1500 | struct handler h; |
| 1508 | 1501 | ||
| 1509 | /* Since Fsignal will close off all calls to x_catch_errors, | ||
| 1510 | we will get the wrong results if some are not closed now. */ | ||
| 1511 | #if HAVE_X_WINDOWS | ||
| 1512 | if (x_catching_errors ()) | ||
| 1513 | abort (); | ||
| 1514 | #endif | ||
| 1515 | |||
| 1516 | c.tag = Qnil; | 1502 | c.tag = Qnil; |
| 1517 | c.val = Qnil; | 1503 | c.val = Qnil; |
| 1518 | c.backlist = backtrace_list; | 1504 | c.backlist = backtrace_list; |
| @@ -1555,13 +1541,6 @@ internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object), | |||
| 1555 | struct catchtag c; | 1541 | struct catchtag c; |
| 1556 | struct handler h; | 1542 | struct handler h; |
| 1557 | 1543 | ||
| 1558 | /* Since Fsignal will close off all calls to x_catch_errors, | ||
| 1559 | we will get the wrong results if some are not closed now. */ | ||
| 1560 | #if HAVE_X_WINDOWS | ||
| 1561 | if (x_catching_errors ()) | ||
| 1562 | abort (); | ||
| 1563 | #endif | ||
| 1564 | |||
| 1565 | c.tag = Qnil; | 1544 | c.tag = Qnil; |
| 1566 | c.val = Qnil; | 1545 | c.val = Qnil; |
| 1567 | c.backlist = backtrace_list; | 1546 | c.backlist = backtrace_list; |
| @@ -1604,13 +1583,6 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *), | |||
| 1604 | struct catchtag c; | 1583 | struct catchtag c; |
| 1605 | struct handler h; | 1584 | struct handler h; |
| 1606 | 1585 | ||
| 1607 | /* Since Fsignal will close off all calls to x_catch_errors, | ||
| 1608 | we will get the wrong results if some are not closed now. */ | ||
| 1609 | #if HAVE_X_WINDOWS | ||
| 1610 | if (x_catching_errors ()) | ||
| 1611 | abort (); | ||
| 1612 | #endif | ||
| 1613 | |||
| 1614 | c.tag = Qnil; | 1586 | c.tag = Qnil; |
| 1615 | c.val = Qnil; | 1587 | c.val = Qnil; |
| 1616 | c.backlist = backtrace_list; | 1588 | c.backlist = backtrace_list; |