mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-02 11:21:42 +00:00
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
This commit is contained in:
parent
57173b965f
commit
72ad093b97
@ -1,3 +1,9 @@
|
||||
2011-08-17 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* eval.c (internal_condition_case, internal_condition_case_1)
|
||||
(internal_condition_case_2, internal_condition_case_n): Remove
|
||||
unnecessary aborts (Bug#9081).
|
||||
|
||||
2011-08-17 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file
|
||||
@ -61,7 +67,7 @@
|
||||
2011-08-14 Kenichi Handa <handa@m17n.org>
|
||||
|
||||
* process.c (create_process): Call setup_process_coding_systems
|
||||
after the pid of the process is set to -1.
|
||||
after the pid of the process is set to -1 (Bug#8162).
|
||||
|
||||
2011-08-14 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
|
28
src/eval.c
28
src/eval.c
@ -1461,13 +1461,6 @@ internal_condition_case (Lisp_Object (*bfun) (void), Lisp_Object handlers,
|
||||
struct catchtag c;
|
||||
struct handler h;
|
||||
|
||||
/* Since Fsignal will close off all calls to x_catch_errors,
|
||||
we will get the wrong results if some are not closed now. */
|
||||
#if HAVE_X_WINDOWS
|
||||
if (x_catching_errors ())
|
||||
abort ();
|
||||
#endif
|
||||
|
||||
c.tag = Qnil;
|
||||
c.val = Qnil;
|
||||
c.backlist = backtrace_list;
|
||||
@ -1506,13 +1499,6 @@ internal_condition_case_1 (Lisp_Object (*bfun) (Lisp_Object), Lisp_Object arg,
|
||||
struct catchtag c;
|
||||
struct handler h;
|
||||
|
||||
/* Since Fsignal will close off all calls to x_catch_errors,
|
||||
we will get the wrong results if some are not closed now. */
|
||||
#if HAVE_X_WINDOWS
|
||||
if (x_catching_errors ())
|
||||
abort ();
|
||||
#endif
|
||||
|
||||
c.tag = Qnil;
|
||||
c.val = Qnil;
|
||||
c.backlist = backtrace_list;
|
||||
@ -1555,13 +1541,6 @@ internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object),
|
||||
struct catchtag c;
|
||||
struct handler h;
|
||||
|
||||
/* Since Fsignal will close off all calls to x_catch_errors,
|
||||
we will get the wrong results if some are not closed now. */
|
||||
#if HAVE_X_WINDOWS
|
||||
if (x_catching_errors ())
|
||||
abort ();
|
||||
#endif
|
||||
|
||||
c.tag = Qnil;
|
||||
c.val = Qnil;
|
||||
c.backlist = backtrace_list;
|
||||
@ -1604,13 +1583,6 @@ internal_condition_case_n (Lisp_Object (*bfun) (ptrdiff_t, Lisp_Object *),
|
||||
struct catchtag c;
|
||||
struct handler h;
|
||||
|
||||
/* Since Fsignal will close off all calls to x_catch_errors,
|
||||
we will get the wrong results if some are not closed now. */
|
||||
#if HAVE_X_WINDOWS
|
||||
if (x_catching_errors ())
|
||||
abort ();
|
||||
#endif
|
||||
|
||||
c.tag = Qnil;
|
||||
c.val = Qnil;
|
||||
c.backlist = backtrace_list;
|
||||
|
Loading…
Reference in New Issue
Block a user