[Emacs-diffs] /srv/bzr/emacs/trunk r105482: Remove aborts from internal_condition_case*.

[Chong Yidong]

------------------------------------------------------------
revno: 105482
fixes bug(s): http://debbugs.gnu.org/9081
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-17 17:40:13 -0400
message:
  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.
modified:
  src/ChangeLog
  src/eval.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-17 08:50:08 +0000
+++ b/src/ChangeLog     2011-08-17 21:40:13 +0000
@@ -1,3 +1,9 @@
+2011-08-17  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file
@@ -61,7 +67,7 @@
 2011-08-14  Kenichi Handa  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'src/eval.c'
--- a/src/eval.c        2011-07-07 02:14:52 +0000
+++ b/src/eval.c        2011-08-17 21:40:13 +0000
@@ -1461,13 +1461,6 @@
   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 @@
   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 @@
   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 @@
   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;