merge from trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tparam.c b/src/tparam.c
index 9492d9dee36..164f61d471b 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #include <config.h>
-#include <setjmp.h>
+
 #include "lisp.h"               /* for xmalloc */
 #include "tparam.h"
 
@@ -247,7 +247,7 @@ tparam1 (const char *string, char *outstring, int len,
               break;
 
             default:
-              abort ();
+              emacs_abort ();
             }
         }
       else