emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs lwlib/ChangeLog lwlib/lwlib-Xaw.c lwlib/l...


From: Dan Nicolaescu
Subject: [Emacs-diffs] emacs lwlib/ChangeLog lwlib/lwlib-Xaw.c lwlib/l...
Date: Mon, 19 Oct 2009 04:27:26 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/10/19 04:27:23

Modified files:
        lwlib          : ChangeLog lwlib-Xaw.c lwlib-Xlw.c lwlib-Xm.c 
                         lwlib-utils.c lwlib.c xlwmenu.c 
        src            : ChangeLog alloc.c atimer.c buffer.c bytecode.c 
                         callint.c callproc.c casefiddle.c casetab.c 
                         category.c ccl.c character.c charset.c 
                         chartab.c cm.c cmds.c coding.c composite.c 
                         data.c dbusbind.c dired.c dispnew.c doc.c 
                         doprnt.c dosfns.c editfns.c emacs.c eval.c 
                         fileio.c filelock.c floatfns.c fns.c font.c 
                         fontset.c frame.c fringe.c ftfont.c ftxfont.c 
                         gtkutil.c image.c indent.c insdel.c intervals.c 
                         keyboard.c keymap.c lisp.h macros.c marker.c 
                         menu.c minibuf.c msdos.c print.c process.c 
                         ralloc.c regex.c region-cache.c scroll.c 
                         search.c sheap.c sound.c syntax.c term.c 
                         termcap.c terminal.c terminfo.c textprop.c 
                         tparam.c undo.c unexaix.c unexcw.c unexec.c 
                         unexsol.c vm-limit.c w16select.c w32.c 
                         w32console.c w32fns.c w32font.c w32heap.c 
                         w32inevt.c w32menu.c w32proc.c w32reg.c 
                         w32select.c w32term.c w32uniscribe.c w32xfns.c 
                         widget.c window.c xdisp.c xfaces.c xfns.c 
                         xfont.c xftfont.c xmenu.c xrdb.c xselect.c 
                         xsmfns.c xterm.c 

Log message:
        * alloc.c: Do not define struct catchtag.
        * eval.c: Move struct catchtag definition ...
        * lisp.h: ... here.
        
        * image.c: Move png.h #include earlier to avoid warnings.
        
        * xterm.c:
        * xsmfns.c:
        * xselect.c:
        * xrdb.c:
        * xmenu.c:
        * xftfont.c:
        * xfont.c:
        * xfns.c:
        * xfaces.c:
        * xdisp.c:
        * window.c:
        * widget.c:
        * w32xfns.c:
        * w32uniscribe.c:
        * w32term.c:
        * w32select.c:
        * w32reg.c:
        * w32proc.c:
        * w32menu.c:
        * w32inevt.c:
        * w32heap.c:
        * w32font.c:
        * w32fns.c:
        * w32console.c:
        * w32.c:
        * w16select.c:
        * vm-limit.c:
        * unexsol.c:
        * unexec.c:
        * unexcw.c:
        * unexaix.c:
        * undo.c:
        * tparam.c:
        * textprop.c:
        * terminfo.c:
        * terminal.c:
        * termcap.c:
        * term.c:
        * syntax.c:
        * sound.c:
        * sheap.c:
        * search.c:
        * scroll.c:
        * region-cache.c:
        * regex.c:
        * ralloc.c:
        * process.c:
        * print.c:
        * msdos.c:
        * minibuf.c:
        * menu.c:
        * marker.c:
        * macros.c:
        * keymap.c:
        * keyboard.c:
        * intervals.c:
        * insdel.c:
        * indent.c:
        * gtkutil.c:
        * ftxfont.c:
        * ftfont.c:
        * fringe.c:
        * frame.c:
        * fontset.c:
        * font.c:
        * fns.c:
        * floatfns.c:
        * filelock.c:
        * fileio.c:
        * emacs.c:
        * editfns.c:
        * dosfns.c:
        * doprnt.c:
        * doc.c:
        * dispnew.c:
        * dired.c:
        * dbusbind.c:
        * data.c:
        * composite.c:
        * coding.c:
        * cmds.c:
        * cm.c:
        * chartab.c:
        * charset.c:
        * character.c:
        * ccl.c:
        * category.c:
        * casetab.c:
        * casefiddle.c:
        * callproc.c:
        * callint.c:
        * bytecode.c:
        * buffer.c:
        * atimer.c: Include setjmp.h.  (Bug#4643)
        
        * xlwmenu.c:
        * lwlib.c:
        * lwlib-utils.c:
        * lwlib-Xm.c:
        * lwlib-Xlw.c:
        * lwlib-Xaw.c: Include setjmp.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/ChangeLog?cvsroot=emacs&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/lwlib-Xaw.c?cvsroot=emacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/lwlib-Xlw.c?cvsroot=emacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/lwlib-Xm.c?cvsroot=emacs&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/lwlib-utils.c?cvsroot=emacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/lwlib.c?cvsroot=emacs&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/emacs/lwlib/xlwmenu.c?cvsroot=emacs&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7798&r2=1.7799
http://cvs.savannah.gnu.org/viewcvs/emacs/src/alloc.c?cvsroot=emacs&r1=1.449&r2=1.450
http://cvs.savannah.gnu.org/viewcvs/emacs/src/atimer.c?cvsroot=emacs&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/emacs/src/buffer.c?cvsroot=emacs&r1=1.586&r2=1.587
http://cvs.savannah.gnu.org/viewcvs/emacs/src/bytecode.c?cvsroot=emacs&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/emacs/src/callint.c?cvsroot=emacs&r1=1.173&r2=1.174
http://cvs.savannah.gnu.org/viewcvs/emacs/src/callproc.c?cvsroot=emacs&r1=1.249&r2=1.250
http://cvs.savannah.gnu.org/viewcvs/emacs/src/casefiddle.c?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/src/casetab.c?cvsroot=emacs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/emacs/src/category.c?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ccl.c?cvsroot=emacs&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/emacs/src/character.c?cvsroot=emacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/emacs/src/charset.c?cvsroot=emacs&r1=1.181&r2=1.182
http://cvs.savannah.gnu.org/viewcvs/emacs/src/chartab.c?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/src/cm.c?cvsroot=emacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/emacs/src/cmds.c?cvsroot=emacs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.c?cvsroot=emacs&r1=1.440&r2=1.441
http://cvs.savannah.gnu.org/viewcvs/emacs/src/composite.c?cvsroot=emacs&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/emacs/src/data.c?cvsroot=emacs&r1=1.303&r2=1.304
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dbusbind.c?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dired.c?cvsroot=emacs&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dispnew.c?cvsroot=emacs&r1=1.432&r2=1.433
http://cvs.savannah.gnu.org/viewcvs/emacs/src/doc.c?cvsroot=emacs&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/emacs/src/doprnt.c?cvsroot=emacs&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dosfns.c?cvsroot=emacs&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/emacs/src/editfns.c?cvsroot=emacs&r1=1.472&r2=1.473
http://cvs.savannah.gnu.org/viewcvs/emacs/src/emacs.c?cvsroot=emacs&r1=1.471&r2=1.472
http://cvs.savannah.gnu.org/viewcvs/emacs/src/eval.c?cvsroot=emacs&r1=1.315&r2=1.316
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fileio.c?cvsroot=emacs&r1=1.658&r2=1.659
http://cvs.savannah.gnu.org/viewcvs/emacs/src/filelock.c?cvsroot=emacs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/emacs/src/floatfns.c?cvsroot=emacs&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fns.c?cvsroot=emacs&r1=1.461&r2=1.462
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fontset.c?cvsroot=emacs&r1=1.181&r2=1.182
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.430&r2=1.431
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fringe.c?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftfont.c?cvsroot=emacs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftxfont.c?cvsroot=emacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/emacs/src/image.c?cvsroot=emacs&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/emacs/src/indent.c?cvsroot=emacs&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/emacs/src/insdel.c?cvsroot=emacs&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/emacs/src/intervals.c?cvsroot=emacs&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.1014&r2=1.1015
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keymap.c?cvsroot=emacs&r1=1.387&r2=1.388
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.666&r2=1.667
http://cvs.savannah.gnu.org/viewcvs/emacs/src/macros.c?cvsroot=emacs&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/emacs/src/marker.c?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/src/menu.c?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/src/minibuf.c?cvsroot=emacs&r1=1.362&r2=1.363
http://cvs.savannah.gnu.org/viewcvs/emacs/src/msdos.c?cvsroot=emacs&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/emacs/src/print.c?cvsroot=emacs&r1=1.260&r2=1.261
http://cvs.savannah.gnu.org/viewcvs/emacs/src/process.c?cvsroot=emacs&r1=1.597&r2=1.598
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ralloc.c?cvsroot=emacs&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/emacs/src/regex.c?cvsroot=emacs&r1=1.238&r2=1.239
http://cvs.savannah.gnu.org/viewcvs/emacs/src/region-cache.c?cvsroot=emacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/emacs/src/scroll.c?cvsroot=emacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/emacs/src/search.c?cvsroot=emacs&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/emacs/src/sheap.c?cvsroot=emacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/emacs/src/sound.c?cvsroot=emacs&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/emacs/src/syntax.c?cvsroot=emacs&r1=1.225&r2=1.226
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.248&r2=1.249
http://cvs.savannah.gnu.org/viewcvs/emacs/src/termcap.c?cvsroot=emacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/emacs/src/terminal.c?cvsroot=emacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/emacs/src/terminfo.c?cvsroot=emacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/emacs/src/textprop.c?cvsroot=emacs&r1=1.165&r2=1.166
http://cvs.savannah.gnu.org/viewcvs/emacs/src/tparam.c?cvsroot=emacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/emacs/src/undo.c?cvsroot=emacs&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/emacs/src/unexaix.c?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/src/unexcw.c?cvsroot=emacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/emacs/src/unexec.c?cvsroot=emacs&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/emacs/src/unexsol.c?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/src/vm-limit.c?cvsroot=emacs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w16select.c?cvsroot=emacs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32.c?cvsroot=emacs&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32console.c?cvsroot=emacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32fns.c?cvsroot=emacs&r1=1.362&r2=1.363
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32font.c?cvsroot=emacs&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32heap.c?cvsroot=emacs&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32inevt.c?cvsroot=emacs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32menu.c?cvsroot=emacs&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32proc.c?cvsroot=emacs&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32reg.c?cvsroot=emacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32select.c?cvsroot=emacs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32term.c?cvsroot=emacs&r1=1.330&r2=1.331
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32uniscribe.c?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32xfns.c?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/src/widget.c?cvsroot=emacs&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/emacs/src/window.c?cvsroot=emacs&r1=1.640&r2=1.641
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1315&r2=1.1316
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.438&r2=1.439
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.744&r2=1.745
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfont.c?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xmenu.c?cvsroot=emacs&r1=1.340&r2=1.341
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xrdb.c?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xselect.c?cvsroot=emacs&r1=1.190&r2=1.191
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xsmfns.c?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1043&r2=1.1044

Patches:
Index: lwlib/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- lwlib/ChangeLog     21 Jun 2009 14:35:31 -0000      1.125
+++ lwlib/ChangeLog     19 Oct 2009 04:27:09 -0000      1.126
@@ -1,3 +1,12 @@
+2009-10-19  Dan Nicolaescu  <address@hidden>
+
+       * xlwmenu.c:
+       * lwlib.c:
+       * lwlib-utils.c:
+       * lwlib-Xm.c:
+       * lwlib-Xlw.c:
+       * lwlib-Xaw.c: Include setjmp.h.
+
 2009-06-21  Chong Yidong  <address@hidden>
 
        * Branch for 23.1.

Index: lwlib/lwlib-Xaw.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/lwlib-Xaw.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- lwlib/lwlib-Xaw.c   8 Jan 2009 03:35:54 -0000       1.28
+++ lwlib/lwlib-Xaw.c   19 Oct 2009 04:27:10 -0000      1.29
@@ -25,6 +25,7 @@
 #endif
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "../src/lisp.h"
 

Index: lwlib/lwlib-Xlw.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/lwlib-Xlw.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- lwlib/lwlib-Xlw.c   8 Jan 2009 03:35:54 -0000       1.27
+++ lwlib/lwlib-Xlw.c   19 Oct 2009 04:27:10 -0000      1.28
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <setjmp.h>
 #include "lisp.h"
 
 #include "lwlib-Xlw.h"

Index: lwlib/lwlib-Xm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/lwlib-Xm.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- lwlib/lwlib-Xm.c    8 Jan 2009 03:35:54 -0000       1.59
+++ lwlib/lwlib-Xm.c    19 Oct 2009 04:27:10 -0000      1.60
@@ -26,6 +26,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>

Index: lwlib/lwlib-utils.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/lwlib-utils.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- lwlib/lwlib-utils.c 8 Jan 2009 03:35:54 -0000       1.16
+++ lwlib/lwlib-utils.c 19 Oct 2009 04:27:10 -0000      1.17
@@ -31,6 +31,7 @@
 #undef index
 #undef rindex
 
+#include <setjmp.h>
 #include "../src/lisp.h"
 
 #include <X11/Xatom.h>

Index: lwlib/lwlib.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/lwlib.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- lwlib/lwlib.c       8 Jan 2009 03:35:54 -0000       1.60
+++ lwlib/lwlib.c       19 Oct 2009 04:27:10 -0000      1.61
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <setjmp.h>
 #include "../src/lisp.h"
 
 #include <sys/types.h>

Index: lwlib/xlwmenu.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lwlib/xlwmenu.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- lwlib/xlwmenu.c     8 Jan 2009 03:35:55 -0000       1.79
+++ lwlib/xlwmenu.c     19 Oct 2009 04:27:10 -0000      1.80
@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 
+#include <setjmp.h>
 #include "lisp.h"
 
 #include <stdio.h>

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7798
retrieving revision 1.7799
diff -u -b -r1.7798 -r1.7799
--- src/ChangeLog       18 Oct 2009 19:47:38 -0000      1.7798
+++ src/ChangeLog       19 Oct 2009 04:27:10 -0000      1.7799
@@ -1,3 +1,106 @@
+2009-10-19  Dan Nicolaescu  <address@hidden>
+
+       * alloc.c: Do not define struct catchtag.
+       * eval.c: Move struct catchtag definition ...
+       * lisp.h: ... here.
+
+       * image.c: Move png.h #include earlier to avoid warnings.
+
+       * xterm.c:
+       * xsmfns.c:
+       * xselect.c:
+       * xrdb.c:
+       * xmenu.c:
+       * xftfont.c:
+       * xfont.c:
+       * xfns.c:
+       * xfaces.c:
+       * xdisp.c:
+       * window.c:
+       * widget.c:
+       * w32xfns.c:
+       * w32uniscribe.c:
+       * w32term.c:
+       * w32select.c:
+       * w32reg.c:
+       * w32proc.c:
+       * w32menu.c:
+       * w32inevt.c:
+       * w32heap.c:
+       * w32font.c:
+       * w32fns.c:
+       * w32console.c:
+       * w32.c:
+       * w16select.c:
+       * vm-limit.c:
+       * unexsol.c:
+       * unexec.c:
+       * unexcw.c:
+       * unexaix.c:
+       * undo.c:
+       * tparam.c:
+       * textprop.c:
+       * terminfo.c:
+       * terminal.c:
+       * termcap.c:
+       * term.c:
+       * syntax.c:
+       * sound.c:
+       * sheap.c:
+       * search.c:
+       * scroll.c:
+       * region-cache.c:
+       * regex.c:
+       * ralloc.c:
+       * process.c:
+       * print.c:
+       * msdos.c:
+       * minibuf.c:
+       * menu.c:
+       * marker.c:
+       * macros.c:
+       * keymap.c:
+       * keyboard.c:
+       * intervals.c:
+       * insdel.c:
+       * indent.c:
+       * gtkutil.c:
+       * ftxfont.c:
+       * ftfont.c:
+       * fringe.c:
+       * frame.c:
+       * fontset.c:
+       * font.c:
+       * fns.c:
+       * floatfns.c:
+       * filelock.c:
+       * fileio.c:
+       * emacs.c:
+       * editfns.c:
+       * dosfns.c:
+       * doprnt.c:
+       * doc.c:
+       * dispnew.c:
+       * dired.c:
+       * dbusbind.c:
+       * data.c:
+       * composite.c:
+       * coding.c:
+       * cmds.c:
+       * cm.c:
+       * chartab.c:
+       * charset.c:
+       * character.c:
+       * ccl.c:
+       * category.c:
+       * casetab.c:
+       * casefiddle.c:
+       * callproc.c:
+       * callint.c:
+       * bytecode.c:
+       * buffer.c:
+       * atimer.c: Include setjmp.h.  (Bug#4643)
+
 2009-10-18  Stefan Monnier  <address@hidden>
 
        Remove leftover table unibyte_to_multibyte_table.

Index: src/alloc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/alloc.c,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -b -r1.449 -r1.450
--- src/alloc.c 25 Aug 2009 06:03:09 -0000      1.449
+++ src/alloc.c 19 Oct 2009 04:27:11 -0000      1.450
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <limits.h>            /* For CHAR_BIT.  */
+#include <setjmp.h>
 
 #ifdef STDC_HEADERS
 #include <stddef.h>            /* For offsetof, used by PSEUDOVECSIZE. */
@@ -4939,13 +4940,6 @@
     abort ();
 }
 
-struct catchtag
-{
-    Lisp_Object tag;
-    Lisp_Object val;
-    struct catchtag *next;
-};
-
 
 /***********************************************************************
                          Protection from GC

Index: src/atimer.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/atimer.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/atimer.c        29 Apr 2009 03:48:38 -0000      1.33
+++ src/atimer.c        19 Oct 2009 04:27:12 -0000      1.34
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include <lisp.h>
 #include <syssignal.h>
 #include <systime.h>

Index: src/buffer.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/buffer.c,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -b -r1.586 -r1.587
--- src/buffer.c        17 Oct 2009 02:35:37 -0000      1.586
+++ src/buffer.c        19 Oct 2009 04:27:12 -0000      1.587
@@ -26,6 +26,7 @@
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifndef USE_CRT_DLL
 extern int errno;

Index: src/bytecode.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/bytecode.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- src/bytecode.c      8 Jan 2009 03:15:25 -0000       1.100
+++ src/bytecode.c      19 Oct 2009 04:27:12 -0000      1.101
@@ -34,6 +34,7 @@
  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/callint.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/callint.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- src/callint.c       15 Apr 2009 00:08:24 -0000      1.173
+++ src/callint.c       19 Oct 2009 04:27:12 -0000      1.174
@@ -20,6 +20,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/callproc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/callproc.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- src/callproc.c      26 Aug 2009 20:22:18 -0000      1.249
+++ src/callproc.c      19 Oct 2009 04:27:12 -0000      1.250
@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifndef USE_CRT_DLL
 extern int errno;

Index: src/casefiddle.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/casefiddle.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- src/casefiddle.c    18 Oct 2009 03:08:34 -0000      1.69
+++ src/casefiddle.c    19 Oct 2009 04:27:12 -0000      1.70
@@ -19,6 +19,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/casetab.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/casetab.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/casetab.c       17 Jul 2009 01:27:50 -0000      1.49
+++ src/casetab.c       19 Oct 2009 04:27:12 -0000      1.50
@@ -20,6 +20,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/category.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/category.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- src/category.c      8 Jan 2009 03:15:26 -0000       1.52
+++ src/category.c      19 Oct 2009 04:27:12 -0000      1.53
@@ -30,6 +30,7 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/ccl.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ccl.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- src/ccl.c   8 Jan 2009 03:15:26 -0000       1.110
+++ src/ccl.c   19 Oct 2009 04:27:12 -0000      1.111
@@ -27,6 +27,7 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "character.h"

Index: src/character.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/character.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/character.c     18 Oct 2009 03:08:34 -0000      1.26
+++ src/character.c     19 Oct 2009 04:27:12 -0000      1.27
@@ -34,6 +34,7 @@
 #ifdef emacs
 
 #include <sys/types.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"

Index: src/charset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/charset.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- src/charset.c       18 Oct 2009 03:08:34 -0000      1.181
+++ src/charset.c       19 Oct 2009 04:27:12 -0000      1.182
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #include "charset.h"

Index: src/chartab.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/chartab.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/chartab.c       13 Jul 2009 04:02:26 -0000      1.14
+++ src/chartab.c       19 Oct 2009 04:27:12 -0000      1.15
@@ -19,6 +19,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #include "charset.h"

Index: src/cm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/cm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/cm.c    8 Jan 2009 03:15:28 -0000       1.27
+++ src/cm.c    19 Oct 2009 04:27:12 -0000      1.28
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"

Index: src/cmds.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/cmds.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- src/cmds.c  18 Oct 2009 03:08:34 -0000      1.111
+++ src/cmds.c  19 Oct 2009 04:27:12 -0000      1.112
@@ -20,6 +20,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"

Index: src/coding.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/coding.c,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -b -r1.440 -r1.441
--- src/coding.c        24 Sep 2009 08:18:42 -0000      1.440
+++ src/coding.c        19 Oct 2009 04:27:13 -0000      1.441
@@ -289,6 +289,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/composite.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/composite.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- src/composite.c     25 Mar 2009 11:58:43 -0000      1.73
+++ src/composite.c     19 Oct 2009 04:27:13 -0000      1.74
@@ -24,6 +24,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/data.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/data.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- src/data.c  22 Apr 2009 04:32:22 -0000      1.303
+++ src/data.c  19 Oct 2009 04:27:13 -0000      1.304
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "puresize.h"
 #include "character.h"

Index: src/dbusbind.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dbusbind.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- src/dbusbind.c      13 Oct 2009 01:03:29 -0000      1.48
+++ src/dbusbind.c      19 Oct 2009 04:27:13 -0000      1.49
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <dbus/dbus.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "frame.h"
 #include "termhooks.h"

Index: src/dired.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dired.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- src/dired.c 5 Oct 2009 08:35:12 -0000       1.168
+++ src/dired.c 19 Oct 2009 04:27:13 -0000      1.169
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <setjmp.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

Index: src/dispnew.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispnew.c,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -b -r1.432 -r1.433
--- src/dispnew.c       11 Sep 2009 20:05:11 -0000      1.432
+++ src/dispnew.c       19 Oct 2009 04:27:13 -0000      1.433
@@ -22,6 +22,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

Index: src/doc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/doc.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- src/doc.c   10 Sep 2009 16:19:54 -0000      1.136
+++ src/doc.c   19 Oct 2009 04:27:13 -0000      1.137
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <sys/file.h>  /* Must be after sys/types.h for USG*/
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

Index: src/doprnt.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/doprnt.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/doprnt.c        10 Aug 2009 00:54:02 -0000      1.53
+++ src/doprnt.c        19 Oct 2009 04:27:14 -0000      1.54
@@ -23,6 +23,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <setjmp.h>
 
 #ifdef STDC_HEADERS
 #include <float.h>

Index: src/dosfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dosfns.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/dosfns.c        4 Apr 2009 09:42:12 -0000       1.54
+++ src/dosfns.c        19 Oct 2009 04:27:14 -0000      1.55
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <dos.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "termchar.h"

Index: src/editfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/editfns.c,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -b -r1.472 -r1.473
--- src/editfns.c       18 Oct 2009 03:08:34 -0000      1.472
+++ src/editfns.c       19 Oct 2009 04:27:14 -0000      1.473
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <sys/types.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -b -r1.471 -r1.472
--- src/emacs.c 18 Sep 2009 21:12:09 -0000      1.471
+++ src/emacs.c 19 Oct 2009 04:27:14 -0000      1.472
@@ -26,6 +26,7 @@
 
 #include <sys/types.h>
 #include <sys/file.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

Index: src/eval.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/eval.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -b -r1.315 -r1.316
--- src/eval.c  1 Oct 2009 17:47:44 -0000       1.315
+++ src/eval.c  19 Oct 2009 04:27:14 -0000      1.316
@@ -20,12 +20,12 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "blockinput.h"
 #include "commands.h"
 #include "keyboard.h"
 #include "dispextern.h"
-#include <setjmp.h>
 
 #if HAVE_X_WINDOWS
 #include "xterm.h"
@@ -49,41 +49,6 @@
 
 struct backtrace *backtrace_list;
 
-/* This structure helps implement the `catch' and `throw' control
-   structure.  A struct catchtag contains all the information needed
-   to restore the state of the interpreter after a non-local jump.
-
-   Handlers for error conditions (represented by `struct handler'
-   structures) just point to a catch tag to do the cleanup required
-   for their jumps.
-
-   catchtag structures are chained together in the C calling stack;
-   the `next' member points to the next outer catchtag.
-
-   A call like (throw TAG VAL) searches for a catchtag whose `tag'
-   member is TAG, and then unbinds to it.  The `val' member is used to
-   hold VAL while the stack is unwound; `val' is returned as the value
-   of the catch form.
-
-   All the other members are concerned with restoring the interpreter
-   state.  */
-
-struct catchtag
-{
-  Lisp_Object tag;
-  Lisp_Object val;
-  struct catchtag *next;
-  struct gcpro *gcpro;
-  jmp_buf jmp;
-  struct backtrace *backlist;
-  struct handler *handlerlist;
-  int lisp_eval_depth;
-  int pdlcount;
-  int poll_suppress_count;
-  int interrupt_input_blocked;
-  struct byte_stack *byte_stack;
-};
-
 struct catchtag *catchlist;
 
 #ifdef DEBUG_GCPRO

Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -b -r1.658 -r1.659
--- src/fileio.c        1 Oct 2009 15:07:32 -0000       1.658
+++ src/fileio.c        19 Oct 2009 04:27:14 -0000      1.659
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

Index: src/filelock.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/filelock.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- src/filelock.c      8 Jan 2009 03:15:37 -0000       1.111
+++ src/filelock.c      19 Oct 2009 04:27:14 -0000      1.112
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

Index: src/floatfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/floatfns.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- src/floatfns.c      10 Jan 2009 23:42:02 -0000      1.101
+++ src/floatfns.c      19 Oct 2009 04:27:15 -0000      1.102
@@ -48,6 +48,7 @@
 
 #include <config.h>
 #include <signal.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "syssignal.h"
 

Index: src/fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fns.c,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -b -r1.461 -r1.462
--- src/fns.c   18 Oct 2009 03:08:34 -0000      1.461
+++ src/fns.c   19 Oct 2009 04:27:15 -0000      1.462
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #endif
 #include <time.h>
+#include <setjmp.h>
 
 /* Note on some machines this defines `vector' as a typedef,
    so make sure we don't use that name in this file.  */

Index: src/font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- src/font.c  13 Oct 2009 01:03:38 -0000      1.139
+++ src/font.c  19 Oct 2009 04:27:15 -0000      1.140
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- src/fontset.c       8 Oct 2009 10:54:59 -0000       1.181
+++ src/fontset.c       19 Oct 2009 04:27:15 -0000      1.182
@@ -28,6 +28,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "blockinput.h"

Index: src/frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -b -r1.430 -r1.431
--- src/frame.c 11 Oct 2009 00:01:14 -0000      1.430
+++ src/frame.c 19 Oct 2009 04:27:15 -0000      1.431
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "character.h"
 #ifdef HAVE_X_WINDOWS

Index: src/fringe.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fringe.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/fringe.c        25 Apr 2009 00:26:16 -0000      1.56
+++ src/fringe.c        19 Oct 2009 04:27:15 -0000      1.57
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"

Index: src/ftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftfont.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/ftfont.c        14 Jul 2009 11:55:03 -0000      1.58
+++ src/ftfont.c        19 Oct 2009 04:27:15 -0000      1.59
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcfreetype.h>

Index: src/ftxfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftxfont.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/ftxfont.c       6 Apr 2009 11:11:20 -0000       1.12
+++ src/ftxfont.c       19 Oct 2009 04:27:15 -0000      1.13
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include <X11/Xlib.h>
 
 #include "lisp.h"

Index: src/gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- src/gtkutil.c       8 Oct 2009 15:18:17 -0000       1.159
+++ src/gtkutil.c       19 Oct 2009 04:27:15 -0000      1.160
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "xterm.h"
 #include "blockinput.h"

Index: src/image.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/image.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- src/image.c 25 Aug 2009 03:05:50 -0000      1.123
+++ src/image.c 19 Oct 2009 04:27:15 -0000      1.124
@@ -27,6 +27,14 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_PNG
+#if defined HAVE_LIBPNG_PNG_H
+# include <libpng/png.h>
+#else
+# include <png.h>
+#endif
+#endif 
+
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 
 #define XLIB_ILLEGAL_ACCESS
@@ -5787,12 +5795,6 @@
 
 #ifdef HAVE_PNG
 
-#if defined HAVE_LIBPNG_PNG_H
-# include <libpng/png.h>
-#else
-# include <png.h>
-#endif
-
 #ifdef HAVE_NTGUI
 /* PNG library details.  */
 

Index: src/indent.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/indent.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- src/indent.c        19 Mar 2009 02:58:21 -0000      1.221
+++ src/indent.c        19 Oct 2009 04:27:16 -0000      1.222
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/insdel.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/insdel.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- src/insdel.c        18 Oct 2009 03:08:34 -0000      1.207
+++ src/insdel.c        19 Oct 2009 04:27:16 -0000      1.208
@@ -20,6 +20,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"

Index: src/intervals.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/intervals.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- src/intervals.c     8 Jan 2009 03:15:44 -0000       1.147
+++ src/intervals.c     19 Oct 2009 04:27:16 -0000      1.148
@@ -39,6 +39,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"

Index: src/keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.1014
retrieving revision 1.1015
diff -u -b -r1.1014 -r1.1015
--- src/keyboard.c      27 Sep 2009 04:40:30 -0000      1.1014
+++ src/keyboard.c      19 Oct 2009 04:27:16 -0000      1.1015
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "termchar.h"
 #include "termopts.h"

Index: src/keymap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keymap.c,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -b -r1.387 -r1.388
--- src/keymap.c        12 Sep 2009 01:21:32 -0000      1.387
+++ src/keymap.c        19 Oct 2009 04:27:16 -0000      1.388
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #if HAVE_ALLOCA_H
 # include <alloca.h>
 #endif

Index: src/lisp.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/lisp.h,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -b -r1.666 -r1.667
--- src/lisp.h  2 Oct 2009 05:57:49 -0000       1.666
+++ src/lisp.h  19 Oct 2009 04:27:16 -0000      1.667
@@ -1826,6 +1826,41 @@
 
 extern struct handler *handlerlist;
 
+/* This structure helps implement the `catch' and `throw' control
+   structure.  A struct catchtag contains all the information needed
+   to restore the state of the interpreter after a non-local jump.
+
+   Handlers for error conditions (represented by `struct handler'
+   structures) just point to a catch tag to do the cleanup required
+   for their jumps.
+
+   catchtag structures are chained together in the C calling stack;
+   the `next' member points to the next outer catchtag.
+
+   A call like (throw TAG VAL) searches for a catchtag whose `tag'
+   member is TAG, and then unbinds to it.  The `val' member is used to
+   hold VAL while the stack is unwound; `val' is returned as the value
+   of the catch form.
+
+   All the other members are concerned with restoring the interpreter
+   state.  */
+
+struct catchtag
+{
+  Lisp_Object tag;
+  Lisp_Object val;
+  struct catchtag *next;
+  struct gcpro *gcpro;
+  jmp_buf jmp;
+  struct backtrace *backlist;
+  struct handler *handlerlist;
+  int lisp_eval_depth;
+  int pdlcount;
+  int poll_suppress_count;
+  int interrupt_input_blocked;
+  struct byte_stack *byte_stack;
+};
+
 extern struct catchtag *catchlist;
 extern struct backtrace *backtrace_list;
 

Index: src/macros.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macros.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- src/macros.c        8 Jan 2009 03:15:48 -0000       1.66
+++ src/macros.c        19 Oct 2009 04:27:16 -0000      1.67
@@ -19,6 +19,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "macros.h"
 #include "commands.h"

Index: src/marker.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/marker.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/marker.c        8 Jan 2009 03:15:49 -0000       1.56
+++ src/marker.c        19 Oct 2009 04:27:17 -0000      1.57
@@ -19,6 +19,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/menu.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/menu.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/menu.c  27 Sep 2009 16:21:47 -0000      1.14
+++ src/menu.c  19 Oct 2009 04:27:17 -0000      1.15
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

Index: src/minibuf.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/minibuf.c,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -b -r1.362 -r1.363
--- src/minibuf.c       17 Mar 2009 04:37:41 -0000      1.362
+++ src/minibuf.c       19 Oct 2009 04:27:17 -0000      1.363
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "commands.h"

Index: src/msdos.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/msdos.c,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- src/msdos.c 30 Apr 2009 05:02:03 -0000      1.232
+++ src/msdos.c 19 Oct 2009 04:27:17 -0000      1.233
@@ -26,6 +26,7 @@
 #include <config.h>
 
 #ifdef MSDOS
+#include <setjmp.h>
 #include "lisp.h"
 #include <stdio.h>
 #include <stdlib.h>

Index: src/print.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/print.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- src/print.c 15 Oct 2009 07:22:11 -0000      1.260
+++ src/print.c 19 Oct 2009 04:27:17 -0000      1.261
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"

Index: src/process.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/process.c,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -b -r1.597 -r1.598
--- src/process.c       13 Oct 2009 01:03:46 -0000      1.597
+++ src/process.c       19 Oct 2009 04:27:17 -0000      1.598
@@ -38,6 +38,7 @@
 #include <sys/types.h>         /* some typedefs are used in sys/file.h */
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <setjmp.h>
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
@@ -7641,6 +7642,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <setjmp.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

Index: src/ralloc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ralloc.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- src/ralloc.c        8 Jan 2009 03:15:54 -0000       1.72
+++ src/ralloc.c        19 Oct 2009 04:27:18 -0000      1.73
@@ -26,6 +26,7 @@
 #ifdef emacs
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"              /* Needed for VALBITS.  */
 #include "blockinput.h"
 

Index: src/regex.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/regex.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -b -r1.238 -r1.239
--- src/regex.c 18 Oct 2009 03:08:34 -0000      1.238
+++ src/regex.c 19 Oct 2009 04:27:18 -0000      1.239
@@ -117,6 +117,7 @@
    that make sense only in Emacs. */
 #ifdef emacs
 
+# include <setjmp.h>
 # include "lisp.h"
 # include "buffer.h"
 

Index: src/region-cache.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/region-cache.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/region-cache.c  8 Jan 2009 03:15:55 -0000       1.15
+++ src/region-cache.c  19 Oct 2009 04:27:18 -0000      1.16
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/scroll.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/scroll.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/scroll.c        8 Jan 2009 03:15:55 -0000       1.39
+++ src/scroll.c        19 Oct 2009 04:27:18 -0000      1.40
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "termchar.h"
 #include "dispextern.h"

Index: src/search.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/search.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- src/search.c        18 Oct 2009 03:08:33 -0000      1.244
+++ src/search.c        19 Oct 2009 04:27:18 -0000      1.245
@@ -20,6 +20,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "syntax.h"
 #include "category.h"

Index: src/sheap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/sheap.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/sheap.c 8 Jan 2009 03:15:56 -0000       1.12
+++ src/sheap.c 19 Oct 2009 04:27:18 -0000      1.13
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 
 #include <unistd.h>

Index: src/sound.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/sound.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/sound.c 14 Mar 2009 15:18:44 -0000      1.53
+++ src/sound.c 19 Oct 2009 04:27:18 -0000      1.54
@@ -44,6 +44,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "dispextern.h"
 #include "atimer.h"

Index: src/syntax.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/syntax.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- src/syntax.c        18 Oct 2009 03:08:33 -0000      1.225
+++ src/syntax.c        19 Oct 2009 04:27:18 -0000      1.226
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"

Index: src/term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/term.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- src/term.c  18 Oct 2009 03:08:33 -0000      1.248
+++ src/term.c  19 Oct 2009 04:27:18 -0000      1.249
@@ -37,6 +37,7 @@
 
 #include <signal.h>
 #include <stdarg.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "termchar.h"

Index: src/termcap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/termcap.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/termcap.c       8 Jan 2009 03:52:24 -0000       1.36
+++ src/termcap.c       19 Oct 2009 04:27:18 -0000      1.37
@@ -24,6 +24,7 @@
 
 #ifdef emacs
 
+#include <setjmp.h>
 #include <lisp.h>              /* xmalloc is here */
 /* Get the O_* definitions for open et al.  */
 #include <sys/file.h>

Index: src/terminal.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/terminal.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/terminal.c      22 Apr 2009 03:37:30 -0000      1.17
+++ src/terminal.c      19 Oct 2009 04:27:18 -0000      1.18
@@ -18,6 +18,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"

Index: src/terminfo.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/terminfo.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/terminfo.c      8 Jan 2009 03:16:00 -0000       1.27
+++ src/terminfo.c      19 Oct 2009 04:27:18 -0000      1.28
@@ -18,6 +18,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 
 /* Define these variables that serve as global parameters to termcap,

Index: src/textprop.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/textprop.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- src/textprop.c      8 Jan 2009 03:16:00 -0000       1.165
+++ src/textprop.c      19 Oct 2009 04:27:18 -0000      1.166
@@ -18,6 +18,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"

Index: src/tparam.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/tparam.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/tparam.c        8 Jan 2009 03:52:24 -0000       1.20
+++ src/tparam.c        19 Oct 2009 04:27:18 -0000      1.21
@@ -23,6 +23,7 @@
 #endif
 
 #ifdef emacs
+#include <setjmp.h>
 #include "lisp.h"              /* for xmalloc */
 #else
 

Index: src/undo.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/undo.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- src/undo.c  27 Jan 2009 20:57:47 -0000      1.88
+++ src/undo.c  19 Oct 2009 04:27:18 -0000      1.89
@@ -19,6 +19,7 @@
 
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "buffer.h"
 #include "commands.h"

Index: src/unexaix.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/unexaix.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/unexaix.c       8 Jan 2009 03:16:01 -0000       1.29
+++ src/unexaix.c       19 Oct 2009 04:27:19 -0000      1.30
@@ -104,6 +104,7 @@
 static int pagemask;
 
 #ifdef emacs
+#include <setjmp.h>
 #include "lisp.h"
 
 static void

Index: src/unexcw.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/unexcw.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/unexcw.c        8 Jan 2009 03:16:02 -0000       1.11
+++ src/unexcw.c        19 Oct 2009 04:27:19 -0000      1.12
@@ -19,6 +19,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include <lisp.h>
 #include <stdio.h>
 #include <fcntl.h>

Index: src/unexec.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/unexec.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/unexec.c        4 Oct 2009 02:58:54 -0000       1.55
+++ src/unexec.c        19 Oct 2009 04:27:19 -0000      1.56
@@ -204,6 +204,7 @@
 
 #ifdef emacs
 
+#include <setjmp.h>
 #include "lisp.h"
 
 static

Index: src/unexsol.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/unexsol.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/unexsol.c       18 Jul 2006 13:29:49 -0000      1.6
+++ src/unexsol.c       19 Oct 2009 04:27:19 -0000      1.7
@@ -3,6 +3,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <dlfcn.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/vm-limit.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/vm-limit.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/vm-limit.c      3 Jan 2009 15:09:53 -0000       1.30
+++ src/vm-limit.c      19 Oct 2009 04:27:19 -0000      1.31
@@ -19,6 +19,7 @@
 
 #ifdef emacs
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #endif
 

Index: src/w16select.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w16select.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- src/w16select.c     8 Jan 2009 03:16:03 -0000       1.46
+++ src/w16select.c     19 Oct 2009 04:27:19 -0000      1.47
@@ -32,6 +32,7 @@
 #include <dpmi.h>
 #include <go32.h>
 #include <sys/farptr.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "dispextern.h"        /* frame.h seems to want this */
 #include "frame.h"     /* Need this to get the X window of selected_frame */

Index: src/w32.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- src/w32.c   11 Jul 2009 20:31:27 -0000      1.166
+++ src/w32.c   19 Oct 2009 04:27:19 -0000      1.167
@@ -34,6 +34,7 @@
 #include <sys/utime.h>
 #include <mbstring.h>  /* for _mbspbrk */
 #include <math.h>
+#include <setjmp.h>
 
 /* must include CRT headers *before* config.h */
 

Index: src/w32console.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32console.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/w32console.c    8 Jan 2009 03:16:03 -0000       1.61
+++ src/w32console.c    19 Oct 2009 04:27:19 -0000      1.62
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <windows.h>
 #include <string.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "character.h"

Index: src/w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -b -r1.362 -r1.363
--- src/w32fns.c        2 Oct 2009 06:00:58 -0000       1.362
+++ src/w32fns.c        19 Oct 2009 04:27:19 -0000      1.363
@@ -27,6 +27,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <math.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

Index: src/w32font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32font.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- src/w32font.c       29 Jun 2009 05:28:55 -0000      1.74
+++ src/w32font.c       19 Oct 2009 04:27:19 -0000      1.75
@@ -21,6 +21,7 @@
 #include <math.h>
 #include <ctype.h>
 #include <commdlg.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

Index: src/w32heap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32heap.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/w32heap.c       8 Jan 2009 03:16:05 -0000       1.35
+++ src/w32heap.c       19 Oct 2009 04:27:19 -0000      1.36
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "w32heap.h"
 #include "lisp.h"  /* for VALMASK */

Index: src/w32inevt.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32inevt.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- src/w32inevt.c      30 Jan 2009 18:01:42 -0000      1.47
+++ src/w32inevt.c      19 Oct 2009 04:27:19 -0000      1.48
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <windows.h>
+#include <setjmp.h>
 
 #ifndef MOUSE_MOVED
 #define MOUSE_MOVED   1

Index: src/w32menu.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32menu.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- src/w32menu.c       8 Jan 2009 03:16:06 -0000       1.109
+++ src/w32menu.c       19 Oct 2009 04:27:19 -0000      1.110
@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <mbstring.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

Index: src/w32proc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32proc.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- src/w32proc.c       9 Jul 2009 18:56:26 -0000       1.89
+++ src/w32proc.c       19 Oct 2009 04:27:19 -0000      1.90
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/file.h>
+#include <setjmp.h>
 
 /* must include CRT headers *before* config.h */
 

Index: src/w32reg.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32reg.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/w32reg.c        17 Sep 2009 23:04:47 -0000      1.22
+++ src/w32reg.c        19 Oct 2009 04:27:19 -0000      1.23
@@ -20,6 +20,7 @@
 /* Written by Kevin Gallo */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"
 #include "blockinput.h"

Index: src/w32select.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32select.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/w32select.c     8 Jan 2009 03:16:06 -0000       1.43
+++ src/w32select.c     19 Oct 2009 04:27:19 -0000      1.44
@@ -73,6 +73,7 @@
  */
  
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "w32term.h"   /* for all of the w32 includes */
 #include "w32heap.h"   /* os_subtype */

Index: src/w32term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32term.c,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- src/w32term.c       22 Jul 2009 16:03:41 -0000      1.330
+++ src/w32term.c       19 Oct 2009 04:27:20 -0000      1.331
@@ -22,6 +22,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "blockinput.h"
 #include "w32term.h"

Index: src/w32uniscribe.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32uniscribe.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/w32uniscribe.c  23 Jun 2009 05:49:16 -0000      1.32
+++ src/w32uniscribe.c  19 Oct 2009 04:27:20 -0000      1.33
@@ -27,6 +27,7 @@
 #define _WIN32_WINNT 0x500
 #include <windows.h>
 #include <usp10.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "w32term.h"

Index: src/w32xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32xfns.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/w32xfns.c       8 Jan 2009 03:16:08 -0000       1.31
+++ src/w32xfns.c       19 Oct 2009 04:27:20 -0000      1.32
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "keyboard.h"
 #include "frame.h"

Index: src/widget.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/widget.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/widget.c        8 Jan 2009 03:16:08 -0000       1.82
+++ src/widget.c        19 Oct 2009 04:27:20 -0000      1.83
@@ -31,6 +31,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include "lisp.h"
 #include "xterm.h"
 

Index: src/window.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/window.c,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -b -r1.640 -r1.641
--- src/window.c        3 Oct 2009 13:31:10 -0000       1.640
+++ src/window.c        19 Oct 2009 04:27:20 -0000      1.641
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "buffer.h"

Index: src/xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1315
retrieving revision 1.1316
diff -u -b -r1.1315 -r1.1316
--- src/xdisp.c 18 Oct 2009 03:08:32 -0000      1.1315
+++ src/xdisp.c 19 Oct 2009 04:27:20 -0000      1.1316
@@ -168,6 +168,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <limits.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

Index: src/xfaces.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfaces.c,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -b -r1.438 -r1.439
--- src/xfaces.c        27 Jul 2009 04:19:03 -0000      1.438
+++ src/xfaces.c        19 Oct 2009 04:27:21 -0000      1.439
@@ -204,6 +204,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>              /* This needs to be before termchar.h */
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "character.h"

Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.744
retrieving revision 1.745
diff -u -b -r1.744 -r1.745
--- src/xfns.c  4 Oct 2009 02:58:54 -0000       1.744
+++ src/xfns.c  19 Oct 2009 04:27:22 -0000      1.745
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <math.h>
+#include <setjmp.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

Index: src/xfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfont.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/xfont.c 28 Jul 2009 02:07:05 -0000      1.32
+++ src/xfont.c 19 Oct 2009 04:27:22 -0000      1.33
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include <X11/Xlib.h>
 
 #include "lisp.h"

Index: src/xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/xftfont.c       10 Jul 2009 11:30:37 -0000      1.26
+++ src/xftfont.c       19 Oct 2009 04:27:22 -0000      1.27
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <setjmp.h>
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 

Index: src/xmenu.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xmenu.c,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -b -r1.340 -r1.341
--- src/xmenu.c 18 Mar 2009 08:37:33 -0000      1.340
+++ src/xmenu.c 19 Oct 2009 04:27:23 -0000      1.341
@@ -37,6 +37,7 @@
 #endif
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "keyboard.h"

Index: src/xrdb.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xrdb.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/xrdb.c  17 Sep 2009 23:04:47 -0000      1.68
+++ src/xrdb.c  19 Oct 2009 04:27:23 -0000      1.69
@@ -31,6 +31,7 @@
 #include <epaths.h>
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #if 1 /* I'd really appreciate it if this code could go away...  -JimB */
 /* This avoids lossage in the `dual-universe' headers on AT&T SysV

Index: src/xselect.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xselect.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- src/xselect.c       29 Jun 2009 05:28:56 -0000      1.190
+++ src/xselect.c       19 Oct 2009 04:27:23 -0000      1.191
@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include <stdio.h>      /* termhooks.h needs this */
+#include <setjmp.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

Index: src/xsmfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xsmfns.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/xsmfns.c        8 Jan 2009 03:16:13 -0000       1.29
+++ src/xsmfns.c        19 Oct 2009 04:27:23 -0000      1.30
@@ -32,6 +32,7 @@
 
 #include <sys/param.h>
 #include <stdio.h>
+#include <setjmp.h>
 
 #include "lisp.h"
 #include "systime.h"

Index: src/xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -b -r1.1043 -r1.1044
--- src/xterm.c 15 Sep 2009 18:49:57 -0000      1.1043
+++ src/xterm.c 19 Oct 2009 04:27:23 -0000      1.1044
@@ -28,6 +28,7 @@
 #include <signal.h>
 
 #include <stdio.h>
+#include <setjmp.h>
 
 #ifdef HAVE_X_WINDOWS
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]