rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2007-05-22 14:44:16 +00:00 committed by Git OBS Bridge
parent 562c054c2c
commit efe1e87381
36 changed files with 2687 additions and 3363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dot.gnu-emacs
View File

@ -184,9 +184,12 @@
:group 'font-lock-highlighting-faces)
;; Enable font lock support
(setq font-lock-support-mode '((latex-mode . fast-lock-mode) (t . lazy-lock-mode)))
(add-hook 'after-init-hook '(lambda () (global-font-lock-mode 1)))
(require 'font-lock)
(cond ((and (boundp 'jit-lock-mode) (symbol-value 'jit-lock-mode))
(setq font-lock-support-mode '((latex-mode . fast-lock-mode) (t . jit-lock-mode))))
((and (boundp 'lazy-lock-mode) (symbol-value 'lazy-lock-mode))
(setq font-lock-support-mode '((latex-mode . fast-lock-mode) (t . lazy-lock-mode)))))
(add-hook 'after-init-hook '(lambda () (global-font-lock-mode 1)))
;;
;; Some dialog

29
emacs-21.1-decl.dif
View File

@ -1,29 +0,0 @@
--- src/frame.c
+++ src/frame.c Wed Oct 24 18:23:30 2001
@@ -22,6 +22,9 @@
#include <config.h>
#include <stdio.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
#include "lisp.h"
#include "charset.h"
#ifdef HAVE_X_WINDOWS
--- src/lisp.h
+++ src/lisp.h Wed Oct 24 18:24:06 2001
@@ -1954,12 +1954,11 @@
EXFUN (Fencode_coding_string, 3);
EXFUN (Fdecode_coding_string, 3);
extern Lisp_Object detect_coding_system P_ ((unsigned char *, int, int, int));
-Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object, int));
+extern Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object,
+ int));
extern void init_coding P_ ((void));
extern void init_coding_once P_ ((void));
extern void syms_of_coding P_ ((void));
-extern Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object,
- int));
/* Defined in charset.c */
extern int nonascii_insert_offset;

28
emacs-21.1-ps-bdf.patch
View File

@ -1,28 +0,0 @@
--- lisp/ps-bdf.el
+++ lisp/ps-bdf.el Wed Oct 24 18:38:39 2001
@@ -43,9 +43,9 @@
(if (and (memq system-type '(ms-dos windows-nt))
(boundp 'installation-directory))
(list (expand-file-name "fonts/bdf" installation-directory))
- '("/usr/local/share/emacs/fonts/bdf"))
+ '("/usr/share/fonts/bdf"))
"*List of directories to search for `BDF' font files.
-The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
+The default value is '(\"/usr/share/fonts/bdf\").")
;; MS-DOS and MS-Windows users like to move the binary around after
;; it's built, but the value above is computed at load-up time.
--- lisp/loaddefs.el
+++ lisp/loaddefs.el Wed Oct 24 18:41:39 2001
@@ -12578,9 +12578,9 @@
;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (15272 24982))
;;; Generated autoloads from ps-bdf.el
-(defvar bdf-directory-list (if (and (memq system-type (quote (ms-dos windows-nt))) (boundp (quote installation-directory))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\
+(defvar bdf-directory-list (if (and (memq system-type (quote (ms-dos windows-nt))) (boundp (quote installation-directory))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/share/fonts/bdf"))) "\
*List of directories to search for `BDF' font files.
-The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
+The default value is '(\"/usr/share/fonts/bdf\").")
;;;***

323
emacs-21.1-s390x.patch
View File

@ -1,323 +0,0 @@
--- configure.in
+++ configure.in Wed Oct 24 18:09:48 2001
@@ -986,6 +986,12 @@
machine=wicat opsys=usg5-2
;;
+ ## S/390 und zSerie
+ s390-*-linux* )
+ machine=s390-linux opsys=gnu-linux ;;
+ s390x-*-linux* )
+ machine=s390x-linux opsys=gnu-linux ;;
+
## IA-64
ia64*-*-linux* )
machine=ia64 opsys=gnu-linux
--- etc/MACHINES
+++ etc/MACHINES Wed Oct 24 18:09:48 2001
@@ -599,6 +599,20 @@
window.c must not be compiled with -O on AIX.
+IBM S/390 running Linux (s390-*-linux)
+
+ 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.
+
+IBM zSeries running Linux (s390x-*-linux)
+
+ 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.
--- src/m/s390-linux.h
+++ src/m/s390-linux.h Wed Oct 24 18:09:48 2001
@@ -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. */
--- src/m/s390x-linux.h
+++ src/m/s390x-linux.h Wed Oct 24 18:09:48 2001
@@ -0,0 +1,157 @@
+/* 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 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. */
+
+#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 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. */
+
+#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. */
+
+#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 LINKER $(CC) -nostdlib
+
+/* 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
+

174
emacs-21.2-x86_64.patch
View File

@ -1,174 +0,0 @@
--- configure.in
+++ configure.in
@@ -1058,6 +1058,12 @@
machine=f301 opsys=uxpv
;;
+ ## AMD x86-64 Linux-based GNU system
+ x86_64-*-linux* )
+ machine=amdx86-64 opsys=gnu-linux
+ ;;
+
+
* )
unported=yes
;;
--- src/m/amdx86-64.h
+++ src/m/amdx86-64.h
@@ -0,0 +1,156 @@
+/* machine description file for AMD x86-64.
+ Copyright (C) 1985, 1986, 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 */
+
+/* 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.
+ */
+
+/* #define 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. */
+
+#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
+

31
emacs-21.3-asian-dired.patch
View File

@ -1,31 +0,0 @@
--- lisp/dired.el
+++ lisp/dired.el Wed Jul 23 17:39:02 2003
@@ -1514,6 +1514,9 @@
(month (concat l l "+[.]?,? *"))
;; Recognize any non-ASCII character.
;; The purpose is to match a Kanji character.
+;;old (ksc "[^\0-\128]+")
+ (ksc (concat "\\(³â\\|¿ù\\|ÀÏ\\)"))
+
(k "[^\0-\177]")
;; (k "[^\x00-\x7f\x80-\xff]")
(s " ")
@@ -1537,7 +1540,8 @@
"\\)"))
(japanese
(concat mm k "?" s dd k "?" s "+"
- "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
+ "\\(" HH:MM "\\|" yyyy k "?" "\\)"))
+ (korean (concat mm ksc "?" s dd s "\\(" HH:MM "\\|" s yyyy "\\)")))
;; The "[0-9]" below requires the previous column to end in a digit.
;; This avoids recognizing `1 may 1997' as a date in the line:
;; -r--r--r-- 1 may 1997 1168 Oct 19 16:49 README
@@ -1546,7 +1550,7 @@
;; This avoids recognizing `jservice 10 1024' as a date in the line:
;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host
(concat ".*[0-9][kKMGTPEZY]?"
- s "\\(" western "\\|" japanese "\\|" iso "\\)" s))
+ s "\\(" western "\\|" korean "\\|" japanese "\\|" iso "\\)" s))
"Regular expression to match up to the file name in a directory listing.
The default value is designed to recognize dates and times
regardless of the language.")

183
emacs-21.3-config.dif
View File

@ -1,183 +0,0 @@
--- configure.in
+++ configure.in Wed Jul 23 17:50:25 2003
@@ -1127,8 +1127,8 @@
case ${with_gcc} in
"yes" ) CC="gcc" GCC=yes ;;
"no" ) : ${CC=cc} ;;
- * ) AC_PROG_CC
esac
+AC_PROG_CC
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
@@ -1332,6 +1332,9 @@
CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
fi
+dnl For AC_FUNC_GETLOADAVG, at least:
+AC_CONFIG_LIBOBJ_DIR(src)
+
dnl Do this early because it can frob feature test macros for Unix-98 &c.
AC_SYS_LARGEFILE
@@ -1549,9 +1552,9 @@
AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
AC_CACHE_CHECK(whether __after_morecore_hook exists,
emacs_cv_var___after_morecore_hook,
-AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
+[AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
emacs_cv_var___after_morecore_hook=yes,
- emacs_cv_var___after_morecore_hook=no))
+ emacs_cv_var___after_morecore_hook=no)])
if test $emacs_cv_var___after_morecore_hook = no; then
doug_lea_malloc=no
fi
@@ -1695,11 +1698,11 @@
if test "${window_system}" = "x11"; then
AC_MSG_CHECKING(X11 version 6)
AC_CACHE_VAL(emacs_cv_x11_version_6,
- AC_TRY_LINK([#include <X11/Xlib.h>],
+ [AC_TRY_LINK([#include <X11/Xlib.h>],
[#if XlibSpecificationRelease < 6
fail;
#endif
-], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no))
+], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)])
if test $emacs_cv_x11_version_6 = yes; then
AC_MSG_RESULT(6 or newer)
AC_DEFINE(HAVE_X11R6)
@@ -1711,11 +1714,11 @@
if test "${window_system}" = "x11"; then
AC_MSG_CHECKING(X11 version 5)
AC_CACHE_VAL(emacs_cv_x11_version_5,
- AC_TRY_LINK([#include <X11/Xlib.h>],
+ [AC_TRY_LINK([#include <X11/Xlib.h>],
[#if XlibSpecificationRelease < 5
fail;
#endif
-], emacs_cv_x11_version_5=yes, emacs_cv_x11_version_5=no))
+], emacs_cv_x11_version_5=yes, emacs_cv_x11_version_5=no)])
if test $emacs_cv_x11_version_5 = yes; then
AC_MSG_RESULT(5 or newer)
HAVE_X11R5=yes
@@ -1732,12 +1735,12 @@
if test x"${HAVE_X11R5}" = xyes; then
AC_MSG_CHECKING(X11 version 5 with Xaw)
AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
- AC_TRY_LINK([
+ [AC_TRY_LINK([
#include <X11/Intrinsic.h>
#include <X11/Xaw/Simple.h>],
[],
emacs_cv_x11_version_5_with_xaw=yes,
- emacs_cv_x11_version_5_with_xaw=no))
+ emacs_cv_x11_version_5_with_xaw=no)])
if test $emacs_cv_x11_version_5_with_xaw = yes; then
AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
USE_X_TOOLKIT=LUCID
@@ -1755,11 +1758,11 @@
if test "${USE_X_TOOLKIT}" != "none"; then
AC_MSG_CHECKING(X11 toolkit version)
AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6,
- AC_TRY_LINK([#include <X11/Intrinsic.h>],
+ [AC_TRY_LINK([#include <X11/Intrinsic.h>],
[#if XtSpecificationRelease < 6
fail;
#endif
-], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no))
+], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no)])
HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
if test $emacs_cv_x11_toolkit_version_6 = yes; then
AC_MSG_RESULT(6 or newer)
@@ -1789,13 +1792,13 @@
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
- AC_TRY_COMPILE([#include <Xm/Xm.h>],
+ [AC_TRY_COMPILE([#include <Xm/Xm.h>],
[#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
int x = 5;
#else
Motif version prior to 2.1.
#endif],
- emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no))
+ emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)])
HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
if test $emacs_cv_motif_version_2_1 = yes; then
HAVE_LIBXP=no
@@ -1944,9 +1947,9 @@
# If netdb.h doesn't declare h_errno, we must declare it by hand.
AC_CACHE_CHECK(whether netdb declares h_errno,
emacs_cv_netdb_declares_h_errno,
-AC_TRY_LINK([#include <netdb.h>],
+[AC_TRY_LINK([#include <netdb.h>],
[return h_errno;],
- emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no))
+ emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no)])
if test $emacs_cv_netdb_declares_h_errno = yes; then
AC_DEFINE(HAVE_H_ERRNO)
fi
@@ -2044,11 +2047,11 @@
AC_CHECK_HEADERS(krb5.h)
else
AC_CHECK_HEADERS(des.h,,
- AC_CHECK_HEADERS(kerberosIV/des.h,,
- AC_CHECK_HEADERS(kerberos/des.h)))
+ [AC_CHECK_HEADERS(kerberosIV/des.h,,
+ [AC_CHECK_HEADERS(kerberos/des.h)])])
AC_CHECK_HEADERS(krb.h,,
- AC_CHECK_HEADERS(kerberosIV/krb.h,,
- AC_CHECK_HEADERS(kerberos/krb.h)))
+ [AC_CHECK_HEADERS(kerberosIV/krb.h,,
+ [AC_CHECK_HEADERS(kerberos/krb.h)])])
fi
AC_CHECK_HEADERS(com_err.h)
fi
@@ -2105,7 +2108,7 @@
AC_CHECK_FUNCS(gettimeofday)
AC_CACHE_CHECK(whether gettimeofday can accept two arguments,
emacs_cv_gettimeofday_two_arguments,
- AC_TRY_COMPILE([
+ [AC_TRY_COMPILE([
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
@@ -2119,7 +2122,7 @@
[struct timeval time;
gettimeofday (&time, 0);],
emacs_cv_gettimeofday_two_arguments=yes,
- emacs_cv_gettimeofday_two_arguments=no))
+ emacs_cv_gettimeofday_two_arguments=no)])
if test $emacs_cv_gettimeofday_two_arguments = no; then
AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)
fi
@@ -2356,7 +2359,7 @@
sed -e '1,/start of cpp stuff/d'\
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
< Makefile.c > junk.c
- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+ $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
cat junk1.c junk2.c > Makefile.new
rm -f junk.c junk1.c junk2.c
@@ -2372,7 +2375,7 @@
sed -e '1,/start of cpp stuff/d'\
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
< Makefile.c > junk.c
- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+ $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
cat junk1.c junk2.c > Makefile.new
rm -f junk.c junk1.c junk2.c
@@ -2380,9 +2383,9 @@
mv -f Makefile.new Makefile
)
-if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then
+if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
echo creating src/.gdbinit
- echo source $top_srcdir/src/.gdbinit > src/.gdbinit
+ echo source $srcdir/src/.gdbinit > src/.gdbinit
fi
# This is how we know whether to re-run configure in certain cases.

72
emacs-21.3-format1.dif
View File

@ -1,72 +0,0 @@
--- src/lisp.h
+++ src/lisp.h 2007-05-15 13:43:33.195341769 +0000
@@ -2402,7 +2402,11 @@ EXFUN (Fbolp, 0);
EXFUN (Fbobp, 0);
EXFUN (Fformat, MANY);
EXFUN (Fmessage, MANY);
+#ifdef NO_ARG_ARRAY
extern Lisp_Object format1 P_ ((/* char *, ... */));
+#else
+extern Lisp_Object format1 P_ ((char *, ...));
+#endif
extern Lisp_Object make_buffer_string P_ ((int, int, int));
EXFUN (Fbuffer_substring, 2);
EXFUN (Fbuffer_string, 0);
--- src/editfns.c
+++ src/editfns.c 2007-05-15 13:41:46.023982028 +0000
@@ -20,6 +20,7 @@ the Free Software Foundation, Inc., 59 T
Boston, MA 02111-1307, USA. */
+#include <stdarg.h>
#include <config.h>
#include <sys/types.h>
@@ -3517,11 +3518,11 @@ Use %% to put a single % into the output
Lisp_Object
#ifdef NO_ARG_ARRAY
format1 (string1, arg0, arg1, arg2, arg3, arg4)
+ char *string1;
EMACS_INT arg0, arg1, arg2, arg3, arg4;
#else
-format1 (string1)
+format1 (char *string1, ...)
#endif
- char *string1;
{
char buf[100];
#ifdef NO_ARG_ARRAY
@@ -3533,7 +3534,32 @@ format1 (string1)
args[4] = arg4;
doprnt (buf, sizeof buf, string1, (char *)0, 5, (char **) args);
#else
- doprnt (buf, sizeof buf, string1, (char *)0, 5, &string1 + 1);
+ const char *fmt = string1;
+ int nargs = 0;
+ long args[5];
+ va_list ap;
+
+ va_start(ap, string1);
+ while (*fmt && nargs < 5) {
+ if (*fmt++ == '%') {
+ void *va = NULL;
+ switch (*fmt) {
+ case 's':
+ va = (void*)va_arg(ap, char*);
+ break;
+ case 'd':
+ case 'c':
+ va = (void*)va_arg(ap, int);
+ break;
+ default:
+ break;
+ }
+ if (va)
+ args[nargs++] = (long)va;
+ }
+ }
+ va_end(ap);
+ doprnt (buf, sizeof buf, string1, string1 + strlen(string1), nargs, (char **)args);
#endif
return build_string (buf);
}

32
emacs-21.3-level3.patch
View File

@ -1,32 +0,0 @@
--- src/xterm.h
+++ src/xterm.h
@@ -21,8 +21,8 @@
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
-#include <X11/Xutil.h>
#include <X11/keysym.h>
+#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/Xresource.h>
--- src/xterm.c
+++ src/xterm.c Wed Oct 13 18:11:49 2004
@@ -10533,6 +10533,17 @@
|| ((unsigned)(orig_keysym) == XK_Num_Lock)
#endif
#endif /* not HAVE_X11R5 */
+ /* The symbols from XK_ISO_Lock
+ to XK_ISO_Last_Group_Lock
+ don't have real modifiers but
+ should be treated similarly to
+ Mode_switch by Emacs. */
+#if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock
+ || ((unsigned)(orig_keysym)
+ >= XK_ISO_Lock
+ && (unsigned)(orig_keysym)
+ <= XK_ISO_Last_Group_Lock)
+#endif
))
{
if (temp_index == sizeof temp_buffer / sizeof (short))

66
emacs-21.3-movemail.patch
View File

@ -1,66 +0,0 @@
--- emacs-21.3/lib-src/movemail.c
+++ emacs-21.3/lib-src/movemail.c
@@ -245,7 +245,7 @@
#endif
if (*outname == 0)
- fatal ("Destination file name is empty", 0);
+ fatal ("Destination file name is empty", 0, 0);
/* Check access to output file. */
if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
@@ -601,12 +601,12 @@
/* Print error message and exit. */
void
-fatal (s1, s2)
- char *s1, *s2;
+fatal (s1, s2, s3)
+ char *s1, *s2, *s3;
{
if (delete_lockname)
unlink (delete_lockname);
- error (s1, s2, 0);
+ error (s1, s2, s3);
exit (1);
}
@@ -631,17 +631,16 @@
pfatal_with_name (name)
char *name;
{
- char *s = concat ("", strerror (errno), " for %s");
- fatal (s, name);
+ fatal ("%s for %s", strerror (errno), name);
}
void
pfatal_and_delete (name)
char *name;
{
- char *s = concat ("", strerror (errno), " for %s");
+ char *s = strerror (errno);
unlink (name);
- fatal (s, name);
+ fatal ("%s for %s", s, name);
}
/* Return a newly-allocated string whose contents concatenate those of s1, s2, s3. */
@@ -669,7 +668,7 @@
{
long *result = (long *) malloc (size);
if (!result)
- fatal ("virtual memory exhausted", 0);
+ fatal ("virtual memory exhausted", 0, 0);
return result;
}
@@ -787,7 +786,7 @@
mbx_delimit_begin (mbf);
if (pop_retr (server, i, mbf) != OK)
{
- error (Errmsg, 0, 0);
+ error ("%s", Errmsg, 0);
close (mbfi);
return (1);
}

69
emacs-21.3-nonvoid.patch
View File

@ -1,69 +0,0 @@
--- lwlib/lwlib-Xaw.c
+++ lwlib/lwlib-Xaw.c
@@ -601,11 +601,11 @@
xaw_create_scrollbar (instance)
widget_instance *instance;
{
+ Widget scrollbar = (Widget)0;
#if 0
Arg av[20];
int ac = 0;
Dimension width;
- Widget scrollbar;
XtVaGetValues (instance->parent, XtNwidth, &width, NULL);
@@ -632,8 +632,8 @@
XtAddCallback (scrollbar, "scrollProc", xaw_scrollbar_scroll,
(XtPointer) instance);
- return scrollbar;
#endif
+ return scrollbar;
}
static Widget
--- src/keyboard.c
+++ src/keyboard.c
@@ -1317,6 +1317,7 @@
Lisp_Object arg;
{
cancel_hourglass ();
+ return Qnil;
}
#endif
--- src/syntax.c
+++ src/syntax.c
@@ -2409,6 +2409,7 @@
Fcons (make_number (from), Qnil))));
/* NOTREACHED */
+ return Qnil;
}
DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0,
--- src/xmenu.c
+++ src/xmenu.c
@@ -695,8 +695,8 @@
Lisp_Object keymap, tem;
int xpos = 0, ypos = 0;
Lisp_Object title;
- char *error_name;
- Lisp_Object selection;
+ char *error_name = (char*)0;
+ Lisp_Object selection = (Lisp_Object)0;
struct frame *f = NULL;
Lisp_Object x, y, window;
int keymaps = 0;
@@ -972,8 +972,8 @@
#else
{
Lisp_Object title;
- char *error_name;
- Lisp_Object selection;
+ char *error_name = (char*)0;
+ Lisp_Object selection = (Lisp_Object)0;
/* Decode the dialog items from what was specified. */
title = Fcar (contents);

101
emacs-21.3-ppc64.patch
View File

@ -1,101 +0,0 @@
---
configure.in | 2 ++
src/m/macppc.h | 11 +++++++++++
src/unexelf.c | 27 +++++++++++++++++++++++----
3 files changed, 36 insertions(+), 4 deletions(-)
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -279,6 +279,8 @@ case "${canonical}" in
;;
ppc-*-linux* | \
+ ppc64-*-linux | \
+ powerpc64-*-linux* | \
powerpc-*-linux* )
machine=macppc opsys=gnu-linux
;;
Index: src/m/macppc.h
===================================================================
--- src/m/macppc.h.orig
+++ src/m/macppc.h
@@ -95,7 +95,18 @@ Boston, MA 02111-1307, USA. */
#ifdef LINUX
#define LINKER $(CC) -nostdlib
+#ifdef __powerpc64__
+#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf64ppc
+#undef START_FILES
+#undef LIB_STANDARD
+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+#ifndef _LP64
+#define _LP64
+#endif
+#else
#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc
+#endif
/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
because prefix-args is not used. */
#undef LD_SWITCH_SYSTEM_TEMACS
Index: src/unexelf.c
===================================================================
--- src/unexelf.c.orig
+++ src/unexelf.c
@@ -697,7 +697,7 @@ unexec (new_name, old_name, data_start,
ElfW(Addr) new_data2_addr;
int n, nn;
- int old_bss_index, old_sbss_index;
+ int old_bss_index, old_sbss_index, old_plt_index;
int old_data_index, new_data2_index;
int old_mdebug_index;
struct stat stat_buf;
@@ -756,15 +756,34 @@ unexec (new_name, old_name, data_start,
old_sbss_index = find_section (".sbss", old_section_names,
old_name, old_file_h, old_section_h, 1);
if (old_sbss_index != -1)
- if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+ if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
old_sbss_index = -1;
- if (old_sbss_index == -1)
+ /* PowerPC64 has .plt in the BSS section. */
+ old_plt_index = find_section (".plt", old_section_names,
+ old_name, old_file_h, old_section_h, 1);
+ if (old_plt_index != -1)
+ if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+ old_plt_index = -1;
+
+ if (old_sbss_index == -1 && old_plt_index == -1)
{
old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
new_data2_index = old_bss_index;
}
+ else if (old_plt_index != -1
+ && (old_sbss_index == -1
+ || (OLD_SECTION_H (old_sbss_index).sh_addr
+ > OLD_SECTION_H (old_plt_index).sh_addr)))
+ {
+ old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+ old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+ + OLD_SECTION_H (old_plt_index).sh_size;
+ if (old_sbss_index != -1)
+ old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+ new_data2_index = old_plt_index;
+ }
else
{
old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -955,7 +974,7 @@ unexec (new_name, old_name, data_start,
if (n == old_bss_index
/* The new bss and sbss section's size is zero, and its file offset
and virtual address should be off by NEW_DATA2_SIZE. */
- || n == old_sbss_index
+ || n == old_sbss_index || n == old_plt_index
)
{
/* NN should be `old_s?bss_index + 1' at this point. */

35
emacs-21.3-ps-mule.patch
View File

@ -1,35 +0,0 @@
--- lisp/ps-mule.el
+++ lisp/ps-mule.el 2003-07-22 13:18:56.000000000 +0200
@@ -300,7 +300,9 @@
(defconst ps-mule-font-info-database-latin
'((latin-iso8859-1
- (normal nil nil iso-latin-1)))
+ (normal nil nil iso-latin-1))
+ (latin-iso8859-15
+ (normal nil nil iso-latin-9)))
"Sample setting of `ps-mule-font-info-database' to use latin fonts.")
(defcustom ps-mule-font-info-database-default
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2003-07-24 12:49:02.000000000 +0200
@@ -1031,9 +1031,17 @@
(nth 5 (assoc ispell-dictionary ispell-dictionary-alist)))
(defun ispell-get-extended-character-mode ()
(nth 6 (assoc ispell-dictionary ispell-dictionary-alist)))
+;;
+;; Most languages in ISO-8859-15 for EURO symbols uses ISO-8859-1 chars
+;(defun ispell-get-coding-system ()
+; (nth 7 (assoc ispell-dictionary ispell-dictionary-alist)))
+;;
(defun ispell-get-coding-system ()
- (nth 7 (assoc ispell-dictionary ispell-dictionary-alist)))
-
+ (let ((sys (nth 7 (assoc ispell-dictionary ispell-dictionary-alist))))
+ (if (and (boundp 'buffer-file-coding-system)
+ (eq buffer-file-coding-system 'iso-latin-9)
+ (eq sys 'iso-latin-1))
+ 'iso-latin-9 sys)))
(defvar ispell-pdict-modified-p nil
"Non-nil means personal dictionary has modifications to be saved.")

16
emacs-21.3-sendmail-path.patch
View File

@ -1,16 +0,0 @@
--- lisp/paths.el.orig 2004-08-12 12:33:54.446194169 +0000
+++ lisp/paths.el 2004-08-12 12:34:55.480473601 +0000
@@ -161,12 +161,7 @@
"Name of directory used by system mailer for delivering new mail.
Its name should end with a slash.")
-(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.
+(defconst sendmail-program "/usr/sbin/sendmail"
"Program used to send messages.")
(defconst remote-shell-program

79
emacs-21.3-sentinel.patch
View File

@ -1,79 +0,0 @@
--- src/fileio.c
+++ src/fileio.c 2005-04-14 11:48:08.126387433 +0000
@@ -19,6 +19,7 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#undef _GNU_SOURCE
#define _GNU_SOURCE /* for euidaccess */
#include <config.h>
--- src/sysdep.c
+++ src/sysdep.c
@@ -868,7 +868,7 @@
if (pid == -1)
write (1, "Can't execute subshell", 22);
#else /* not WINDOWSNT */
- execlp (sh, sh, 0);
+ execlp (sh, sh, (void*)0);
write (1, "Can't execute subshell", 22);
_exit (1);
#endif /* not WINDOWSNT */
--- src/sound.c
+++ src/sound.c 2005-04-14 11:38:45.949336705 +0000
@@ -33,6 +33,7 @@
#include "dispextern.h"
#include "atimer.h"
#include <signal.h>
+#include <sys/ioctl.h>
#include "syssignal.h"
/* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention
--- lib-src/cvtmail.c
+++ lib-src/cvtmail.c 2005-04-14 11:36:08.916622298 +0000
@@ -35,10 +35,8 @@
#include <stdio.h>
-
-char *malloc ();
-char *realloc ();
-char *getenv ();
+#include <stdlib.h>
+#include <string.h>
char *xmalloc ();
char *xrealloc ();
--- lib-src/yow.c
+++ lib-src/yow.c 2005-04-14 11:37:43.136050909 +0000
@@ -11,6 +11,9 @@
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <ctype.h>
#include <../src/epaths.h> /* For PATH_DATA. */
@@ -33,8 +36,6 @@
&res;})
#endif
-char *malloc(), *realloc();
-
void yow();
void setup_yow();
--- lib-src/test-distrib.c
+++ lib-src/test-distrib.c 2005-04-14 11:34:32.072599095 +0000
@@ -24,6 +24,9 @@
#endif
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>

73
emacs-21.3-term.patch
View File

@ -1,73 +0,0 @@
--- lisp/term.el
+++ lisp/term.el Wed Jul 23 17:53:03 2003
@@ -658,10 +658,6 @@
(put 'term-scroll-show-maximum-output 'permanent-local t)
(put 'term-ptyp 'permanent-local t)
-;; Do FORMS if running under Emacs 19 or later.
-(defmacro term-if-emacs19 (&rest forms)
- (if (string-match "^\\(19\\|[2-9][0-9]\\)" emacs-version)
- (cons 'progn forms)))
;; True if running under XEmacs (previously Lucid Emacs).
(defmacro term-is-xemacs () '(string-match "Lucid" emacs-version))
;; Do FORM if running under XEmacs (previously Lucid Emacs).
@@ -1039,7 +1035,7 @@
;; Menu bars:
(term-ifnot-xemacs
- (term-if-emacs19
+ (progn
;; terminal:
(let (newmap)
@@ -1275,7 +1271,7 @@
;;; Added nearly all the 'grey keys' -mm
- (term-if-emacs19
+ (progn
(term-if-xemacs
(define-key term-raw-map [button2] 'term-mouse-paste))
(term-ifnot-xemacs
@@ -1380,7 +1376,7 @@
;; Crank up a new process
(let ((proc (term-exec-1 name buffer command switches)))
(make-local-variable 'term-ptyp)
- (setq term-ptyp process-connection-type) ; T if pty, NIL if pipe.
+ (setq term-ptyp process-connection-type) ; t if pty, nil if pipe.
;; Jump to the end, and set the process mark.
(goto-char (point-max))
(set-marker (process-mark proc) (point))
@@ -1434,6 +1430,7 @@
(format "TERMINFO=%s" data-directory)
(format term-termcap-format "TERMCAP="
term-term-name term-height term-width))
+ ;; Breaks `./configure' of w3 and url which try to run $EMACS.
(format "EMACS=%s (term:%s)" emacs-version term-protocol-version)
(format "LINES=%d" term-height)
(format "COLUMNS=%d" term-width))
@@ -1994,13 +1991,13 @@
initial string matching regexp term-prompt-regexp.
term-input-filter-functions monitors input for \"cd\", \"pushd\", and
\"popd\" commands. When it sees one, it cd's the buffer.
- term-input-filter is the default: returns T if the input isn't all white
+ term-input-filter is the default: returns t if the input isn't all white
space.
If the term is Lucid Common Lisp,
term-get-old-input snarfs the sexp ending at point.
term-input-filter-functions does nothing.
- term-input-filter returns NIL if the input matches input-filter-regexp,
+ term-input-filter returns nil if the input matches input-filter-regexp,
which matches (1) all whitespace (2) :a, :c, etc.
Similarly for Soar, Scheme, etc."
@@ -3343,7 +3340,7 @@
(define-key map ">" 'term-pager-eob)
;; Add menu bar.
- (term-if-emacs19
+ (progn
(term-ifnot-xemacs
(define-key map [menu-bar terminal] term-terminal-menu)
(define-key map [menu-bar signals] term-signals-menu)

3
emacs-21.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b2bdd163ac9b908bef55c1d1cd902efbf812c74a18c1a97e676a0f721e4371b
size 16038934

12
emacs-22.0.99-decl.dif Normal file
View File

@ -0,0 +1,12 @@
--- src/frame.c
+++ src/frame.c 2007-05-15 17:52:06.326432380 +0200
@@ -22,6 +22,9 @@ Boston, MA 02110-1301, USA. */
#include <config.h>
#include <stdio.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
#include "lisp.h"
#include "charset.h"
#ifdef HAVE_X_WINDOWS

53
emacs-21.1-glibc.patch → emacs-22.0.99-glibc.patch
View File

@ -1,10 +1,10 @@
* This patch should tell lib-src/Makefile
that it can use regex and getopt from GNU LibC
-- Stepan Kasal <kasal@suse.cz>
-- Stepan Kasal <kasal@suse.cz>
--- lib-src/Makefile.in
+++ lib-src/Makefile.in Wed Oct 24 18:17:04 2001
@@ -236,6 +236,8 @@
+++ lib-src/Makefile.in 2007-05-15 17:48:45.509066296 +0200
@@ -248,6 +248,8 @@ LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_S
the information in ../src/config.h. */
ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
@ -13,46 +13,45 @@
LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
-I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
@@ -349,6 +351,10 @@
$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
./test-distrib ${srcdir}/testfile
@@ -394,12 +396,17 @@ getopt.h: getopt_.h
cp $(srcdir)/getopt_.h $@-t
mv $@-t $@
+#ifdef GETOPT_IN_LIBC
+GETOPTOBJS =
+GETOPTDEPS =
+#else
GETOPTOBJS = getopt.o getopt1.o $(ALLOCA)
GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
@@ -357,6 +363,7 @@
GETOPTOBJS = @GETOPTOBJS@
GETOPTDEPS = $(GETOPTOBJS) $(GETOPT_H)
getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H)
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
alloca.o: ${srcdir}/alloca.c
${CC} -Demacs -c ${BASE_CFLAGS} ${srcdir}/alloca.c
+#endif
#ifdef REGEXP_IN_LIBC
REGEXPOBJ =
@@ -370,7 +377,7 @@
@@ -413,7 +420,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcd
${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
etags: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
- $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+ $(CC) ${ETAGS_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
- $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+ $(CC) ${ETAGS_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
ebrowse: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
@@ -378,7 +385,7 @@
/* We depend on etags to assure that parallel makes don't write two
@@ -421,7 +428,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
/* We depend on etags to assure that parallel makes don\'t write two
etags.o files on top of each other. */
ctags: etags
- $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+ $(CC) ${ETAGS_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
ctags${EXEEXT}: etags${EXEEXT}
- $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+ $(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
profile: ${srcdir}/profile.c ../src/config.h
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- lib-src/etags.c
+++ lib-src/etags.c Wed Oct 24 18:13:46 2001
@@ -52,7 +52,7 @@
+++ lib-src/etags.c 2001-10-24 18:13:46.000000000 +0200
@@ -94,7 +94,7 @@ char pot_etags_version[] = "@(#) pot rev
#endif
#ifdef HAVE_CONFIG_H
@ -62,8 +61,8 @@
of unexec. We don't want that here since we don't use unexec. */
# undef static
--- src/s/gnu-linux.h
+++ src/s/gnu-linux.h Wed Oct 24 18:13:46 2001
@@ -314,7 +314,11 @@
+++ src/s/gnu-linux.h 2001-10-24 18:13:46.000000000 +0200
@@ -337,7 +337,11 @@ Boston, MA 02110-1301, USA. */
/* However, sometimes they disagree with the src/regex.h that comes with Emacs,
and that can make trouble in etags.c because it gets the regex.h from Emacs
and the function definitions in libc. So turn this off. */

15
emacs-21.1-linkscr.patch → emacs-22.0.99-linkscr.patch
View File

@ -1,6 +1,6 @@
--- src/Makefile.in
+++ src/Makefile.in Wed Oct 24 17:06:02 2001
@@ -867,10 +867,17 @@
+++ src/Makefile.in 2007-05-15 17:39:37.826648038 +0200
@@ -986,11 +986,18 @@ ${libsrc}make-docfile${EXEEXT}:
#define MAKE_PARALLEL
#endif
@ -11,16 +11,17 @@
+LINK_SCRIPT =
+#endif /* alpha linux */
+
temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-o temacs ${STARTFILES} ${obj} ${otherobj} \
- OBJECTS_MACHINE ${LIBES}
+ 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,
/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
often contain options that have to do with using Emacs''s crt0,
--- src/elf64alpha.x
+++ src/elf64alpha.x Wed Oct 24 17:03:54 2001
+++ src/elf64alpha.x 2001-10-24 17:03:54.000000000 +0200
@@ -0,0 +1,130 @@
+OUTPUT_FORMAT("elf64-alpha", "elf64-alpha", "elf64-alpha")
+OUTPUT_ARCH(alpha)

13
emacs-22.0.99-nonvoid.patch Normal file
View File

@ -0,0 +1,13 @@
--- src/xmenu.c
+++ src/xmenu.c 2007-05-15 18:25:35.960111766 +0200
@@ -1140,8 +1140,8 @@ for instance using the window manager, t
#else
{
Lisp_Object title;
- char *error_name;
- Lisp_Object selection;
+ char *error_name = NULL;
+ Lisp_Object selection = Qnil;
int specpdl_count = SPECPDL_INDEX ();
/* Decode the dialog items from what was specified. */

27
emacs-22.0.99-ppc64.patch Normal file
View File

@ -0,0 +1,27 @@
--- configure.in
+++ configure.in 2007-05-15 18:09:41.118593311 +0200
@@ -799,7 +799,8 @@ dnl see the `changequote' comment above.
;;
## Macintosh PowerPC
- powerpc*-*-linux-gnu* )
+ ppc*-*-linux* | \
+ powerpc*-*-linux* )
machine=macppc opsys=gnu-linux
;;
--- src/m/macppc.h
+++ src/m/macppc.h 2007-05-15 18:11:57.673123793 +0200
@@ -85,6 +85,12 @@ Boston, MA 02110-1301, USA. */
/* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
For MkLinux/LinuxPPC. */
+#ifdef __powerpc64__
+#ifndef _ARCH_PPC64
+#define _ARCH_PPC64
+#endif
+#endif
+
#ifdef LINUX
#define LINKER $(CC) -nostdlib
/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here

28
emacs-22.0.99-ps-bdf.patch Normal file
View File

@ -0,0 +1,28 @@
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el 2007-05-15 17:58:15.609670232 +0200
@@ -21280,9 +21280,9 @@ With prefix argument \\[universal-prefix
;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17842 58279))
;;; Generated autoloads from ps-bdf.el
-(defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\
+(defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/share/fonts/bdf"))) "\
*List of directories to search for `BDF' font files.
-The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
+The default value is '(\"/usr/share/fonts/bdf\").")
;;;***
--- lisp/ps-bdf.el
+++ lisp/ps-bdf.el 2001-10-24 18:38:39.000000000 +0200
@@ -44,9 +44,9 @@
(defvar bdf-directory-list
(if (memq system-type '(ms-dos windows-nt))
(list (expand-file-name "fonts/bdf" installation-directory))
- '("/usr/local/share/emacs/fonts/bdf"))
+ '("/usr/share/fonts/bdf"))
"*List of directories to search for `BDF' font files.
-The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
+The default value is '(\"/usr/share/fonts/bdf\").")
;; MS-DOS and MS-Windows users like to move the binary around after
;; it's built, but the value above is computed at load-up time.

37
emacs-22.0.99-ps-mule.patch Normal file
View File

@ -0,0 +1,37 @@
--- lisp/ps-mule.el
+++ lisp/ps-mule.el 2003-07-22 13:18:56.000000000 +0200
@@ -256,7 +256,9 @@ See also the variable `ps-font-info-data
(defconst ps-mule-font-info-database-latin
'((latin-iso8859-1
- (normal nil nil iso-latin-1)))
+ (normal nil nil iso-latin-1))
+ (latin-iso8859-15
+ (normal nil nil iso-latin-9)))
"Sample setting of `ps-mule-font-info-database' to use latin fonts.")
(defcustom ps-mule-font-info-database-default
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2007-05-15 18:20:20.302583693 +0200
@@ -1256,10 +1256,18 @@ Protects against bogus binding of `enabl
(defun ispell-get-extended-character-mode ()
(nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
(assoc ispell-current-dictionary ispell-dictionary-alist))))
+;;
+;; Most languages in ISO-8859-15 for EURO symbols uses ISO-8859-1 chars
+;(defun ispell-get-coding-system ()
+; (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+; (assoc ispell-current-dictionary ispell-dictionary-alist))))
(defun ispell-get-coding-system ()
- (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
- (assoc ispell-current-dictionary ispell-dictionary-alist))))
-
+ (let ((sys (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+ (assoc ispell-current-dictionary ispell-dictionary-alist)))))
+ (if (and (boundp 'buffer-file-coding-system)
+ (eq buffer-file-coding-system 'iso-latin-9)
+ (eq sys 'iso-latin-1))
+ 'iso-latin-9 sys)))
(defvar ispell-pdict-modified-p nil
"Non-nil means personal dictionary has modifications to be saved.")

76
emacs-22.0.99-s390x.dif Normal file
View File

@ -0,0 +1,76 @@
--- src/lisp.h
+++ src/lisp.h 2007-05-22 14:14:07.339045409 +0200
@@ -344,7 +344,7 @@ enum pvec_type
/* We also need to be able to specify mult-of-8 alignment on static vars. */
# if defined DECL_ALIGN
/* We currently do not support USE_LSB_TAG with a union Lisp_Object. */
-# if defined NO_UNION_TYPE
+# if defined(NO_UNION_TYPE) && !defined(__s390x__)
# define USE_LSB_TAG
# endif
# endif
@@ -369,11 +369,17 @@ enum pvec_type
#define TYPEMASK ((((EMACS_INT) 1) << GCTYPEBITS) - 1)
#define XTYPE(a) ((enum Lisp_Type) (((EMACS_UINT) (a)) & TYPEMASK))
+#ifndef XINT
#define XINT(a) (((EMACS_INT) (a)) >> GCTYPEBITS)
+#endif
+#ifndef XUINT
#define XUINT(a) (((EMACS_UINT) (a)) >> GCTYPEBITS)
+#endif
+#ifndef XSET
#define XSET(var, type, ptr) \
(eassert (XTYPE (ptr) == 0), /* Check alignment. */ \
(var) = ((EMACS_INT) (type)) | ((EMACS_INT) (ptr)))
+#endif
#define make_number(N) (((EMACS_INT) (N)) << GCTYPEBITS)
/* XFASTINT and XSETFASTINT are for use when the integer is known to be
@@ -382,7 +388,9 @@ enum pvec_type
#define XFASTINT(a) XINT (a)
#define XSETFASTINT(a, b) ((a) = make_number (b))
+#ifndef XPNTR
#define XPNTR(a) ((EMACS_INT) ((a) & ~TYPEMASK))
+#endif
#else /* not USE_LSB_TAG */
@@ -440,16 +448,24 @@ enum pvec_type
#ifdef EXPLICIT_SIGN_EXTEND
/* Make sure we sign-extend; compilers have been known to fail to do so. */
+#ifndef XINT
#define XINT(a) (((a).s.val << (BITS_PER_EMACS_INT - VALBITS)) \
>> (BITS_PER_EMACS_INT - VALBITS))
+#endif
#else
+#ifndef XINT
#define XINT(a) ((a).s.val)
+#endif
#endif /* EXPLICIT_SIGN_EXTEND */
+#ifndef XUINT
#define XUINT(a) ((a).u.val)
+#endif
+#ifndef XSET
#define XSET(var, vartype, ptr) \
(((var).s.val = ((EMACS_INT) (ptr))), ((var).s.type = ((char) (vartype))))
+#endif
#if __GNUC__ >= 2 && defined (__OPTIMIZE__)
#define make_number(N) \
--- src/m/ibms390x.h
+++ src/m/ibms390x.h 2007-05-22 14:09:03.982707261 +0200
@@ -105,7 +105,9 @@ NOTE-END */
in the file alloca.s should be used. */
#undef C_ALLOCA
+#ifndef HAVE_ALLOCA
#define HAVE_ALLOCA
+#endif
/* Define NO_REMAP if memory segmentation makes it not work well
to change the boundary between the text section and data section

16
emacs-22.0.99-sendmail-path.patch Normal file
View File

@ -0,0 +1,16 @@
--- lisp/mail/sendmail.el
+++ lisp/mail/sendmail.el 2007-05-15 18:28:59.121703192 +0200
@@ -48,12 +48,7 @@
:group 'sendmail
:version "22.1")
-(defcustom 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.
+(defcustom sendmail-program "/usr/sbin/sendmail"
"Program used to send messages."
:group 'mail
:type 'file)

12
emacs-22.0.99-sentinel.patch Normal file
View File

@ -0,0 +1,12 @@
--- lib-src/cvtmail.c
+++ lib-src/cvtmail.c 2007-05-15 18:34:59.271942403 +0200
@@ -42,6 +42,9 @@ Boston, MA 02110-1301, USA. */
#ifndef HAVE_STDLIB_H
char *getenv ();
+#else
+#include <stdlib.h>
+#include <string.h>
#endif
char *xmalloc __P ((unsigned));

16
emacs-21.3-x11r7.patch → emacs-22.0.99-x11r7.patch
View File

@ -1,16 +1,16 @@
--- src/xrdb.c
+++ src/xrdb.c 2007-01-12 16:39:37.000000000 +0100
@@ -53,6 +53,9 @@ Boston, MA 02111-1307, USA. */
+++ src/xrdb.c 2007-05-15 18:01:41.439517668 +0200
@@ -54,6 +54,9 @@ Boston, MA 02110-1301, USA. */
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
+#ifdef USE_X_TOOLKIT
+#include <X11/Intrinsic.h>
+#endif
#ifdef VMS
#include "vms-pwd.h"
#else
@@ -604,6 +607,15 @@ x_load_resources (display, xrm_string, m
+#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
@@ -609,6 +612,15 @@ x_load_resources (display, xrm_string, m
XrmPutLineResource (&rdb, line);
#endif /* not USE_MOTIF */
@ -26,7 +26,7 @@
user_database = get_user_db (display);
@@ -646,6 +658,10 @@ x_load_resources (display, xrm_string, m
@@ -651,6 +663,10 @@ x_load_resources (display, xrm_string, m
XrmMergeDatabases (db, &rdb);
}

4
emacs-21.3-xim.patch → emacs-22.0.99-xim.patch
View File

@ -1,6 +1,6 @@
--- src/xfns.c
+++ src/xfns.c 2005-04-15 12:23:37.000000000 +0200
@@ -3281,8 +3281,8 @@
+++ src/xfns.c 2007-05-15 18:37:13.282161551 +0200
@@ -1959,8 +1959,8 @@ static XIMStyle best_xim_style P_ ((XIMS
static XIMStyle supported_xim_styles[] =
{

1219
emacs-21.3.dif → emacs-22.0.99.dif
View File

File diff suppressed because it is too large Load Diff

3
emacs-22.0.99.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b453fcc488a9cd26e985a5c806929a24831ce249b9f8a7dc7595095d82905ee5
size 20650424

14
emacs.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue May 22 13:17:30 CEST 2007 - werner@suse.de
- Switch over to emacs 22.0.99 which used UFT-8 native
- Adopt the patches if not already applied
- Skip cweb and web mode due not compatible to new emacs and no
replacement was found
- Skip timecard mode due not compatible to new emacs and no
replacement was found
- Add rmime.el, update maple mode
- Adopt site-start.el to emacs 22.0.99
- Help s390x machine defines to win over common defines
- Avoid trouble with leim and implicit make dependencies on tmpfs
-------------------------------------------------------------------
Tue May 15 15:54:22 CEST 2007 - werner@suse.de

3175
emacs.spec
View File

File diff suppressed because it is too large Load Diff

2
emacs.test
View File

@ -1,7 +1,7 @@
Testform für emacs
===================
08.08.2002: Version 21.2
22.05.2007: Version 22.0.99
Maintainer: werner
Vorraussetzungen:

3
leim-21.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:203b38230fea468e0ce114b46e680dee9dbc680eaa5aa40ed9bc11be912faecd
size 2999273

4
site-lisp.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b19b470c3550dbb2eaf083395e1bedda130f68dfc04d60099e6f814f52b7aaf
size 73365
oid sha256:63ca6e4c270440b575df40007b3a7707bf126f23abc753f8d3c433eb9fcf918d
size 51564