Hello community,
here is the log from the commit of package emacs
checked in at Tue May 22 16:44:13 CEST 2007.
--------
--- emacs/emacs.changes 2007-05-15 15:55:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2007-05-22 16:02:31.716283000 +0200
@@ -1,0 +2,14 @@
+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
+
+-------------------------------------------------------------------
Old:
----
emacs-21.1-decl.dif
emacs-21.1-glibc.patch
emacs-21.1-linkscr.patch
emacs-21.1-ps-bdf.patch
emacs-21.1-s390x.patch
emacs-21.2-x86_64.patch
emacs-21.3-asian-dired.patch
emacs-21.3-config.dif
emacs-21.3.dif
emacs-21.3-format1.dif
emacs-21.3-level3.patch
emacs-21.3-movemail.patch
emacs-21.3-nonvoid.patch
emacs-21.3-ppc64.patch
emacs-21.3-ps-mule.patch
emacs-21.3-sendmail-path.patch
emacs-21.3-sentinel.patch
emacs-21.3.tar.bz2
emacs-21.3-term.patch
emacs-21.3-x11r7.patch
emacs-21.3-xim.patch
leim-21.3.tar.bz2
New:
----
emacs-22.0.99-decl.dif
emacs-22.0.99.dif
emacs-22.0.99-glibc.patch
emacs-22.0.99-linkscr.patch
emacs-22.0.99-nonvoid.patch
emacs-22.0.99-ppc64.patch
emacs-22.0.99-ps-bdf.patch
emacs-22.0.99-ps-mule.patch
emacs-22.0.99-s390x.dif
emacs-22.0.99-sendmail-path.patch
emacs-22.0.99-sentinel.patch
emacs-22.0.99.tar.bz2
emacs-22.0.99-x11r7.patch
emacs-22.0.99-xim.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
++++ 3949 lines (skipped)
++++ between emacs/emacs.spec
++++ and /mounts/work_src_done/STABLE/emacs/emacs.spec
++++++ dot.gnu-emacs ++++++
--- emacs/dot.gnu-emacs 2006-06-30 17:07:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/dot.gnu-emacs 2007-05-16 14:33:43.635857000 +0200
@@ -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
++++++ emacs-21.1-decl.dif -> emacs-22.0.99-decl.dif ++++++
--- emacs/emacs-21.1-decl.dif 2003-02-26 13:57:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-decl.dif 2007-05-15 17:52:32.317196000 +0200
@@ -1,6 +1,6 @@
--- src/frame.c
-+++ src/frame.c Wed Oct 24 18:23:30 2001
-@@ -22,6 +22,9 @@
++++ src/frame.c 2007-05-15 17:52:06.326432380 +0200
+@@ -22,6 +22,9 @@ Boston, MA 02110-1301, USA. */
#include
#include
@@ -10,20 +10,3 @@
#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;
++++++ emacs-21.1-decl.dif -> emacs-22.0.99.dif ++++++
++++ 1568 lines (skipped)
++++ between emacs/emacs-21.1-decl.dif
++++ and /mounts/work_src_done/STABLE/emacs/emacs-22.0.99.dif
++++++ emacs-21.1-glibc.patch -> emacs-22.0.99-glibc.patch ++++++
--- emacs/emacs-21.1-glibc.patch 2003-02-26 13:57:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-glibc.patch 2007-05-15 17:50:19.395058000 +0200
@@ -1,10 +1,10 @@
* This patch should tell lib-src/Makefile
that it can use regex and getopt from GNU LibC
- -- Stepan Kasal
+ -- Stepan Kasal
--- 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. */
++++++ emacs-21.1-linkscr.patch -> emacs-22.0.99-linkscr.patch ++++++
--- emacs/emacs-21.1-linkscr.patch 2003-02-26 13:57:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-linkscr.patch 2007-05-15 17:39:58.572865000 +0200
@@ -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)
++++++ emacs-21.3-nonvoid.patch -> emacs-22.0.99-nonvoid.patch ++++++
--- emacs/emacs-21.3-nonvoid.patch 2006-08-03 16:03:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-nonvoid.patch 2007-05-15 18:25:53.545981000 +0200
@@ -1,69 +1,13 @@
---- 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 @@
++++ 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 = (char*)0;
-+ Lisp_Object selection = (Lisp_Object)0;
++ char *error_name = NULL;
++ Lisp_Object selection = Qnil;
+ int specpdl_count = SPECPDL_INDEX ();
/* Decode the dialog items from what was specified. */
- title = Fcar (contents);
++++++ emacs-21.3-ppc64.patch -> emacs-22.0.99-ppc64.patch ++++++
--- emacs/emacs-21.3-ppc64.patch 2006-11-11 02:14:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-ppc64.patch 2007-05-15 18:12:25.332069000 +0200
@@ -1,101 +1,27 @@
----
- 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
+--- configure.in
++++ configure.in 2007-05-15 18:09:41.118593311 +0200
+@@ -799,7 +799,8 @@ dnl see the `changequote' comment above.
;;
- ppc-*-linux* | \
-+ ppc64-*-linux | \
-+ powerpc64-*-linux* | \
- powerpc-*-linux* )
+ ## Macintosh PowerPC
+- powerpc*-*-linux-gnu* )
++ ppc*-*-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
+--- 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 says this is needed
+ For MkLinux/LinuxPPC. */
+
+#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
++#ifndef _ARCH_PPC64
++#define _ARCH_PPC64
+#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. */
+ #ifdef LINUX
+ #define LINKER $(CC) -nostdlib
+ /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
++++++ emacs-21.1-ps-bdf.patch -> emacs-22.0.99-ps-bdf.patch ++++++
--- emacs/emacs-21.1-ps-bdf.patch 2003-02-26 13:57:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-ps-bdf.patch 2007-05-15 17:58:27.430925000 +0200
@@ -1,8 +1,22 @@
+--- 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 Wed Oct 24 18:38:39 2001
-@@ -43,9 +43,9 @@
- (if (and (memq system-type '(ms-dos windows-nt))
- (boundp 'installation-directory))
++++ 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"))
@@ -12,17 +26,3 @@
;; 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\").")
-
- ;;;***
-
++++++ emacs-21.3-ps-mule.patch -> emacs-22.0.99-ps-mule.patch ++++++
--- emacs/emacs-21.3-ps-mule.patch 2003-07-24 13:54:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-ps-mule.patch 2007-05-15 18:22:14.034664000 +0200
@@ -1,6 +1,6 @@
--- lisp/ps-mule.el
+++ lisp/ps-mule.el 2003-07-22 13:18:56.000000000 +0200
-@@ -300,7 +300,9 @@
+@@ -256,7 +256,9 @@ See also the variable `ps-font-info-data
(defconst ps-mule-font-info-database-latin
'((latin-iso8859-1
@@ -12,24 +12,26 @@
(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)))
++++ 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 (assoc ispell-dictionary ispell-dictionary-alist)))
+ (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 (assoc ispell-dictionary ispell-dictionary-alist)))
-+;;
++; (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 (assoc ispell-dictionary ispell-dictionary-alist)))
+- (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+- (assoc ispell-current-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)))
++ (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.")
++++++ emacs-22.0.99-s390x.dif ++++++
--- 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
++++++ emacs-21.3-sendmail-path.patch -> emacs-22.0.99-sendmail-path.patch ++++++
--- emacs/emacs-21.3-sendmail-path.patch 2004-08-12 14:36:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-sendmail-path.patch 2007-05-15 18:29:45.278606000 +0200
@@ -1,16 +1,16 @@
---- 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.")
+--- 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")
--(defconst sendmail-program
+-(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.
-+(defconst sendmail-program "/usr/sbin/sendmail"
- "Program used to send messages.")
-
- (defconst remote-shell-program
++(defcustom sendmail-program "/usr/sbin/sendmail"
+ "Program used to send messages."
+ :group 'mail
+ :type 'file)
++++++ emacs-21.3-sentinel.patch -> emacs-22.0.99-sentinel.patch ++++++
--- emacs/emacs-21.3-sentinel.patch 2005-04-14 13:48:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-sentinel.patch 2007-05-15 18:36:01.834581000 +0200
@@ -1,79 +1,12 @@
---- 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
---- 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
-+#include
- #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 @@
-
++++ lib-src/cvtmail.c 2007-05-15 18:34:59.271942403 +0200
+@@ -42,6 +42,9 @@ Boston, MA 02110-1301, USA. */
- #include
--
--char *malloc ();
--char *realloc ();
--char *getenv ();
+ #ifndef HAVE_STDLIB_H
+ char *getenv ();
++#else
+#include
+#include
-
- 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
-+#include
-+#include
-+#include
- #include
- #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
-+#include
-+#include
-+#include
-
- #ifdef HAVE_UNISTD_H
- #include
+ char *xmalloc __P ((unsigned));
++++++ emacs-21.3.tar.bz2 -> emacs-22.0.99.tar.bz2 ++++++
emacs/emacs-21.3.tar.bz2 /mounts/work_src_done/STABLE/emacs/emacs-22.0.99.tar.bz2 differ: byte 11, line 1
++++++ emacs-21.3-x11r7.patch -> emacs-22.0.99-x11r7.patch ++++++
--- emacs/emacs-21.3-x11r7.patch 2007-01-12 16:40:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-x11r7.patch 2007-05-15 18:02:00.049492000 +0200
@@ -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
#include
#include
+#ifdef USE_X_TOOLKIT
+#include
-+#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
+ #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);
}
++++++ emacs-21.3-xim.patch -> emacs-22.0.99-xim.patch ++++++
--- emacs/emacs-21.3-xim.patch 2005-04-15 12:59:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs-22.0.99-xim.patch 2007-05-15 18:37:36.252598000 +0200
@@ -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[] =
{
++++++ emacs.test ++++++
--- emacs/emacs.test 2003-02-26 13:57:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs/emacs.test 2007-05-22 16:10:39.064205000 +0200
@@ -1,7 +1,7 @@
Testform f�r emacs
===================
-08.08.2002: Version 21.2
+22.05.2007: Version 22.0.99
Maintainer: werner
Vorraussetzungen:
++++++ site-lisp.tar.bz2 ++++++
++++ 8946 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org