Shift some of the more basic patches to a distfile patch.

PKGREVISION -> 16.

22 files changed, 20 insertions, 295 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 62ee3b1c4b5..02c6cacfb56 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2012/10/03 11:43:32 asau Exp $
+# $NetBSD: Makefile,v 1.45 2012/12/11 04:54:43 dholland Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	editors
 MASTER_SITES=	http://ftp.gnu.org/pub/old-gnu/emacs/	\
 		ftp://ftp.gnu.org/pub/old-gnu/emacs
@@ -17,6 +17,12 @@ PATCHFILES=		emacs-20.7-mule-4.1b.patch
 SITES.emacs20-xim-20000713.diff=	\
 			http://home.catv.ne.jp/pp/ginoue/software/emacs-xim/
 PATCHFILES+=		emacs20-xim-20000713.diff
+
+# dholland's jumbo patch
+PATCHFILES+=		emacs20-jumbo-patch-20121210.gz
+SITES.emacs20-jumbo-patch-20121210.gz=\
+			http://www.NetBSD.org/~dholland/patchkits/emacs20/
+
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dholland@NetBSD.org
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index a278216e83f..32e1bdc273a 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2012/03/05 07:29:36 dholland Exp $
+$NetBSD: distinfo,v 1.25 2012/12/11 04:54:43 dholland Exp $
 
 SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
 RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
@@ -9,6 +9,9 @@ Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
 Size (emacs-20.7.tar.gz) = 15043428 bytes
+SHA1 (emacs20-jumbo-patch-20121210.gz) = 8a403fafe381178e7a982f68e9878f9d4746203f
+RMD160 (emacs20-jumbo-patch-20121210.gz) = d5e74b66bcbb517477a720ce3b4ba393d06fb3bb
+Size (emacs20-jumbo-patch-20121210.gz) = 2252 bytes
 SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
 Size (emacs20-xim-20000713.diff) = 21296 bytes
@@ -19,20 +22,13 @@ SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
 SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca
 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
-SHA1 (patch-ah) = 451954e31fd60e7f85d22eb02a2949818d5e5e4e
-SHA1 (patch-ai) = 36a90bc66633618569c32fd38552ead1fc8958ac
+SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455
+SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d
 SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256
 SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c
 SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
 SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
-SHA1 (patch-an) = 59cffa7847fe84bc29a44d3b0e4c2eb09719126f
 SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193
-SHA1 (patch-ap) = f0453313569cd000af36230bc193ab777db80974
-SHA1 (patch-aq) = 17897dc84bc40f6e5229b6c833f87066d9e065ed
-SHA1 (patch-ar) = 0c04e0dd0e0e91099404ba47a01c1a556884773a
-SHA1 (patch-as) = d098417b487676fdc958feb0d7b5977226efe9df
-SHA1 (patch-at) = 8d0b76a7ff397796ecc8ee5e588a11968415a164
-SHA1 (patch-au) = 9d416d2dcd2e5a2ef3a73f0841196ac86efea3c0
 SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
 SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
 SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e
@@ -45,22 +41,13 @@ SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8
 SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
 SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c
 SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
-SHA1 (patch-bk) = 7582e915a5bd9778259961e7fa842d5cdce3e85c
 SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
 SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54
-SHA1 (patch-bn) = 247c04ae1accf3bc6b07b22767eb3cf2cdb55013
-SHA1 (patch-bo) = f9b8b73af91a445dbf50f9e862b84c7abc2b730e
-SHA1 (patch-bp) = 9091134cf50e17ce58976c3193666e716345a124
-SHA1 (patch-bq) = 5d8cf584bb6d83df975a339c262902da1d35776e
+SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91
 SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
-SHA1 (patch-bs) = 7cf879039f93d92c2cc43a9cce74dac114f622aa
+SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a
 SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
-SHA1 (patch-bu) = 99374b0ca8402f6971c5a56c4e2ed0bc9ba8667e
-SHA1 (patch-bv) = fa51f5ad5152c344e83f056a3c565129a9b7a1ef
-SHA1 (patch-bw) = 5de9f12d129b2f13a1d9c1702c7a889cd6b922f4
 SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
-SHA1 (patch-by) = a383206a32e902c448a1b529cf1eefc485f5beab
-SHA1 (patch-bz) = c395a2acb2aa1e2c1582f6bb46a32bcfa4661b85
 SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
 SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
 SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
diff --git a/editors/emacs20/patches/patch-ah b/editors/emacs20/patches/patch-ah
index bca52903550..5bab36464c9 100644
--- a/editors/emacs20/patches/patch-ah
+++ b/editors/emacs20/patches/patch-ah
@@ -1,18 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2006/01/04 17:00:32 joerg Exp $
+$NetBSD: patch-ah,v 1.3 2012/12/11 04:54:43 dholland Exp $
 
 --- src/fileio.c.orig	2000-05-16 11:02:13.000000000 +0000
 +++ src/fileio.c
-@@ -61,10 +61,6 @@ Boston, MA 02111-1307, USA.  */
- 
- #include <errno.h>
- 
--#ifndef vax11c
--extern int errno;
--#endif
--
- extern char *strerror ();
- 
- #ifdef APOLLO
 @@ -3252,8 +3248,11 @@ The value is an integer.")
    return value;
  }
diff --git a/editors/emacs20/patches/patch-ai b/editors/emacs20/patches/patch-ai
index 549027a43b6..8e59e5b84c6 100644
--- a/editors/emacs20/patches/patch-ai
+++ b/editors/emacs20/patches/patch-ai
@@ -1,16 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2006/01/04 17:00:32 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2012/12/11 04:54:43 dholland Exp $
 
 --- src/sysdep.c.orig	2000-05-24 13:59:14.000000000 +0000
 +++ src/sysdep.c
-@@ -104,8 +104,6 @@ extern unsigned start __asm__ ("start");
- #endif
- #endif
- 
--extern int errno;
--
- #ifdef VMS
- #include <rms.h>
- #include <ttdef.h>
 @@ -2134,6 +2132,7 @@ unrequest_sigio ()
   *
   */
diff --git a/editors/emacs20/patches/patch-an b/editors/emacs20/patches/patch-an
deleted file mode 100644
index 807fafd1363..00000000000
--- a/editors/emacs20/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2006/01/04 17:00:32 joerg Exp $
-
---- src/emacs.c.orig	2000-05-24 13:58:54.000000000 +0000
-+++ src/emacs.c
-@@ -601,8 +601,6 @@ main (argc, argv, envp)
- {
-   char stack_bottom_variable;
-   int skip_args = 0;
--  extern int errno;
--  extern int sys_nerr;
- #ifdef HAVE_SETRLIMIT
-   struct rlimit rlim;
- #endif
diff --git a/editors/emacs20/patches/patch-ap b/editors/emacs20/patches/patch-ap
deleted file mode 100644
index ccdef8786aa..00000000000
--- a/editors/emacs20/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- lib-src/emacsclient.c.orig	2006-01-04 15:27:43.000000000 +0000
-+++ lib-src/emacsclient.c
-@@ -185,7 +185,6 @@ main (argc, argv)
- #include <errno.h>
- 
- extern char *strerror ();
--extern int errno;
- 
- int
- main (argc, argv)
diff --git a/editors/emacs20/patches/patch-aq b/editors/emacs20/patches/patch-aq
deleted file mode 100644
index 7139b947990..00000000000
--- a/editors/emacs20/patches/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- src/dispnew.c.orig	2006-01-04 15:31:05.000000000 +0000
-+++ src/dispnew.c
-@@ -2067,7 +2067,6 @@ window_change_signal (signalnum) /* If w
-      int signalnum;		/* some compilers complain in signal calls. */
- {
-   int width, height;
--  extern int errno;
-   int old_errno = errno;
- 
-   get_frame_size (&width, &height);
diff --git a/editors/emacs20/patches/patch-ar b/editors/emacs20/patches/patch-ar
deleted file mode 100644
index 2c41a65a01e..00000000000
--- a/editors/emacs20/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- src/keyboard.c.orig	2006-01-04 15:37:56.000000000 +0000
-+++ src/keyboard.c
-@@ -67,10 +67,9 @@ Boston, MA 02111-1307, USA.  */
- /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
- #include "systime.h"
- 
--extern int errno;
--
- /* Variables for blockinput.h: */
- 
-+
- /* Non-zero if interrupt input is blocked right now.  */
- int interrupt_input_blocked;
- 
diff --git a/editors/emacs20/patches/patch-as b/editors/emacs20/patches/patch-as
deleted file mode 100644
index 2c2ee83a7d4..00000000000
--- a/editors/emacs20/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- src/buffer.c.orig	2006-01-04 15:45:31.000000000 +0000
-+++ src/buffer.c
-@@ -25,8 +25,6 @@ Boston, MA 02111-1307, USA.  */
- #include <sys/param.h>
- #include <errno.h>
- 
--extern int errno;
--
- #ifndef MAXPATHLEN
- /* in 4.1, param.h fails to define this. */
- #define MAXPATHLEN 1024
diff --git a/editors/emacs20/patches/patch-at b/editors/emacs20/patches/patch-at
deleted file mode 100644
index 375862b590a..00000000000
--- a/editors/emacs20/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- src/lread.c.orig	2006-01-04 16:10:20.000000000 +0000
-+++ src/lread.c
-@@ -73,8 +73,6 @@ Boston, MA 02111-1307, USA.  */
- #define O_RDONLY 0
- #endif
- 
--extern int errno;
--
- Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list;
- Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist;
- Lisp_Object Qascii_character, Qload, Qload_file_name;
diff --git a/editors/emacs20/patches/patch-au b/editors/emacs20/patches/patch-au
deleted file mode 100644
index b0bdcbd6993..00000000000
--- a/editors/emacs20/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2006/01/04 17:00:32 joerg Exp $
-
---- src/floatfns.c.orig	2006-01-04 15:59:18.000000000 +0000
-+++ src/floatfns.c
-@@ -109,8 +109,6 @@ extern double logb ();
- 
- #ifdef FLOAT_CHECK_ERRNO
- # include <errno.h>
--
--extern int errno;
- #endif
- 
- /* Avoid traps on VMS from sinh and cosh.
diff --git a/editors/emacs20/patches/patch-bk b/editors/emacs20/patches/patch-bk
deleted file mode 100644
index d693bceea9f..00000000000
--- a/editors/emacs20/patches/patch-bk
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bk,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
-
---- ./lib-src/sorted-doc.c.orig	Tue Mar 30 11:07:02 1999
-+++ ./lib-src/sorted-doc.c	Tue Sep 26 09:32:51 2000
-@@ -7,6 +7,7 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- extern char *malloc ();
- char *xmalloc ();
diff --git a/editors/emacs20/patches/patch-bn b/editors/emacs20/patches/patch-bn
deleted file mode 100644
index f9e6b39989b..00000000000
--- a/editors/emacs20/patches/patch-bn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bn,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
-
---- lib-src/cvtmail.c.orig	Tue Jul 16 22:08:02 1996
-+++ lib-src/cvtmail.c	Fri Jul 19 02:34:38 2002
-@@ -35,10 +35,8 @@
- 
- 
- #include <stdio.h>
--
--char *malloc ();
--char *realloc ();
--char *getenv ();
-+#include <string.h>
-+#include <stdlib.h>
- 
- char *xmalloc ();
- char *xrealloc ();
diff --git a/editors/emacs20/patches/patch-bo b/editors/emacs20/patches/patch-bo
deleted file mode 100644
index b1fe49e701e..00000000000
--- a/editors/emacs20/patches/patch-bo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bo,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
-
---- lib-src/yow.c.orig	Fri Feb 26 11:30:08 1999
-+++ lib-src/yow.c	Fri Jul 19 02:33:37 2002
-@@ -12,6 +12,8 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
-+#include <stdlib.h>
- #include <../src/epaths.h>      /* For PATH_DATA.  */
- 
- #define BUFSIZE  80
-@@ -32,8 +34,6 @@
-     strcpy (p + 4, rel);\
-     &res;})
- #endif
--
--char *malloc(), *realloc();
- 
- void yow();
- void setup_yow();
diff --git a/editors/emacs20/patches/patch-bp b/editors/emacs20/patches/patch-bp
index 3bf3b6e5b56..59071954288 100644
--- a/editors/emacs20/patches/patch-bp
+++ b/editors/emacs20/patches/patch-bp
@@ -1,18 +1,7 @@
-$NetBSD: patch-bp,v 1.2 2008/04/05 21:29:14 kristerw Exp $
+$NetBSD: patch-bp,v 1.3 2012/12/11 04:54:47 dholland Exp $
 
 --- lwlib/lwlib.c.orig	1998-04-06 12:24:33.000000000 +0200
 +++ lwlib/lwlib.c	2008-04-04 21:33:16.000000000 +0200
-@@ -29,10 +29,8 @@
- #include "lwlib-utils.h"
- #include <X11/StringDefs.h>
- 
--#ifdef __osf__
- #include <string.h>
- #include <stdlib.h>
--#endif
- extern long *xmalloc();
- 
- #if defined (USE_LUCID)
 @@ -1302,7 +1300,7 @@
    XtVaSetValues (widget_to_invert,
  		 XtNforeground, background,
diff --git a/editors/emacs20/patches/patch-bq b/editors/emacs20/patches/patch-bq
deleted file mode 100644
index 3306776d16c..00000000000
--- a/editors/emacs20/patches/patch-bq
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bq,v 1.2 2006/01/04 17:00:32 joerg Exp $
-
---- src/callproc.c.orig	2006-01-04 16:05:18.000000000 +0000
-+++ src/callproc.c
-@@ -24,8 +24,10 @@ Boston, MA 02111-1307, USA.  */
- 
- #include <config.h>
- #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
- 
--extern int errno;
- extern char *strerror ();
- 
- /* Define SIGCHLD as an alias for SIGCLD.  */
diff --git a/editors/emacs20/patches/patch-bs b/editors/emacs20/patches/patch-bs
index 4ec6b429805..99cf23efb30 100644
--- a/editors/emacs20/patches/patch-bs
+++ b/editors/emacs20/patches/patch-bs
@@ -1,15 +1,7 @@
-$NetBSD: patch-bs,v 1.2 2008/04/05 21:29:14 kristerw Exp $
+$NetBSD: patch-bs,v 1.3 2012/12/11 04:54:47 dholland Exp $
 
 --- src/xmenu.c.orig	1998-12-28 23:15:47.000000000 +0100
 +++ src/xmenu.c	2008-04-02 22:40:18.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <config.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "lisp.h"
- #include "termhooks.h"
- #include "frame.h"
 @@ -1500,7 +1501,7 @@
      {
        XtManageChild (x->menubar_widget);
diff --git a/editors/emacs20/patches/patch-bu b/editors/emacs20/patches/patch-bu
deleted file mode 100644
index 839431ec7fa..00000000000
--- a/editors/emacs20/patches/patch-bu
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bu,v 1.1 2004/03/25 22:13:34 kristerw Exp $
-
---- src/xterm.c.orig	2004-03-25 22:14:27.000000000 +0100
-+++ src/xterm.c	2004-03-25 22:14:43.000000000 +0100
-@@ -28,6 +28,7 @@
- #include <config.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #ifdef HAVE_X_WINDOWS
- 
diff --git a/editors/emacs20/patches/patch-bv b/editors/emacs20/patches/patch-bv
deleted file mode 100644
index 99c903a5d1e..00000000000
--- a/editors/emacs20/patches/patch-bv
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2004/03/25 22:13:34 kristerw Exp $
-
---- src/ralloc.c.orig	2004-03-25 22:18:49.000000000 +0100
-+++ src/ralloc.c	2004-03-25 22:20:22.000000000 +0100
-@@ -80,6 +80,8 @@
- 
- #endif	/* not emacs */
- 
-+#include <stdlib.h>
-+
- #include "getpagesize.h"
- 
- #define NIL ((POINTER) 0)
diff --git a/editors/emacs20/patches/patch-bw b/editors/emacs20/patches/patch-bw
deleted file mode 100644
index e7b901959b5..00000000000
--- a/editors/emacs20/patches/patch-bw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bw,v 1.1 2004/03/25 22:13:34 kristerw Exp $
-
---- lwlib/lwlib-utils.c.orig	2004-03-25 22:58:34.000000000 +0100
-+++ lwlib/lwlib-utils.c	2004-03-25 22:59:20.000000000 +0100
-@@ -29,6 +29,7 @@
- #undef index
- #undef rindex
- 
-+#include <stdlib.h>
- #include <X11/Xatom.h>
- #include <X11/IntrinsicP.h>
- #include <X11/ObjectP.h>
diff --git a/editors/emacs20/patches/patch-by b/editors/emacs20/patches/patch-by
deleted file mode 100644
index 538fbeb3cd7..00000000000
--- a/editors/emacs20/patches/patch-by
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-by,v 1.1 2004/03/25 22:13:34 kristerw Exp $
-
---- lib-src/make-docfile.c.orig	2004-03-25 22:56:07.000000000 +0100
-+++ lib-src/make-docfile.c	2004-03-25 22:56:42.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <../src/config.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #ifdef MSDOS
- #include <fcntl.h>
- #endif /* MSDOS */
diff --git a/editors/emacs20/patches/patch-bz b/editors/emacs20/patches/patch-bz
deleted file mode 100644
index 49cb855483b..00000000000
--- a/editors/emacs20/patches/patch-bz
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bz,v 1.2 2006/01/04 17:00:32 joerg Exp $
-
---- lib-src/emacsserver.c.orig	1999-02-22 20:44:14.000000000 +0000
-+++ lib-src/emacsserver.c
-@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
-    up to the Emacs which then executes them.  */
- 
- #define NO_SHORTNAMES
-+#include <stdlib.h>
- #include <signal.h>
- #include <../src/config.h>
- #undef read
-@@ -65,8 +66,6 @@ void fatal_error ();
- #include <unistd.h>
- #endif
- 
--extern int errno;
--
- /* Copied from src/process.c */
- #ifdef FD_SET
- /* We could get this from param.h, but better not to depend on finding that.