Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2012-06-28 17:24:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2012-05-26 13:08:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2012-06-28 17:24:38.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jun 28 09:42:17 UTC 2012 - [email protected] + +- Avoid conflict with gnuctags + +------------------------------------------------------------------- +Thu Jun 28 09:07:51 UTC 2012 - [email protected] + +- Update to to emacs version 24.1 + * Support for Gtk+3.0, GnuTLS, ImageMagick, libxml2, and SELinux + * Support for wide integer (62 bits) in lisp even on 32-bit machines. + * The --unibyte, --multibyte, --no-multibyte, and --no-unibyte command + line arguments, and the EMACS_UNIBYTE environment variable, no longer + have any effect. + * And many more changes see /usr/share/emacs/24.1/etc/NEWS +- Remove obsolete patches +- Refresh some others patches + +------------------------------------------------------------------- Old: ---- emacs-22.0.99-nonvoid.patch emacs-22.0.99-sendmail-path.patch emacs-23.1-bnc628268.patch emacs-23.1-glibc.patch emacs-23.1-ppc64.patch emacs-23.1-ps-mule.patch emacs-23.2-decl.dif emacs-23.2-linkscr.patch emacs-23.3-bnc740447.patch emacs-23.3-ps-bdf.patch emacs-23.3-s390x.dif emacs-23.3-tinfo.dif emacs-23.3-xgselect.patch emacs-23.3.dif emacs-23.3b.tar.bz2 emacs-sparc.diff New: ---- emacs-24.1-bnc628268.patch emacs-24.1-decl.dif emacs-24.1-glibc.patch emacs-24.1-nonvoid.patch emacs-24.1-ppc64.patch emacs-24.1-ps-bdf.patch emacs-24.1-ps-mule.patch emacs-24.1-s390x.dif emacs-24.1-sendmail-path.patch emacs-24.1-tinfo.dif emacs-24.1-xgselect.patch emacs-24.1.dif emacs-24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ ++++ 1926 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/emacs/emacs.spec ++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs.spec ++++++ emacs-23.1-bnc628268.patch -> emacs-24.1-bnc628268.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.1-bnc628268.patch 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-bnc628268.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,35 +1,6 @@ ---- lisp/loaddefs.el -+++ lisp/loaddefs.el 2010-08-12 15:38:16.235126810 +0000 -@@ -25974,7 +25974,7 @@ as its \"correct\" spelling; then the qu - - \(fn)" t nil) - --(make-obsolete 'spell-buffer 'ispell-buffer "23.1") -+(define-obsolete-function-alias 'spell-buffer 'ispell-buffer "23.1") - - (autoload 'spell-word "spell" "\ - Check spelling of word at or before point. -@@ -25983,7 +25983,7 @@ and `query-replace' the entire buffer to - - \(fn)" t nil) - --(make-obsolete 'spell-word 'ispell-word "23.1") -+(define-obsolete-function-alias 'spell-word 'ispell-word "23.1") - - (autoload 'spell-region "spell" "\ - Like `spell-buffer' but applies only to region. -@@ -25993,7 +25993,7 @@ for example, \"word\". - - \(fn START END &optional DESCRIPTION)" t nil) - --(make-obsolete 'spell-region 'ispell-region "23.1") -+(define-obsolete-function-alias 'spell-region 'ispell-region "23.1") - - (autoload 'spell-string "spell" "\ - Check spelling of string supplied as argument. ---- lisp/textmodes/spell.el -+++ lisp/textmodes/spell.el 2010-08-12 15:36:22.119126692 +0000 -@@ -63,7 +63,7 @@ as its \"correct\" spelling; then the qu +--- lisp/obsolete/spell.el ++++ lisp/obsolete/spell.el 2012-06-27 11:54:27.600009491 +0000 +@@ -64,7 +64,7 @@ as its \"correct\" spelling; then the qu (with-no-warnings (spell-region (point-min) (point-max) "buffer"))) ;;;###autoload @@ -38,7 +9,7 @@ ;;;###autoload (defun spell-word () -@@ -82,7 +82,7 @@ and `query-replace' the entire buffer to +@@ -83,7 +83,7 @@ and `query-replace' the entire buffer to (with-no-warnings (spell-region beg end (buffer-substring beg end))))) ;;;###autoload @@ -47,7 +18,7 @@ ;;;###autoload (defun spell-region (start end &optional description) -@@ -145,7 +145,7 @@ for example, \"word\"." +@@ -141,7 +141,7 @@ for example, \"word\"." (query-replace-regexp (concat "\\b" (regexp-quote word) "\\b") newword))))))) ;;;###autoload ++++++ emacs-23.2-decl.dif -> emacs-24.1-decl.dif ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.2-decl.dif 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-decl.dif 2012-06-28 17:24:36.000000000 +0200 @@ -1,5 +1,5 @@ --- src/frame.c -+++ src/frame.c 2010-10-18 13:34:00.000427490 +0000 ++++ src/frame.c 2012-06-26 16:09:59.692010311 +0000 @@ -21,6 +21,9 @@ along with GNU Emacs. If not, see <http #include <stdio.h> @@ -7,6 +7,6 @@ +#ifdef STDC_HEADERS +#include <stdlib.h> +#endif + #include <errno.h> + #include <limits.h> #include <setjmp.h> - #include "lisp.h" - #include "character.h" ++++++ emacs-23.1-glibc.patch -> emacs-24.1-glibc.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.1-glibc.patch 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-glibc.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,76 +1,53 @@ --- lib-src/Makefile.in -+++ lib-src/Makefile.in 2009-08-10 18:11:16.653901806 +0200 -@@ -232,6 +232,8 @@ LOADLIBES=LIBS_SYSTEM LIBS_MACHINE - 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} -+ETAGS_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \ -+ -I. -I${srcdir} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} - 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 \ -@@ -380,21 +382,31 @@ getopt.h: getopt_.h - cp $(srcdir)/getopt_.h $@-t - mv $@-t $@ ++++ lib-src/Makefile.in 2012-06-14 11:41:22.208010103 +0000 +@@ -307,14 +307,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di + ../lib/libgnu.a: ../src/config.h + cd ../lib && $(MAKE) libgnu.a -+#ifdef GETOPT_IN_LIBC -+GETOPTOBJS = -+GETOPTDEPS = -+#else - 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 -+#endif - -+#ifdef REGEXP_IN_LIBC +REGEXPOBJ = -+REGEXPDEPS = -+#else - REGEXPOBJ = regex.o - REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h -+#endif - ++#REGEXPOBJ = regex.o regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h - ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c + ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ + ${srcdir}/../src/regex.c - 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${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h - $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse -@@ -402,7 +414,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. */ +-etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h ++etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) ../src/config.h + $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ + -DVERSION="\"${version}\"" ${srcdir}/etags.c \ +- regex.o $(LOADLIBES) -o etags ++ $(REGEXPOBJ) $(LOADLIBES) -o etags + + ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h + $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ +@@ -325,7 +330,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${ 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 + $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ + -DVERSION="\"${version}\"" ${srcdir}/etags.c \ +- regex.o $(LOADLIBES) -o ctags ++ $(REGEXPOBJ) $(LOADLIBES) -o ctags 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 2001-10-24 18:13:46.000000000 +0200 -@@ -93,7 +93,7 @@ char pot_etags_version[] = "@(#) pot rev ++++ lib-src/etags.c 2012-06-26 16:03:43.356510061 +0000 +@@ -92,7 +92,7 @@ char pot_etags_version[] = "@(#) pot rev #endif #ifdef HAVE_CONFIG_H -# include <config.h> +# include <../src/config.h> - /* On some systems, Emacs defines static as nothing for the sake - of unexec. We don't want that here since we don't use unexec. */ - # undef static + /* This is probably not necessary any more. On some systems, config.h + used to define static as nothing for the sake of unexec. We don't + want that here since we don't use unexec. None of these systems --- src/s/gnu-linux.h -+++ src/s/gnu-linux.h 2009-08-10 18:12:23.537901415 +0200 -@@ -275,5 +275,15 @@ along with GNU Emacs. If not, see <http ++++ src/s/gnu-linux.h 2012-06-26 16:05:56.116010465 +0000 +@@ -159,3 +159,14 @@ along with GNU Emacs. If not, see <http + } while (0) #endif #endif - -+/* we also have getopt and regex in the GNU C-library. */ ++ ++/* we have regex in the GNU C-library. */ +#define REGEXP_IN_LIBC -+#define GETOPT_IN_LIBC + +/* Use system malloc from glibc and memory mappging */ +#if !defined(__ia64__) @@ -78,5 +55,4 @@ +# define USE_MMAP_FOR_BUFFERS +#endif + - /* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9 - (do not change this comment) */ ++ ++++++ emacs-22.0.99-nonvoid.patch -> emacs-24.1-nonvoid.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-22.0.99-nonvoid.patch 2011-09-23 01:56:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-nonvoid.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,12 +1,12 @@ --- 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 ++++ src/xmenu.c 2012-06-26 17:12:22.856009442 +0000 +@@ -316,8 +316,8 @@ for instance using the window manager, t #else { Lisp_Object title; -- char *error_name; +- const char *error_name; - Lisp_Object selection; -+ char *error_name = NULL; ++ const char *error_name = NULL; + Lisp_Object selection = Qnil; int specpdl_count = SPECPDL_INDEX (); ++++++ emacs-23.1-ppc64.patch -> emacs-24.1-ppc64.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.1-ppc64.patch 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-ppc64.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,20 +1,29 @@ --- configure.in -+++ configure.in 2007-05-15 18:09:41.000000000 +0200 -@@ -426,7 +426,8 @@ dnl see the `changequote' comment above. - ;; ++++ configure.in 2012-06-26 16:30:51.496510306 +0000 +@@ -420,7 +420,8 @@ case "${canonical}" in + case ${canonical} in + alpha*) machine=alpha ;; + s390x-*) machine=ibms390x ;; +- powerpc*) machine=macppc ;; ++ powerpc*|ppc*) ++ machine=macppc ;; + sparc*) machine=sparc ;; + ia64*) machine=ia64 ;; + m68k*) machine=m68k ;; +@@ -1050,7 +1051,7 @@ if test "x$crt_files" != x; then + test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64 + ;; - ## Macintosh PowerPC -- powerpc*-*-linux-gnu* ) -+ ppc*-*-linux* | \ -+ powerpc*-*-linux* ) - machine=macppc opsys=gnu-linux - ;; +- powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;; ++ powerpc64-*-linux-gnu* | ppc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;; + esac + case "$opsys" in --- src/m/macppc.h -+++ src/m/macppc.h 2009-08-11 14:38:16.442402126 +0200 -@@ -42,6 +42,12 @@ along with GNU Emacs. If not, see <http - /* NAKAJI Hiroyuki <[email protected]> says this is needed - For MkLinux/LinuxPPC. */ ++++ src/m/macppc.h 2012-06-26 16:31:30.584509749 +0000 +@@ -17,6 +17,12 @@ GNU General Public License for more deta + You should have received a copy of the GNU General Public License + along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef __powerpc64__ +#ifndef _ARCH_PPC64 @@ -22,6 +31,6 @@ +#endif +#endif + - #ifdef GNU_LINUX - #define LINKER $(CC) -nostdlib - /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here + #ifdef _ARCH_PPC64 + #ifndef _LP64 + #define _LP64 ++++++ emacs-23.3-ps-bdf.patch -> emacs-24.1-ps-bdf.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.3-ps-bdf.patch 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-ps-bdf.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,7 +1,7 @@ --- lisp/ldefs-boot.el -+++ lisp/ldefs-boot.el 2009-08-10 16:21:22.000000000 +0000 -@@ -21525,9 +21525,9 @@ With prefix argument \\[universal-prefix - ;;;;;; 41642)) ++++ lisp/ldefs-boot.el 2012-06-26 16:26:01.900010474 +0000 +@@ -23074,9 +23074,9 @@ With prefix argument ARG, restart the Pr + ;;;;;; 65510)) ;;; Generated autoloads from ps-bdf.el -(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")) "\ @@ -14,7 +14,7 @@ --- lisp/ps-bdf.el +++ lisp/ps-bdf.el 2009-08-10 16:21:47.000000000 +0000 -@@ -45,9 +45,9 @@ +@@ -42,9 +42,9 @@ (defcustom bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) ++++++ emacs-23.1-ps-mule.patch -> emacs-24.1-ps-mule.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.1-ps-mule.patch 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-ps-mule.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,6 +1,6 @@ --- lisp/ps-mule.el -+++ lisp/ps-mule.el 2009-08-11 14:41:44.493901698 +0200 -@@ -183,6 +183,8 @@ See also the variable `ps-font-info-data ++++ lisp/ps-mule.el 2009-08-11 12:41:44.000000000 +0000 +@@ -182,6 +182,8 @@ See also the variable `ps-font-info-data (defconst ps-mule-font-info-database-latin '((iso-8859-1 @@ -10,11 +10,11 @@ "Sample setting of `ps-mule-font-info-database' to use latin fonts.") --- lisp/textmodes/ispell.el -+++ lisp/textmodes/ispell.el 2007-05-15 18:20:20.000000000 +0200 -@@ -1298,10 +1298,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)))) ++++ lisp/textmodes/ispell.el 2012-06-26 16:37:56.424010429 +0000 +@@ -1339,10 +1339,18 @@ Protects against bogus binding of `enabl + nil ;; in pipe mode. Disable extended-char-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 () ++++++ emacs-23.3-s390x.dif -> emacs-24.1-s390x.dif ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.3-s390x.dif 2011-09-23 01:56:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-s390x.dif 2012-06-28 17:24:36.000000000 +0200 @@ -1,24 +1,12 @@ --- src/m/ibms390x.h -+++ src/m/ibms390x.h 2011-07-11 11:51:06.080426771 +0000 -@@ -78,7 +78,9 @@ NOTE-END */ - working alloca function and it should be used. Undefine it if an - assembler-language alloca in the file alloca.s should be used. */ - -+#ifndef HAVE_ALLOCA - #define HAVE_ALLOCA -+#endif - - /* On the 64 bit architecture, we can use 60 bits for addresses */ - -@@ -88,7 +90,10 @@ NOTE-END */ ++++ src/m/ibms390x.h 2012-06-26 17:21:34.240010197 +0000 +@@ -29,4 +29,8 @@ along with GNU Emacs. If not, see <http + #define VALBITS 60 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ - -#define XPNTR(a) XUINT (a) ++ +#undef DATA_SEG_BITS +#ifdef USE_LISP_UNION_TYPE +#undef USE_LISP_UNION_TYPE +#endif - - #undef START_FILES - #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o ++++++ emacs-22.0.99-sendmail-path.patch -> emacs-24.1-sendmail-path.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-22.0.99-sendmail-path.patch 2011-09-23 01:56:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-sendmail-path.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,16 +1,17 @@ --- lisp/mail/sendmail.el -+++ lisp/mail/sendmail.el 2007-05-15 18:28:59.121703192 +0200 -@@ -48,12 +48,7 @@ ++++ lisp/mail/sendmail.el 2012-06-26 17:16:27.176010331 +0000 +@@ -42,13 +42,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. +- (or (executable-find "sendmail") +- (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 "sendmail"))) +(defcustom sendmail-program "/usr/sbin/sendmail" "Program used to send messages." + :version "24.1" ; add executable-find, remove fakemail :group 'mail - :type 'file) ++++++ emacs-23.3-tinfo.dif -> emacs-24.1-tinfo.dif ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.3-tinfo.dif 2011-11-23 19:34:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-tinfo.dif 2012-06-28 17:24:36.000000000 +0200 @@ -1,24 +1,26 @@ --- configure.in -+++ configure.in 2011-11-22 14:37:39.195146873 +0000 -@@ -2376,11 +2376,13 @@ AC_CHECK_FUNCS(getpt) - # That is because we have not set up to link ncurses in lib-src. - # It's better to believe a function is not available - # than to expect to find it in ncurses. --AC_CHECK_LIB(ncurses, tparm) -+for lib in tinfo ncurses ; do -+ AC_CHECK_LIB($lib, tparm) -+done - - case "$opsys" in - netbsd) -- AC_SEARCH_LIBS(tputs, [ncurses terminfo termcap]) -+ AC_SEARCH_LIBS(tputs, [tinfo ncurses ncursesw terminfo termcap]) - if test $ac_cv_search_tputs = -lterminfo; then - AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.]) ++++ configure.in 2012-06-26 17:32:44.272010723 +0000 +@@ -2803,7 +2803,7 @@ AC_DEFUN([tputs_link_source], [ + ]) + # Maybe curses should be tried earlier? + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 +-for tputs_library in '' ncurses terminfo termcap curses; do ++for tputs_library in '' tinfo ncurses ncursesw terminfo termcap curses; do + OLIBS=$LIBS + if test -z "$tputs_library"; then + LIBS_TERMCAP= +@@ -2855,7 +2855,7 @@ case "$opsys" in + ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.) + if test "x$HAVE_LIBNCURSES" = "xyes"; then + TERMINFO=yes +- LIBS_TERMCAP="-lncurses" ++ LIBS_TERMCAP="-ltinfo" fi + ;; + --- src/config.in -+++ src/config.in 2011-11-22 14:34:49.199647061 +0000 -@@ -388,6 +388,9 @@ along with GNU Emacs. If not, see <http ++++ src/config.in 2011-11-22 14:34:49.000000000 +0000 +@@ -450,6 +450,9 @@ along with GNU Emacs. If not, see <http /* Define to 1 if you have the `ncurses' library (-lncurses). */ #undef HAVE_LIBNCURSES @@ -28,18 +30,3 @@ /* Define to 1 if using libotf. */ #undef HAVE_LIBOTF ---- src/s/gnu-linux.h -+++ src/s/gnu-linux.h 2011-11-22 14:36:11.327146051 +0000 -@@ -230,8 +230,12 @@ along with GNU Emacs. If not, see <http - - #ifdef HAVE_LIBNCURSES - #define TERMINFO -+#ifdef HAVE_LIBTINFO -+#define LIBS_TERMCAP -ltinfo -+#else - #define LIBS_TERMCAP -lncurses - #endif -+#endif - - #define UNEXEC unexelf.o - ++++++ emacs-23.3-xgselect.patch -> emacs-24.1-xgselect.patch ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-23.3-xgselect.patch 2012-05-26 13:08:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1-xgselect.patch 2012-06-28 17:24:36.000000000 +0200 @@ -1,14 +1,16 @@ --- src/xgselect.c -+++ src/xgselect.c 2012-05-24 11:07:45.793270370 +0000 -@@ -60,6 +60,11 @@ xg_select (max_fds, rfds, wfds, efds, ti - xfree (gfds); - gfds = xmalloc (sizeof (*gfds) * gfds_size); ++++ src/xgselect.c 2012-06-27 11:58:47.756081195 +0000 +@@ -58,7 +58,12 @@ xg_select (int max_fds, SELECT_TYPE *rfd + gfds = xpalloc (0, &gfds_size, n_gfds - gfds_size, INT_MAX, + sizeof *gfds); } +- + else if (!gfds) + { -+ gfds_size = 1; -+ gfds = xmalloc (sizeof (*gfds)); ++ gfds_size = 1; ++ gfds = xmalloc (sizeof (*gfds)); + } - ++ n_gfds = g_main_context_query (context, G_PRIORITY_LOW, + &tmo_in_millisec, ++++++ emacs-23.2-decl.dif -> emacs-24.1.dif ++++++ ++++ 889 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/emacs/emacs-23.2-decl.dif ++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1.dif ++++++ emacs-23.3b.tar.bz2 -> emacs-24.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/emacs/emacs-23.3b.tar.bz2 /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
