dotemacs'.
Sprout from master 2004-09-21 01:08:50 UTC ankry <ankry@pld-linux.org> '- rel. 6'
Delete:
emacs-10buttons.patch
emacs-amd64.patch
emacs-dotemacs
emacs-encoding.patch
emacs-expand.patch
emacs-ia64-2.patch
emacs-ia64-3.patch
emacs-ia64.patch
emacs-kbdbuffer.patch
emacs-linkscr.patch
emacs-lisp-startup-localealias.patch
emacs-loadup.patch
emacs-manboption.patch
emacs-nmhlocation.patch
emacs-paths.patch
emacs-proto.patch
emacs-s390.patch
emacs-site-start.el
emacs-tmprace.patch
emacs-xaw3d.patch
emacs.desktop
emacs.png
+++ /dev/null
-X-From-Line: cookedm@physics.mcmaster.ca Sat Apr 1 07:05:16 2000
-Return-Path: <cookedm@physics.mcmaster.ca>
-Received: from localhost (IDENT:flepied@localhost [127.0.0.1])
- by skywalker.mandrakesoft.com (8.9.3/8.9.3) with ESMTP id HAA15589
- for <flepied@localhost>; Sat, 1 Apr 2000 07:05:15 +0200
-Received: from mandrakesoft.com
- by localhost with POP3 (fetchmail-5.1.0)
- for flepied@localhost (single-drop); Sat, 01 Apr 2000 07:05:16 +0200 (CEST)
-Received: from arbutus.physics.mcmaster.ca (arbutus.Physics.McMaster.CA [130.113.172.142])
- by mandrakesoft.mandrakesoft.com (8.8.5/8.8.5) with ESMTP id WAA26223
- for <flepied@mandrakesoft.com>; Fri, 31 Mar 2000 22:33:59 -0600
-Received: (from cookedm@localhost)
- by arbutus.physics.mcmaster.ca (8.9.3/8.9.3) id AAA01490;
- Sat, 1 Apr 2000 00:04:03 -0500
-X-Authentication-Warning: arbutus.physics.mcmaster.ca: cookedm set sender to cookedm@physics.mcmaster.ca using -f
-Sender: cookedm@arbutus.physics.mcmaster.ca
-To: Frederic Lepied <flepied@mandrakesoft.com>
-Subject: Emacs doesn't like mouse buttons > 5
-From: cookedm@physics.mcmaster.ca (David M. Cooke)
-Date: 01 Apr 2000 00:04:03 -0500
-Message-ID: <qnk7leiif98.fsf@arbutus.physics.mcmaster.ca>
-User-Agent: Gnus/5.0803 (Gnus v5.8.3) Emacs/20.6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Status: RO
-X-Content-Length: 1783
-Lines: 51
-Xref: skywalker.mandrakesoft.com mail.mbox.mandrake:747
-
-This is a bug that comes from the upstream Emacs source (20.6 at least). I
-recently upgraded to XFree86 4.0, which can have more than 5 mouse
-buttons (my mouse has 6). However, when the sixth button is pressed,
-Emacs crashes. In fact, it aborts deliberately: there is code in
-src/keyboard.c that does this if the button number is less than
-NUM_MOUSE_BUTTONS, which is defined in termhooks.h as 5. I *think*
-that if the NUM_MOUSE_BUTTONS was defined to be, say, 10, nothing
-would go wrong. (It works so far...)
-
-This error occurs with the 20.5-3 release in Mandrake 7.0 and the
-20.6-2 release in the Mandrake Cooker. I have sent in a bug report to
-the upstream emacs maintainers, but here is a suggested patch:
-
-
---- src/termhooks.h.fred Mon Feb 22 11:11:25 1999
-+++ src/termhooks.h Wed Apr 19 12:12:10 2000
-@@ -350,7 +350,7 @@
- \f
- /* This is used in keyboard.c, to tell how many buttons we will need
- to track the positions of. */
--#define NUM_MOUSE_BUTTONS (5)
-+#define NUM_MOUSE_BUTTONS (10)
-
- /* Bits in the modifiers member of the input_event structure.
- Note that reorder_modifiers assumes that the bits are in canonical
-
-
-Note that it probably isn't enough to just change the check for
-button > NUM_MOUSE_BUTTONS to not abort in keyboard.c, as there are
-some structures which depend on button being less than
-NUM_MOUSE_BUTTONS.
-
-I hope this helps.
-
---
-|>|\/|<
-----------------------------------------------------------------------------
-David M. Cooke
-cookedm@mcmaster.ca
-
-
+++ /dev/null
---- emacs-21.2/configure.in~ 2002-11-05 18:26:11.000000000 +0900
-+++ emacs-21.2/configure.in 2002-11-05 18:26:11.000000000 +0900
-@@ -1052,6 +1055,11 @@
- machine=f301 opsys=uxpv
- ;;
-
-+ ## AMD x86-64 Linux-based GNU system
-+ x86_64-*-linux-gnu* )
-+ machine=amdx86-64 opsys=gnu-linux
-+ ;;
-+
- * )
- unported=yes
- ;;
---- /dev/null 2002-11-06 15:24:04.000000000 +0900
-+++ emacs-21.2/src/m/amdx86-64.h 2002-11-06 15:24:04.000000000 +0900
-@@ -0,0 +1,131 @@
-+/* machine description file for AMD x86-64.
-+ Copyright (C) 2002 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING. If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA. */
-+
-+
-+/* The following line tells the configuration script what sort of
-+ operating system this machine is likely to run.
-+ USUAL-OPSYS="linux" */
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+ is the most significant byte. */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments. */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+ * to be corrected before they can be used as byte counts. */
-+
-+/* #define WORD_MACHINE */
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+ does not define it automatically:
-+ Ones defined so far include vax, m68000, ns16000, pyramid,
-+ orion, tahoe, APOLLO and many others */
-+/* __x86_64 defined automatically. */
-+
-+/* Use type int rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines. */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use. */
-+#define EMACS_INT long
-+#define EMACS_UINT unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+ the 24-bit bit field into an int. In other words, if bit fields
-+ are always unsigned.
-+
-+ If you use NO_UNION_TYPE, this flag does not matter. */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem. */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0 */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+ Then the function dump-emacs will not be defined
-+ and temacs will do (load "loadup") automatically unless told otherwise. */
-+
-+/* #define CANNOT_DUMP */
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+ pure and impure space as loaded can vary, and even their
-+ relative order cannot be relied on.
-+
-+ Otherwise Emacs assumes that text space precedes data space,
-+ numerically. */
-+
-+/* #define VIRT_ADDR_VARIES */
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+ and the one written in C should be used instead.
-+ Define HAVE_ALLOCA to say that the system provides a properly
-+ working alloca function and it should be used.
-+ Define neither one if an assembler-language alloca
-+ in the file alloca.s should be used. */
-+
-+#define C_ALLOCA
-+#define HAVE_ALLOCA
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+ to change the boundary between the text section and data section
-+ when Emacs is dumped. If you define this, the preloaded Lisp
-+ code will not be sharable; but that's better than failing completely. */
-+
-+/* #define NO_REMAP */
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS 60
-+
-+/* This definition of MARKBIT is necessary because of the comparison of
-+ ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-+
-+#define MARKBIT 0x8000000000000000L
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-+
-+#define XPNTR(a) XUINT (a)
-+
-+#undef START_FILES
-+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-+
-+#undef LIB_STANDARD
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
---- emacs-21.3/configure.orig 2003-03-18 15:19:12.000000000 +0100
-+++ emacs-21.3/configure 2004-07-24 01:21:59.740692929 +0200
-@@ -1686,6 +1686,11 @@
- machine=f301 opsys=uxpv
- ;;
-
-+ ## AMD x86-64 Linux-based GNU system
-+ x86_64-*-linux-gnu* )
-+ machine=amdx86-64 opsys=gnu-linux
-+ ;;
-+
- * )
- unported=yes
- ;;
+++ /dev/null
-;; Red Hat Linux default .emacs initialization file
-
-;; Are we running XEmacs or Emacs?
-(defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
-
-;; Set up the keyboard so the delete key on both the regular keyboard
-;; and the keypad delete the character under the cursor and to the right
-;; under X, instead of the default, backspace behavior.
-(global-set-key [delete] 'delete-char)
-(global-set-key [kp-delete] 'delete-char)
-
-;; Turn on font-lock mode for Emacs
-(cond ((not running-xemacs)
- (global-font-lock-mode t)
-))
-
-;; Always end a file with a newline
-(setq require-final-newline t)
-
-;; Stop at the end of the file, not just add lines
-(setq next-line-add-newlines nil)
+++ /dev/null
-diff -urN emacs-21.1.95.org/lisp/international/mule-conf.el emacs-21.1.95/lisp/international/mule-conf.el
---- emacs-21.1.95.org/lisp/international/mule-conf.el Tue Feb 26 21:51:44 2002
-+++ emacs-21.1.95/lisp/international/mule-conf.el Tue Feb 26 21:52:16 2002
-@@ -417,8 +417,7 @@
- '((ascii t) (latin-iso8859-1 katakana-jisx0201 t) t t
- nil ascii-eol ascii-cntl nil locking-shift single-shift nil nil nil
- init-bol nil nil)
-- '((safe-charsets . t)
-- (mime-charset . x-ctext)))
-+ '((safe-charsets . t)))
-
- (defvar non-standard-icccm-encodings-alist
- '(("ISO8859-15" . latin-iso8859-15)
+++ /dev/null
---- ./lisp/expand.el.fred Fri Jan 29 15:12:00 1999
-+++ ./lisp/expand.el Mon Dec 20 07:32:00 1999
-@@ -364,8 +364,9 @@
- expand-pos (expand-list-to-markers expand-list)
- expand-list nil)))
- (run-hooks 'expand-expand-hook)
-- t))))
-- )
-+ t)
-+ nil))
-+ nil))
-
- (defun expand-do-expansion ()
- (delete-backward-char (length last-abbrev-text))
---- ./src/abbrev.c.fred Tue May 18 06:38:03 1999
-+++ ./src/abbrev.c Mon Dec 20 07:30:44 1999
-@@ -365,8 +365,15 @@
-
- hook = XSYMBOL (sym)->function;
- if (!NILP (hook))
-- call0 (hook);
--
-+ {
-+ /* If the expansion is a special one, use the return value from the hook
-+ to know if the expansion happened. */
-+ if (!NILP(call0 (hook)) || STRINGP(expansion))
-+ return value;
-+ else
-+ return Qnil;
-+ }
-+
- return value;
- }
-
+++ /dev/null
---- emacs-20.6.orig/src/coding.h Fri May 19 23:20:52 2000
-+++ emacs-20.6/src/coding.h Fri May 19 22:58:43 2000
-@@ -495,6 +495,9 @@
- s2 = c2 + 0x7E; \
- } while (0)
-
-+/* Must declare this, so that we don't lose high 4 bytes on 64-bit machines. */
-+extern Lisp_Object code_convert_string_norecord ();
-+
- /* Encode the file name NAME using the specified coding system
- for file names, if any. */
- #define ENCODE_FILE(name) \
-
+++ /dev/null
---- emacs-20.6/src/widget.c.foo Fri Jun 2 16:13:23 2000
-+++ emacs-20.6/src/widget.c Fri Jun 2 16:12:00 2000
-@@ -538,7 +538,7 @@
- XtNheightInc, ch,
- XtNminWidth, base_width + min_cols * cw,
- XtNminHeight, base_height + min_rows * ch,
-- 0);
-+ NULL);
- }
-
- static void
---- emacs-20.6/lwlib/lwlib.c.foo Fri Jun 2 15:59:56 2000
-+++ emacs-20.6/lwlib/lwlib.c Fri Jun 2 16:00:26 2000
-@@ -29,6 +29,7 @@
- #include "lwlib-utils.h"
- #include <X11/StringDefs.h>
-
-+#include <stdlib.h>
- #ifdef __osf__
- #include <string.h>
- #include <stdlib.h>
+++ /dev/null
-diff -urN emacs-20.6/config.guess emacs-20.6-lia/config.guess
---- emacs-20.6/config.guess Wed Jul 14 09:49:28 1999
-+++ emacs-20.6-lia/config.guess Sun Mar 5 22:53:50 2000
-@@ -638,6 +638,7 @@
- case "$ld_supported_emulations" in
- i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
- i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
-+ elf64_ia64) echo "${UNAME_MACHINE}-pc-linux" ; exit 0 ;;
- sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-diff -urN emacs-20.6/config.sub emacs-20.6-lia/config.sub
---- emacs-20.6/config.sub Wed Jul 14 09:49:25 1999
-+++ emacs-20.6-lia/config.sub Sun Mar 5 22:52:33 2000
-@@ -167,6 +167,7 @@
- | 580 | i960 | h8300 \
- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
-+ | ia64 \
- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
-@@ -185,6 +186,10 @@
- i[34567]86)
- basic_machine=$basic_machine-pc
- ;;
-+ ia64)
-+ basic_machine=$basic_machine-pc
-+ ;;
-+
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -198,6 +203,7 @@
- | xmp-* | ymp-* \
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
-+ | ia64-* \
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- | clipper-* | orion-* \
- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-diff -urN emacs-20.6/configure.in emacs-20.6-lia/configure.in
---- emacs-20.6/configure.in Sat Feb 26 04:07:02 2000
-+++ emacs-20.6-lia/configure.in Sun Mar 5 22:42:57 2000
-@@ -928,6 +928,11 @@
- machine=wicat opsys=usg5-2
- ;;
-
-+ ## IA-64
-+ ia64*-*-linux* )
-+ machine=ia64 opsys=gnu-linux
-+ ;;
-+
- ## Intel 386 machines where we don't care about the manufacturer
- i[3456]86-*-* )
- machine=intel386
-diff -urN emacs-20.6/src/m/ia64.h emacs-20.6-lia/src/m/ia64.h
---- emacs-20.6/src/m/ia64.h Wed Dec 31 16:00:00 1969
-+++ emacs-20.6-lia/src/m/ia64.h Sun Mar 5 22:42:57 2000
-@@ -0,0 +1,210 @@
-+/* machine description file for the IA-64 architecture.
-+ Copyright (C) 1999 Free Software Foundation, Inc.
-+ Contributed by David Mosberger <davidm@hpl.hp.com>
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 1, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING. If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA. */
-+
-+
-+/* The following line tells the configuration script what sort of
-+ operating system this machine is likely to run.
-+ USUAL-OPSYS="note"
-+
-+NOTE-START
-+Use -opsystem=linux
-+NOTE-END
-+
-+*/
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+ is the most significant byte. */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments. */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+ * to be corrected before they can be used as byte counts. */
-+
-+/* #define WORD_MACHINE */
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+ does not define it automatically:
-+ Ones defined so far include vax, m68000, ns16000, pyramid,
-+ orion, tahoe, APOLLO and many others */
-+
-+/* __ia64__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines. */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use. */
-+#define EMACS_INT long
-+#define EMACS_UINT unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+ the 24-bit bit field into an int. In other words, if bit fields
-+ are always unsigned.
-+
-+ If you use NO_UNION_TYPE, this flag does not matter. */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem. */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0 */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+ Then the function dump-emacs will not be defined
-+ and temacs will do (load "loadup") automatically unless told otherwise. */
-+#if 0
-+#define CANNOT_DUMP
-+#endif
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+ pure and impure space as loaded can vary, and even their
-+ relative order cannot be relied on.
-+
-+ Otherwise Emacs assumes that text space precedes data space,
-+ numerically. */
-+
-+/* #define VIRT_ADDR_VARIES */
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+ and the one written in C should be used instead.
-+ Define HAVE_ALLOCA to say that the system provides a properly
-+ working alloca function and it should be used.
-+ Define neither one if an assembler-language alloca
-+ in the file alloca.s should be used. */
-+
-+#define HAVE_ALLOCA
-+
-+/* Define the following if GNU malloc and the relocating allocator do
-+ not work together with X. */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+ to change the boundary between the text section and data section
-+ when Emacs is dumped. If you define this, the preloaded Lisp
-+ code will not be sharable; but that's better than failing completely. */
-+
-+/* #define NO_REMAP */
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX)
-+ * do not support asynchronous I/O (using SIGIO) on sockets,
-+ * even though it works fine on tty's. If you have one of
-+ * these systems, define the following, and then use it in
-+ * config.h (or elsewhere) to decide when (not) to use SIGIO.
-+ *
-+ * You'd think this would go in an operating-system description file,
-+ * but since it only occurs on some, but not all, BSD systems, the
-+ * reasonable place to select for it is in the machine description
-+ * file.
-+ */
-+
-+/* #undef NO_SOCK_SIGIO */
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS 60
-+
-+/* This definition of MARKBIT is necessary because of the comparison of
-+ ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-+
-+#define MARKBIT 0x8000000000000000L
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+
-+#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Declare malloc and realloc in a way that is clean.
-+ But not in makefiles! */
-+
-+#ifndef NOT_C_CODE
-+/* We need these because pointers are larger than the default ints. */
-+# if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+# include <alloca.h>
-+# else
-+# include <stdlib.h>
-+# endif
-+
-+/* Hack alert! For reasons unknown to mankind the string.h file insists
-+ on defining bcopy etc. as taking char pointers as arguments. With
-+ Emacs this produces an endless amount of warning which are harmless,
-+ but tends to flood the real errors. This hack works around this problem
-+ by not prototyping. */
-+#define bcopy string_h_bcopy
-+#define bzero string_h_bzero
-+#define bcmp string_h_bcmp
-+#include <string.h>
-+#undef bcopy
-+#undef bzero
-+#undef bcmp
-+
-+/* We need to prototype these for the lib-src programs even if we don't
-+ use the system malloc for the Emacs proper. */
-+#ifdef _MALLOC_INTERNAL
-+/* These declarations are designed to match the ones in gmalloc.c. */
-+#if defined (__STDC__) && __STDC__
-+extern void *malloc (), *realloc (), *calloc ();
-+#else
-+extern char *malloc (), *realloc (), *calloc ();
-+#endif
-+#else /* not _MALLOC_INTERNAL */
-+extern void *malloc (), *realloc (), *calloc ();
-+#endif /* not _MALLOC_INTERNAL */
-+
-+extern long *xmalloc (), *xrealloc ();
-+
-+#ifdef REL_ALLOC
-+#ifndef _MALLOC_INTERNAL
-+/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
-+ is allowed to prototype these as "void *" so we don't prototype in
-+ that case. You're right: it stinks! */
-+extern char *r_alloc (), *r_re_alloc ();
-+extern void r_alloc_free ();
-+#endif /* not _MALLOC_INTERNAL */
-+#endif /* REL_ALLOC */
-+
-+#endif /* not NOT_C_CODE */
-+
-+#define DATA_SEG_BITS 0x6000000000000000
-+
-+#define HAVE_TEXT_START
+++ /dev/null
-diff -uNr emacs-20.6.orig/src/keyboard.c emacs-20.6/src/keyboard.c
---- emacs-20.6.orig/src/keyboard.c Thu May 4 11:31:08 2000
-+++ emacs-20.6/src/keyboard.c Thu May 4 11:37:56 2000
-@@ -84,9 +84,9 @@
-
- #ifdef HAVE_WINDOW_SYSTEM
- /* Make all keyboard buffers much bigger when using X windows. */
--#define KBD_BUFFER_SIZE 4096
-+#define KBD_BUFFER_SIZE 16384
- #else /* No X-windows, character input */
--#define KBD_BUFFER_SIZE 256
-+#define KBD_BUFFER_SIZE 16384
- #endif /* No X-windows */
-
- /* Following definition copied from eval.c */
+++ /dev/null
---- emacs-20.3/src/Makefile.in.linkscr Fri Feb 26 02:55:20 1999
-+++ emacs-20.3/src/Makefile.in Fri Feb 26 03:00:38 1999
-@@ -840,10 +840,17 @@
- #define MAKE_PARALLEL
- #endif
-
-+/* On the alpha the elf dumper is kind of broken... */
-+#if defined(__linux__) && defined(__alpha__)
-+LINK_SCRIPT = -Wl,-T,${srcdir}/elf64alpha.x
-+#else
-+LINK_SCRIPT =
-+#endif /* alpha linux */
-+
- temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
- $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
- -o temacs ${STARTFILES} ${obj} ${otherobj} \
-- OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
-+ OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} $(LINK_SCRIPT)
-
- /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
- often contain options that have to do with using Emacs's crt0,
---- emacs-20.3/src/elf64alpha.x.linkscr Fri Feb 26 03:01:46 1999
-+++ emacs-20.3/src/elf64alpha.x Fri Feb 26 02:54:31 1999
-@@ -0,0 +1,130 @@
-+OUTPUT_FORMAT("elf64-alpha", "elf64-alpha", "elf64-alpha")
-+OUTPUT_ARCH(alpha)
-+ENTRY(__start)
-+SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib);
-+SEARCH_DIR(/usr/alphaev5-unknown-linux-gnu/lib);
-+
-+SECTIONS
-+{
-+ /* Read-only sections, merged into text segment: */
-+ . = 0x120000000 + SIZEOF_HEADERS;
-+ .interp : { *(.interp) }
-+ .hash : { *(.hash) }
-+ .dynsym : { *(.dynsym) }
-+ .dynstr : { *(.dynstr) }
-+ .gnu.version : { *(.gnu.version) }
-+ .gnu.version_d : { *(.gnu.version_d) }
-+ .gnu.version_r : { *(.gnu.version_r) }
-+ .rel.text :
-+ { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-+ .rela.text :
-+ { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-+ .rel.data :
-+ { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-+ .rela.data :
-+ { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-+ .rel.rodata :
-+ { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-+ .rela.rodata :
-+ { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-+ .rel.got : { *(.rel.got) }
-+ .rela.got : { *(.rela.got) }
-+ .rel.ctors : { *(.rel.ctors) }
-+ .rela.ctors : { *(.rela.ctors) }
-+ .rel.dtors : { *(.rel.dtors) }
-+ .rela.dtors : { *(.rela.dtors) }
-+ .rel.init : { *(.rel.init) }
-+ .rela.init : { *(.rela.init) }
-+ .rel.fini : { *(.rel.fini) }
-+ .rela.fini : { *(.rela.fini) }
-+ .rel.bss : { *(.rel.bss) }
-+ .rela.bss : { *(.rela.bss) }
-+ .rel.plt : { *(.rel.plt) }
-+ .rela.plt : { *(.rela.plt) }
-+ .init : { *(.init) } =0x47ff041f
-+ .text :
-+ {
-+ *(.text)
-+ *(.stub)
-+ /* .gnu.warning sections are handled specially by elf32.em. */
-+ *(.gnu.warning)
-+ *(.gnu.linkonce.t*)
-+ } =0x47ff041f
-+ _etext = .;
-+ PROVIDE (etext = .);
-+ .fini : { *(.fini) } =0x47ff041f
-+ .rodata : { *(.rodata) *(.gnu.linkonce.r*) }
-+ .rodata1 : { *(.rodata1) }
-+ .reginfo : { *(.reginfo) }
-+ /* Adjust the address for the data segment. We want to adjust up to
-+ the same address within the page on the next page up. */
-+ . = ALIGN(0x100000) + (. & (0x100000 - 1));
-+ .ctors :
-+ {
-+ *(.ctors)
-+ }
-+ .dtors :
-+ {
-+ *(.dtors)
-+ }
-+ .plt : { *(.plt) }
-+ .got : { *(.got.plt) *(.got) }
-+ .dynamic : { *(.dynamic) }
-+ .data :
-+ {
-+ *(.data)
-+ *(.sdata)
-+ *(.gnu.linkonce.d*)
-+ CONSTRUCTORS
-+ }
-+ /* We want the small data sections together, so single-instruction offsets
-+ can access them all, and initialized data all before uninitialized, so
-+ we can shorten the on-disk segment size. */
-+ _edata = .;
-+ PROVIDE (edata = .);
-+ __bss_start = .;
-+ .bss :
-+ {
-+ *(.sbss) *(.scommon)
-+ *(.dynbss)
-+ *(.bss)
-+ *(COMMON)
-+ }
-+ . = ALIGN(64 / 8);
-+ _end = . ;
-+ PROVIDE (end = .);
-+ /* Stabs debugging sections. */
-+ .stab 0 : { *(.stab) }
-+ .stabstr 0 : { *(.stabstr) }
-+ .stab.excl 0 : { *(.stab.excl) }
-+ .stab.exclstr 0 : { *(.stab.exclstr) }
-+ .stab.index 0 : { *(.stab.index) }
-+ .stab.indexstr 0 : { *(.stab.indexstr) }
-+ .comment 0 : { *(.comment) }
-+ /* DWARF debug sections.
-+ Symbols in the DWARF debugging sections are relative to the beginning
-+ of the section so we begin them at 0. */
-+ /* DWARF 1 */
-+ .debug 0 : { *(.debug) }
-+ .line 0 : { *(.line) }
-+ /* GNU DWARF 1 extensions */
-+ .debug_srcinfo 0 : { *(.debug_srcinfo) }
-+ .debug_sfnames 0 : { *(.debug_sfnames) }
-+ /* DWARF 1.1 and DWARF 2 */
-+ .debug_aranges 0 : { *(.debug_aranges) }
-+ .debug_pubnames 0 : { *(.debug_pubnames) }
-+ /* DWARF 2 */
-+ .debug_info 0 : { *(.debug_info) }
-+ .debug_abbrev 0 : { *(.debug_abbrev) }
-+ .debug_line 0 : { *(.debug_line) }
-+ .debug_frame 0 : { *(.debug_frame) }
-+ .debug_str 0 : { *(.debug_str) }
-+ .debug_loc 0 : { *(.debug_loc) }
-+ .debug_macinfo 0 : { *(.debug_macinfo) }
-+ /* SGI/MIPS DWARF 2 extensions */
-+ .debug_weaknames 0 : { *(.debug_weaknames) }
-+ .debug_funcnames 0 : { *(.debug_funcnames) }
-+ .debug_typenames 0 : { *(.debug_typenames) }
-+ .debug_varnames 0 : { *(.debug_varnames) }
-+ /* These must appear regardless of . */
-+}
+++ /dev/null
---- lisp/startup.el.locale.alias Fri Feb 11 16:39:31 2000
-+++ lisp/startup.el Fri Feb 11 16:40:28 2000
-@@ -332,14 +332,7 @@
- :group 'auto-save)
-
- (defvar locale-translation-file-name
-- (let ((files '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
-- "/usr/X11R6/lib/X11/locale/locale.alias" ; e.g. RedHat 4.2
-- "/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
-- ;;
-- ;; The following name appears after the X-related names above,
-- ;; since the X-related names are what X actually uses.
-- "/usr/share/locale/locale.alias" ; GNU/Linux sans X
-- )))
-+ (let ((files '("/usr/share/locale/locale.alias")))
- (while (and files (not (file-exists-p (car files))))
- (setq files (cdr files)))
- (car files))
+++ /dev/null
---- emacs-20.5/lisp/loadup.el.loadup Fri Feb 11 16:22:32 2000
-+++ emacs-20.5/lisp/loadup.el Fri Feb 11 16:24:23 2000
-@@ -198,7 +199,9 @@
- (if (memq system-type '(ms-dos windows-nt))
- (setq name (expand-file-name
- (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
-- (setq name (concat (expand-file-name "../etc/DOC-") name))
-+ (setq name (concat (expand-file-name
-+ (if (fboundp 'x-create-frame) "../etc/DOC-X-"
-+ "../etc/DOC-")) name))
- (if (file-exists-p name)
- (delete-file name))
- (copy-file (expand-file-name "../etc/DOC") name t))
+++ /dev/null
-diff -uNr emacs-20.7.orig/etc/emacs.1 emacs-20.7/etc/emacs.1
---- emacs-20.7.orig/etc/emacs.1 Mon Apr 22 14:48:40 1996
-+++ emacs-20.7/etc/emacs.1 Tue Jul 25 12:19:57 2000
-@@ -180,13 +180,6 @@
- When you specify a font, be sure to put a space between the
- switch and the font name.
- .TP
--.BI \-b " pixels"
--Set the
--.I Emacs
--window's border width to the number of pixels specified by
--.I pixels.
--Defaults to one pixel on each side of the window.
--.TP
- .BI \-ib " pixels"
- Set the window's internal border width to the number of pixels specified
- by
+++ /dev/null
---- emacs-20.4/lisp/mail/mh-utils.el.nmh Thu Jul 22 17:32:51 1999
-+++ emacs-20.4/lisp/mail/mh-utils.el Thu Jul 22 17:38:01 1999
-@@ -606,6 +606,7 @@
- (or (mh-path-search exec-path "inc")
- (mh-path-search '("/usr/local/bin/mh/"
- "/usr/local/mh/"
-+ "/usr/bin/" ;Red Hat GNU/Linux
- "/usr/bin/mh/" ;Ultrix 4.2
- "/usr/new/mh/" ;Ultrix <4.2
- "/usr/contrib/mh/bin/" ;BSDI
-@@ -617,7 +618,7 @@
- (let ((mh-base mh-progs))
- (while (let ((dir-name (file-name-nondirectory
- (directory-file-name mh-base))))
-- (or (string= "mh" dir-name)
-+ (or (string= "nmh" dir-name)
- (string= "bin" dir-name)))
- (setq mh-base
- (file-name-directory (directory-file-name mh-base))))
-@@ -629,7 +630,7 @@
- ;; components, then look for lib/mh or mh/lib.
- (or (mh-path-search
- (mapcar (lambda (p) (expand-file-name p mh-base))
-- '("lib/mh" "etc/nmh" "/etc/nmh" "mh/lib"))
-+ '("lib/nmh" "etc/nmh" "/etc/nmh" "mh/lib"))
- "components"
- 'file-exists-p))))
- (or (and mh-lib-progs
-@@ -637,7 +638,7 @@
- (setq mh-lib-progs
- (or (mh-path-search
- (mapcar (lambda (p) (expand-file-name p mh-base))
-- '("lib/mh" "libexec/nmh" "lib/nmh" "mh/lib"))
-+ '("lib/nmh" "libexec/nmh" "lib/mh" "mh/lib"))
- "mhl")
- (mh-path-search '("/usr/local/bin/mh/") "mhl")
- (mh-path-search exec-path "mhl") ;unlikely
+++ /dev/null
-diff -Nru emacs-20.7/lisp/paths.el emacs-20.7.new/lisp/paths.el
---- emacs-20.7/lisp/paths.el Tue May 30 22:12:00 2000
-+++ emacs-20.7.new/lisp/paths.el Sun Feb 4 10:45:17 2001
-@@ -33,20 +33,13 @@
- ;;; Code:
-
- (defvar Info-default-directory-list
-- (let* ((start (list "/usr/local/lib/info/"
-- ;; This comes second so that, if it is the same
-- ;; as configure-info-directory (which is usually true)
-- ;; and Emacs has been installed (also usually true)
-- ;; then the list will end with two copies of this;
-- ;; which means that the last dir file Info-insert-dir
-- ;; finds will be the one in this directory.
-- "/usr/local/info/"))
-+ (let* ((start (list "/usr/share/info/"))
- ;; Typically on a GNU system, installed info files are found
- ;; in /usr/info, but the default prefix is /usr/local.
- ;; (Standalone info has a long list of alternative
- ;; directories to search; perhaps we should try to be more
- ;; consistent.)
-- (usrdir "/usr/info")
-+ (usrdir "/usr/share/info")
- (sysdir (and (file-directory-p usrdir)
- (not (string= configure-info-directory usrdir))
- (list usrdir)))
-@@ -74,10 +67,6 @@
-
- (defvar news-inews-program
- (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
-- ((file-exists-p "/usr/local/inews") "/usr/local/inews")
-- ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
-- ((file-exists-p "/usr/contrib/lib/news/inews") "/usr/contrib/lib/news/inews")
-- ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
- (t "inews"))
- "Program to post news.")
-
-@@ -105,18 +94,11 @@
- (defconst rmail-spool-directory
- (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
- "/usr/spool/mail/")
-- ;; On The Bull DPX/2 /usr/spool/mail is used although
-- ;; it is usg-unix-v.
-- ((string-match "^m68k-bull-sysv3" system-configuration)
-- "/usr/spool/mail/")
- ;; SVR4 and recent BSD are said to use this.
- ;; Rather than trying to know precisely which systems use it,
- ;; let's assume this dir is never used for anything else.
- ((file-exists-p "/var/mail")
- "/var/mail/")
-- ;; Many GNU/Linux systems use this name.
-- ((file-exists-p "/var/spool/mail")
-- "/var/spool/mail/")
- ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
- "/usr/mail/")
- (t "/usr/spool/mail/"))
-@@ -125,9 +107,7 @@
-
- (defconst sendmail-program
- (cond
-- ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
- ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
-- ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
- (t "fakemail")) ;In ../etc, to interface to /bin/mail.
- "Program used to send messages.")
-
-@@ -139,17 +119,6 @@
- ;; almost certainly in /bin or /usr/bin, so it's probably safe to assume
- ;; that an rsh found elsewhere is the remote shell program. The converse
- ;; is not true: /usr/bin/rsh could be either one, so check that last.
-- ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh")
-- ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh")
-- ((file-exists-p "/bin/remsh") "/bin/remsh")
-- ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh")
-- ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh")
-- ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
-- ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh")
-- ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh")
-- ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd")
-- ((file-exists-p "/bin/rcmd") "/bin/rcmd")
-- ((file-exists-p "/bin/rsh") "/bin/rsh")
- ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
- (t "rsh")))
-
-diff -Nru emacs-20.7/src/epaths.in emacs-20.7.new/src/epaths.in
---- emacs-20.7/src/epaths.in Sat Aug 16 20:29:06 1997
-+++ emacs-20.7.new/src/epaths.in Sun Feb 4 10:38:22 2001
-@@ -2,7 +2,7 @@
-
- /* The default search path for Lisp function "load".
- This sets load-path. */
--#define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp"
-+#define PATH_LOADSEARCH "/usr/share/emacs/lisp"
-
- /* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This
- path is usually identical to PATH_LOADSEARCH except that the entry
-@@ -15,25 +15,25 @@
- variable exec-path and the first file name in it sets the Lisp
- variable exec-directory. exec-directory is used for finding
- executables and other architecture-dependent files. */
--#define PATH_EXEC "/usr/local/lib/emacs/etc"
-+#define PATH_EXEC "/usr/share/emacs/etc"
-
- /* Where Emacs should look for its architecture-independent data
- files, like the NEWS file. The lisp variable data-directory
- is set to this value. */
--#define PATH_DATA "/usr/local/lib/emacs/data"
-+#define PATH_DATA "/usr/share/emacs/data"
-
- /* Where Emacs should look for X bitmap files.
- The lisp variable x-bitmap-file-path is set based on this value. */
--#define PATH_BITMAPS "/usr/include/X11/bitmaps"
-+#define PATH_BITMAPS "/usr/X11R6/lib/X11/bitmaps"
-
- /* Where Emacs should look for its docstring file. The lisp variable
- doc-directory is set to this value. */
--#define PATH_DOC "/usr/local/lib/emacs/data"
-+#define PATH_DOC "/usr/share/emacs/data"
-
- /* Where the configuration process believes the info tree lives. The
- lisp variable configure-info-directory gets its value from this
- macro, and is then used to set the Info-default-directory-list. */
--#define PATH_INFO "/usr/local/info"
-+#define PATH_INFO "/usr/share/info"
-
- /* Where Emacs should look for the application default file. */
- #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
+++ /dev/null
---- emacs-20.7/src/m/ia64.h.foo Fri Sep 22 21:22:56 2000
-+++ emacs-20.7/src/m/ia64.h Fri Sep 22 21:23:40 2000
-@@ -165,19 +165,6 @@
- # include <stdlib.h>
- # endif
-
--/* Hack alert! For reasons unknown to mankind the string.h file insists
-- on defining bcopy etc. as taking char pointers as arguments. With
-- Emacs this produces an endless amount of warning which are harmless,
-- but tends to flood the real errors. This hack works around this problem
-- by not prototyping. */
--#define bcopy string_h_bcopy
--#define bzero string_h_bzero
--#define bcmp string_h_bcmp
--#include <string.h>
--#undef bcopy
--#undef bzero
--#undef bcmp
--
- /* We need to prototype these for the lib-src programs even if we don't
- use the system malloc for the Emacs proper. */
- #ifdef _MALLOC_INTERNAL
+++ /dev/null
-diff -Nur emacs-20.7.orig/configure.in emacs-20.7/configure.in
---- emacs-20.7.orig/configure.in Thu Sep 28 21:47:46 2000
-+++ emacs-20.7/configure.in Thu Sep 28 21:58:50 2000
-@@ -787,6 +787,12 @@
- machine=stride opsys=usg5-2
- ;;
-
-+ ## IBM S/390
-+
-+ s390-*-linux-gnu* )
-+ machine=s390-linux opsys=gnu-linux
-+ ;;
-+
- ## Suns
- sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
- machine=sparc opsys=gnu-linux
-diff -Nur emacs-20.7.orig/etc/MACHINES emacs-20.7/etc/MACHINES
---- emacs-20.7.orig/etc/MACHINES Mon Aug 2 14:56:48 1999
-+++ emacs-20.7/etc/MACHINES Thu Sep 28 21:58:50 2000
-@@ -566,6 +566,13 @@
-
- window.c must not be compiled with -O on AIX.
-
-+IBM S/390 running Linux (s390-*-linux-gnu)
-+
-+ Builds with usual autoconf patches and a proper machine definition.
-+ This architecture is very new and it's compiler has some bugs.
-+ The binary is tested for basic functionality, but some hidden
-+ bugs can be expected.
-+
- Integrated Solutions `Optimum V' (m68k-isi-bsd4.2 or -bsd4.3)
-
- 18.52 said to work on some sort of ISI machine.
-diff -Nur emacs-20.7.orig/src/m/s390-linux.h emacs-20.7/src/m/s390-linux.h
---- emacs-20.7.orig/src/m/s390-linux.h Thu Jan 1 01:00:00 1970
-+++ emacs-20.7/src/m/s390-linux.h Thu Sep 28 21:58:50 2000
-@@ -0,0 +1,121 @@
-+/* machine description file template.
-+ Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING. If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA. */
-+
-+
-+/* The following line tells the configuration script what sort of
-+ operating system this machine is likely to run.
-+ USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+ is the most significant byte. */
-+
-+#define WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments. */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+ * to be corrected before they can be used as byte counts. */
-+
-+#define WORD_MACHINE
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+ does not define it automatically:
-+ Ones defined so far include vax, m68000, ns16000, pyramid,
-+ orion, tahoe, APOLLO and many others */
-+
-+/* Use type int rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines. */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+ the 24-bit bit field into an int. In other words, if bit fields
-+ are always unsigned.
-+
-+ If you use NO_UNION_TYPE, this flag does not matter. */
-+
-+#undef EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem. */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0 */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+ Then the function dump-emacs will not be defined
-+ and temacs will do (load "loadup") automatically unless told otherwise. */
-+
-+#undef CANNOT_DUMP
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+ pure and impure space as loaded can vary, and even their
-+ relative order cannot be relied on.
-+
-+ Otherwise Emacs assumes that text space precedes data space,
-+ numerically. */
-+
-+#define VIRT_ADDR_VARIES
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+ and the one written in C should be used instead.
-+ Define HAVE_ALLOCA to say that the system provides a properly
-+ working alloca function and it should be used.
-+ Define neither one if an assembler-language alloca
-+ in the file alloca.s should be used. */
-+
-+#undef C_ALLOCA
-+#define HAVE_ALLOCA
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+ to change the boundary between the text section and data section
-+ when Emacs is dumped. If you define this, the preloaded Lisp
-+ code will not be sharable; but that's better than failing completely. */
-+
-+#undef NO_REMAP
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX)
-+ * do not support asynchronous I/O (using SIGIO) on sockets,
-+ * even though it works fine on tty's. If you have one of
-+ * these systems, define the following, and then use it in
-+ * config.h (or elsewhere) to decide when (not) to use SIGIO.
-+ *
-+ * You'd think this would go in an operating-system description file,
-+ * but since it only occurs on some, but not all, BSD systems, the
-+ * reasonable place to select for it is in the machine description
-+ * file.
-+ */
-+
-+#undef NO_SOCK_SIGIO
-+
-+
-+/* After adding support for a new system, modify the large case
-+ statement in the `configure' script to recognize reasonable
-+ configuration names, and add a description of the system to
-+ `etc/MACHINES'.
-+
-+ If you've just fixed a problem in an existing configuration file,
-+ you should also check `etc/MACHINES' to make sure its descriptions
-+ of known problems in that configuration should be updated. */
+++ /dev/null
-;; Load all files from @SITE_START_DIR@
-
-(dolist
- (the-file
- (directory-files "@SITE_START_DIR@"
- t "^[^.].*\.elc?$"))
- (load the-file nil t t))
+++ /dev/null
---- emacs-20.3/lib-src/rcs2log.tmprace Mon Sep 28 12:58:46 1998
-+++ emacs-20.3/lib-src/rcs2log Mon Sep 28 13:02:15 1998
-@@ -300,8 +300,8 @@
- esac
- esac
-
--llogout=$TMPDIR/rcs2log$$l
--rlogout=$TMPDIR/rcs2log$$r
-+llogout="`/bin/mktemp $TMPDIR/rcs2log.l.XXXXXX`"
-+rlogout="`/bin/mktemp $TMPDIR/rcs2log.r.XXXXXX`"
- trap exit 1 2 13 15
- trap "rm -f $llogout $rlogout; exit 1" 0
-
+++ /dev/null
-diff -uNr emacs-20.7.orig/configure emacs-20.7/configure
---- emacs-20.7.orig/configure Mon Jun 12 16:05:56 2000
-+++ emacs-20.7/configure Tue Jun 13 14:10:43 2000
-@@ -3699,7 +3699,7 @@
- #include "confdefs.h"
-
- #include <X11/Intrinsic.h>
--#include <X11/Xaw/Simple.h>
-+#include <X11/Xaw3d/Simple.h>
- int main() {
-
- ; return 0; }
-diff -uNr emacs-20.7.orig/configure.in emacs-20.7/configure.in
---- emacs-20.7.orig/configure.in Mon Jun 5 11:42:49 2000
-+++ emacs-20.7/configure.in Tue Jun 13 14:10:43 2000
-@@ -1551,7 +1551,7 @@
- AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
- AC_TRY_LINK([
- #include <X11/Intrinsic.h>
--#include <X11/Xaw/Simple.h>],
-+#include <X11/Xaw3d/Simple.h>],
- [],
- emacs_cv_x11_version_5_with_xaw=yes,
- emacs_cv_x11_version_5_with_xaw=no))
-diff -uNr emacs-20.7.orig/src/Makefile.in emacs-20.7/src/Makefile.in
---- emacs-20.7.orig/src/Makefile.in Mon Apr 26 01:19:42 1999
-+++ emacs-20.7/src/Makefile.in Tue Jun 13 14:10:43 2000
-@@ -329,7 +329,7 @@
- #ifdef USE_X_TOOLKIT
- #define @X_TOOLKIT_TYPE@
- #if defined (LUCID) || defined (ATHENA)
--LIBW= -lXaw
-+LIBW= -lXaw3d
- #endif
- #ifdef MOTIF
- #if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)
+++ /dev/null
-[Desktop Entry]
-Name=Emacs
-Name[ko]=이맥스
-Comment=Emacs text editor
-Comment[bg]=Emacs текстов редактор
-Comment[ca]=L'editor de text Emacs
-Comment[cs]=Textový editor Emacs
-Comment[da]=Emacs tekstbehandleren
-Comment[de]=Der Texteditor Emacs
-Comment[el]=Επεξεργαστής κειμένου Emacs
-Comment[es]=Editor de textos Emacs
-Comment[et]=Tekstiredaktor Emacs
-Comment[eu]=Emacs testu editorea
-Comment[fi]=Emacs-editori
-Comment[fr]=Editeur de texte Emacs
-Comment[ga]=Eagarthóir Teacs Emacs
-Comment[gl]=Editor de texto Emacs
-Comment[hu]=Emacs szövegszerkesztő
-Comment[it]=Editor di testo Emacs
-Comment[ja]=Emacsテキストエディタ
-Comment[ko]=이맥스 문서 편집기
-Comment[nb]=Teksteditoren Emacs
-Comment[nl]=Emacs tekst editor
-Comment[pl]=Edytor tekstu Emacs
-Comment[pt]=Editor de texto Emacs
-Comment[pt_BR]=Editor de texto Emacs
-Comment[ru]=Текстовый редактор Emacs
-Comment[sv]=Emacs texteditor
-Comment[tr]=Emacs metin editörü
-Comment[uk]=Текстовий редактор
-Comment[wa]=L' aspougneu di tekse Emacs
-Comment[zh_CN]=Emacs 文字编缉器
-Comment[zh_TW]=Emacs 文字編緝器
-TryExec=emacs
-Exec=emacs
-Icon=emacs.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=TextEditor;
-# vi: encoding=utf-8