Hello community,
here is the log from the commit of package emacs for openSUSE:Factory checked
in at 2012-12-19 10:52:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/emacs (Old)
and /work/SRC/openSUSE:Factory/.emacs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs", Maintainer is "wer...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2012-10-25
10:59:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2012-12-19
10:52:41.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Dec 10 22:25:23 UTC 2012 - sch...@linux-m68k.org
+
+- Remove obsolete patches
+- Don't use obsolete mouse-sel
+- Avoid calling autoconf
+- Avoid warning about duplicate files
+
+-------------------------------------------------------------------
Old:
----
emacs-24.1-ppc64.patch
emacs-24.1-sendmail-path.patch
emacs-24.2-configure.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.uLmHfD/_old 2012-12-19 10:52:43.000000000 +0100
+++ /var/tmp/diff_new_pack.uLmHfD/_new 2012-12-19 10:52:43.000000000 +0100
@@ -20,7 +20,6 @@
BuildRequires: ImageMagick
BuildRequires: ImageMagick-devel
BuildRequires: alsa-devel
-BuildRequires: autoconf
BuildRequires: bind-devel
BuildRequires: dbus-1-devel
BuildRequires: elfutils
@@ -77,15 +76,12 @@
Source4: emacs-rpmlintrc
Source5: emacs.desktop
Patch: emacs-24.1.dif
-Patch1: emacs-24.2-configure.patch
Patch2: emacs-24.1-glibc.patch
Patch3: emacs-24.1-decl.dif
Patch4: emacs-23.1-asian-print.patch
Patch5: emacs-24.1-ps-bdf.patch
-Patch6: emacs-24.1-ppc64.patch
Patch7: emacs-24.1-ps-mule.patch
Patch8: emacs-24.1-nonvoid.patch
-Patch9: emacs-24.1-sendmail-path.patch
Patch11: emacs-22.0.99-xim.patch
Patch12: emacs-22.0.99-x11r7.patch
Patch13: emacs-24.1-s390x.dif
@@ -184,10 +180,8 @@
%patch3 -p0 -b .decl
%patch4 -p0 -b .print
%patch5 -p0 -b .psbdf
-%patch6 -p0 -b .ppc64
%patch7 -p0 -b .psmu
%patch8 -p0 -b .nvoid
-%patch9 -p0 -b .snd
%patch11 -p0 -b .xim
%patch12 -p0 -b .x11r7
%patch13 -p0 -b .s390x
@@ -203,9 +197,9 @@
%patch22
%patch23
%patch24
-%if 0%{?suse_version} < 1130
-%patch1
-%endif
+
+# We don't want to run autoconf
+touch configure src/stamp-h.in
# make sure that the binaries work (pagesize on build must be the same as on
target, bnc#726769)
%if %suse_version >= 1110
@@ -362,9 +356,6 @@
export MALLOC_CHECK_
fi
}
-%if 0%{?suse_version} >= 1130
-autoconf
-%endif
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
make_mchkoff bootstrap
make -C lisp updates compile
@@ -1536,7 +1527,7 @@
%{_datadir}/emacs/%{version}/etc/yow.lines
%dir %{_datadir}/emacs/%{version}/leim/
%dir %{_datadir}/emacs/%{version}/leim/ja-dic/
-%{_datadir}/emacs/%{version}/leim/ja-dic/ja-dic.el
+%{_datadir}/emacs/%{version}/leim/ja-dic/ja-dic.elc
%{_datadir}/emacs/%{version}/leim/leim-list.el
%dir %{_datadir}/emacs/%{version}/leim/quail/
%{_datadir}/emacs/%{version}/leim/quail/4Corner.elc
@@ -1556,47 +1547,47 @@
%{_datadir}/emacs/%{version}/leim/quail/TONEPY.elc
%{_datadir}/emacs/%{version}/leim/quail/ZIRANMA.elc
%{_datadir}/emacs/%{version}/leim/quail/ZOZY.elc
-%{_datadir}/emacs/%{version}/leim/quail/arabic.el
-%{_datadir}/emacs/%{version}/leim/quail/croatian.el
-%{_datadir}/emacs/%{version}/leim/quail/cyril-jis.el
-%{_datadir}/emacs/%{version}/leim/quail/cyrillic.el
-%{_datadir}/emacs/%{version}/leim/quail/czech.el
-%{_datadir}/emacs/%{version}/leim/quail/ethiopic.el
-%{_datadir}/emacs/%{version}/leim/quail/georgian.el
-%{_datadir}/emacs/%{version}/leim/quail/greek.el
-%{_datadir}/emacs/%{version}/leim/quail/hangul.el
-%{_datadir}/emacs/%{version}/leim/quail/hanja-jis.el
-%{_datadir}/emacs/%{version}/leim/quail/hanja.el
-%{_datadir}/emacs/%{version}/leim/quail/hanja3.el
-%{_datadir}/emacs/%{version}/leim/quail/hebrew.el
-%{_datadir}/emacs/%{version}/leim/quail/indian.el
-%{_datadir}/emacs/%{version}/leim/quail/ipa-praat.el
-%{_datadir}/emacs/%{version}/leim/quail/ipa.el
-%{_datadir}/emacs/%{version}/leim/quail/japanese.el
-%{_datadir}/emacs/%{version}/leim/quail/lao.el
-%{_datadir}/emacs/%{version}/leim/quail/latin-alt.el
-%{_datadir}/emacs/%{version}/leim/quail/latin-ltx.el
-%{_datadir}/emacs/%{version}/leim/quail/latin-post.el
-%{_datadir}/emacs/%{version}/leim/quail/latin-pre.el
-%{_datadir}/emacs/%{version}/leim/quail/lrt.el
-%{_datadir}/emacs/%{version}/leim/quail/persian.el
-%{_datadir}/emacs/%{version}/leim/quail/py-punct.el
-%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.el
+%{_datadir}/emacs/%{version}/leim/quail/arabic.elc
+%{_datadir}/emacs/%{version}/leim/quail/croatian.elc
+%{_datadir}/emacs/%{version}/leim/quail/cyril-jis.elc
+%{_datadir}/emacs/%{version}/leim/quail/cyrillic.elc
+%{_datadir}/emacs/%{version}/leim/quail/czech.elc
+%{_datadir}/emacs/%{version}/leim/quail/ethiopic.elc
+%{_datadir}/emacs/%{version}/leim/quail/georgian.elc
+%{_datadir}/emacs/%{version}/leim/quail/greek.elc
+%{_datadir}/emacs/%{version}/leim/quail/hangul.elc
+%{_datadir}/emacs/%{version}/leim/quail/hanja-jis.elc
+%{_datadir}/emacs/%{version}/leim/quail/hanja.elc
+%{_datadir}/emacs/%{version}/leim/quail/hanja3.elc
+%{_datadir}/emacs/%{version}/leim/quail/hebrew.elc
+%{_datadir}/emacs/%{version}/leim/quail/indian.elc
+%{_datadir}/emacs/%{version}/leim/quail/ipa-praat.elc
+%{_datadir}/emacs/%{version}/leim/quail/ipa.elc
+%{_datadir}/emacs/%{version}/leim/quail/japanese.elc
+%{_datadir}/emacs/%{version}/leim/quail/lao.elc
+%{_datadir}/emacs/%{version}/leim/quail/latin-alt.elc
+%{_datadir}/emacs/%{version}/leim/quail/latin-ltx.elc
+%{_datadir}/emacs/%{version}/leim/quail/latin-post.elc
+%{_datadir}/emacs/%{version}/leim/quail/latin-pre.elc
+%{_datadir}/emacs/%{version}/leim/quail/lrt.elc
+%{_datadir}/emacs/%{version}/leim/quail/persian.elc
+%{_datadir}/emacs/%{version}/leim/quail/py-punct.elc
+%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.elc
%{_datadir}/emacs/%{version}/leim/quail/quick-b5.elc
%{_datadir}/emacs/%{version}/leim/quail/quick-cns.elc
-%{_datadir}/emacs/%{version}/leim/quail/rfc1345.el
-%{_datadir}/emacs/%{version}/leim/quail/sgml-input.el
-%{_datadir}/emacs/%{version}/leim/quail/sisheng.el
-%{_datadir}/emacs/%{version}/leim/quail/slovak.el
-%{_datadir}/emacs/%{version}/leim/quail/symbol-ksc.el
-%{_datadir}/emacs/%{version}/leim/quail/thai.el
-%{_datadir}/emacs/%{version}/leim/quail/tibetan.el
+%{_datadir}/emacs/%{version}/leim/quail/rfc1345.elc
+%{_datadir}/emacs/%{version}/leim/quail/sgml-input.elc
+%{_datadir}/emacs/%{version}/leim/quail/sisheng.elc
+%{_datadir}/emacs/%{version}/leim/quail/slovak.elc
+%{_datadir}/emacs/%{version}/leim/quail/symbol-ksc.elc
+%{_datadir}/emacs/%{version}/leim/quail/thai.elc
+%{_datadir}/emacs/%{version}/leim/quail/tibetan.elc
%{_datadir}/emacs/%{version}/leim/quail/tsang-b5.elc
%{_datadir}/emacs/%{version}/leim/quail/tsang-cns.elc
-%{_datadir}/emacs/%{version}/leim/quail/uni-input.el
-%{_datadir}/emacs/%{version}/leim/quail/viqr.el
-%{_datadir}/emacs/%{version}/leim/quail/vntelex.el
-%{_datadir}/emacs/%{version}/leim/quail/welsh.el
+%{_datadir}/emacs/%{version}/leim/quail/uni-input.elc
+%{_datadir}/emacs/%{version}/leim/quail/viqr.elc
+%{_datadir}/emacs/%{version}/leim/quail/vntelex.elc
+%{_datadir}/emacs/%{version}/leim/quail/welsh.elc
%dir %{_datadir}/emacs/%{version}/lisp/
%{_datadir}/emacs/%{version}/lisp/COPYING
%doc %{_datadir}/emacs/%{version}/lisp/README
@@ -3044,15 +3035,6 @@
%{_datadir}/emacs/%{version}/site-lisp/term/linux.el
%{_datadir}/emacs/%{version}/site-lisp/term/locale.el
%dir %{_datadir}/emacs/site-lisp/
-%{_datadir}/emacs/site-lisp/ger-keys.elc
-%{_datadir}/emacs/site-lisp/maple.elc
-%{_datadir}/emacs/site-lisp/php-mode.elc
-%{_datadir}/emacs/site-lisp/rmailgen.elc
-%{_datadir}/emacs/site-lisp/rmime.elc
-%{_datadir}/emacs/site-lisp/site-start.el
-%{_datadir}/emacs/site-lisp/subdirs.el
-%{_datadir}/emacs/site-lisp/vt200-esc-fix.elc
-%{_datadir}/emacs/site-lisp/xfonts.elc
%doc %{_mandir}/man1/*.1.gz
%dir /var/games/emacs/
/var/games/emacs/snake-scores
@@ -3078,6 +3060,7 @@
%files -n emacs-el
%defattr(-, root, root)
+%{_datadir}/emacs/%{version}/leim/ja-dic/ja-dic.el.gz
%{_datadir}/emacs/%{version}/leim/quail/4Corner.el.gz
%{_datadir}/emacs/%{version}/leim/quail/ARRAY30.el.gz
%{_datadir}/emacs/%{version}/leim/quail/CCDOSPY.el.gz
@@ -3095,10 +3078,47 @@
%{_datadir}/emacs/%{version}/leim/quail/TONEPY.el.gz
%{_datadir}/emacs/%{version}/leim/quail/ZIRANMA.el.gz
%{_datadir}/emacs/%{version}/leim/quail/ZOZY.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/arabic.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/croatian.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/cyril-jis.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/cyrillic.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/czech.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/ethiopic.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/georgian.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/greek.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/hangul.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/hanja-jis.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/hanja.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/hanja3.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/hebrew.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/indian.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/ipa-praat.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/ipa.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/japanese.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/lao.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/latin-alt.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/latin-ltx.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/latin-post.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/latin-pre.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/lrt.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/persian.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/py-punct.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/pypunct-b5.el.gz
%{_datadir}/emacs/%{version}/leim/quail/quick-b5.el.gz
%{_datadir}/emacs/%{version}/leim/quail/quick-cns.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/rfc1345.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/sgml-input.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/sisheng.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/slovak.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/symbol-ksc.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/thai.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/tibetan.el.gz
%{_datadir}/emacs/%{version}/leim/quail/tsang-b5.el.gz
%{_datadir}/emacs/%{version}/leim/quail/tsang-cns.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/uni-input.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/viqr.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/vntelex.el.gz
+%{_datadir}/emacs/%{version}/leim/quail/welsh.el.gz
%{_datadir}/emacs/%{version}/lisp/abbrev.el.gz
%{_datadir}/emacs/%{version}/lisp/align.el.gz
%{_datadir}/emacs/%{version}/lisp/allout-widgets.el.gz
++++++ emacs-24.1-tinfo.dif ++++++
--- /var/tmp/diff_new_pack.uLmHfD/_old 2012-12-19 10:52:43.000000000 +0100
+++ /var/tmp/diff_new_pack.uLmHfD/_new 2012-12-19 10:52:43.000000000 +0100
@@ -1,5 +1,25 @@
+--- configure
++++ configure
+@@ -14294,7 +14294,7 @@ $as_echo_n "checking for library containing tputs... "
>&6; }
+
+ # 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 terminfo termcap curses; do
+ OLIBS=$LIBS
+ if test -z "$tputs_library"; then
+ LIBS_TERMCAP=
+@@ -14386,7 +14386,7 @@ case "$opsys" in
+ ## option to use it.
+ darwin|gnu*)
+ ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
+- if test "x$HAVE_LIBNCURSES" = "xyes"; then
++ if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
+ TERMINFO=yes
+ LIBS_TERMCAP="-lncurses"
+ fi
--- configure.in
-+++ configure.in 2012-06-26 17:32:44.272010723 +0000
++++ configure.in
@@ -2803,7 +2803,7 @@ AC_DEFUN([tputs_link_source], [
])
# Maybe curses should be tried earlier?
@@ -9,24 +29,12 @@
OLIBS=$LIBS
if test -z "$tputs_library"; then
LIBS_TERMCAP=
-@@ -2855,7 +2855,7 @@ case "$opsys" in
+@@ -2853,7 +2853,7 @@ case "$opsys" in
+ ## option to use it.
+ darwin|gnu*)
## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
- if test "x$HAVE_LIBNCURSES" = "xyes"; then
+- if test "x$HAVE_LIBNCURSES" = "xyes"; then
++ if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
TERMINFO=yes
-- LIBS_TERMCAP="-lncurses"
-+ LIBS_TERMCAP="-ltinfo"
+ LIBS_TERMCAP="-lncurses"
fi
- ;;
-
---- src/config.in
-+++ 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
-
-+/* Define to 1 if you have the `tinfo' library (-ltinfo). */
-+#undef HAVE_LIBTINFO
-+
- /* Define to 1 if using libotf. */
- #undef HAVE_LIBOTF
-
++++++ emacs-24.1.dif ++++++
--- /var/tmp/diff_new_pack.uLmHfD/_old 2012-12-19 10:52:43.000000000 +0100
+++ /var/tmp/diff_new_pack.uLmHfD/_new 2012-12-19 10:52:43.000000000 +0100
@@ -39,6 +39,21 @@
(cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png
hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg
hicolor/scalable/mimetypes/emacs-document.svg )
-rm -f $(DESTDIR)${desktopdir}/emacs.desktop
for file in snake-scores tetris-scores; do \
+--- configure
++++ configure
+@@ -9740,9 +9740,9 @@ LD_SWITCH_X_SITE_AUX=
+ LD_SWITCH_X_SITE_AUX_RPATH=
+ if test "${x_libraries}" != NONE; then
+ if test -n "${x_libraries}"; then
+- LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+- LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
+- LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e
's/-R/-Wl,-rpath,/'`
++ LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
++ LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}"
++ LD_SWITCH_X_SITE_AUX_RPATH="-Wl,-rpath-link ${x_libraries%%:*}"
+ fi
+ x_default_search_path=""
+ x_search_path=${x_libraries}
--- configure.in
+++ configure.in 2012-06-27 09:58:47.056118544 +0000
@@ -1438,9 +1438,9 @@ LD_SWITCH_X_SITE_AUX=
@@ -138,18 +153,6 @@
.TP
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
---- leim/Makefile.in
-+++ leim/Makefile.in 2012-06-27 10:39:29.320443798 +0000
-@@ -220,6 +220,9 @@ leim-list.el: ${SUBDIRS} ${TIT_MISC} cha
-
- MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
-
-+${WORLD}: %.elc: %.el
-+ ${RUN-EMACS} -f batch-byte-compile $<
-+
- install: all
- if [ ! -d ${INSTALLDIR} ] ; then \
- umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2012-06-27 10:41:38.716510300 +0000
@@ -109,8 +109,8 @@ INSTALL_STRIP =
@@ -187,34 +190,6 @@
#ifdef WINDOWSNT
#include "ntlib.h"
#include <winsock.h>
---- lib-src/vcdiff
-+++ lib-src/vcdiff 2009-08-12 13:22:18.000000000 +0000
-@@ -76,6 +76,8 @@ esac
-
-
- rev1= rev2= status=0
-+rev1=/tmp/getaXXXXXXXX
-+rev2=/tmp/getbXXXXXXXX
- trap 'status=2; exit' 1 2 13 15
- trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
-
-@@ -86,14 +88,14 @@ do
- case $f in
- s.* | */s.*)
- if
-- rev1=`mktemp /tmp/geta.XXXXXXXX`
-+ rev1=`mktemp ${rev1}` || exit 1
- sccs get -s -p -k $sid1 "$f" > $rev1 &&
- case $sid2 in
- '')
- workfile=`expr " /$f" : '.*/s.\(.*\)'`
- ;;
- *)
-- rev2=`mktemp /tmp/getb.XXXXXXXX`
-+ rev2=`mktemp ${rev2}` || exit 1
- sccs get -s -p -k $sid2 "$f" > $rev2
- workfile=$rev2
- esac
--- lisp/cmuscheme.el
+++ lisp/cmuscheme.el 2009-08-12 13:29:47.000000000 +0000
@@ -240,7 +240,8 @@ is run).
@@ -227,30 +202,6 @@
(set-buffer (apply 'make-comint "scheme" (car cmdlist)
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
---- lisp/dired.el
-+++ lisp/dired.el 2012-06-27 10:43:26.472010441 +0000
-@@ -71,7 +71,8 @@ If nil, `dired-listing-switches' is used
- (defcustom dired-chown-program
- (purecopy (cond ((executable-find "chown") "chown")
- ((file-executable-p "/usr/sbin/chown") "/usr/sbin/chown")
-- ((file-executable-p "/etc/chown") "/etc/chown")
-+ ((file-executable-p "/usr/bin/chown") "/usr/bin/chown")
-+ ((file-executable-p "/bin/chown") "/bin/chown")
- (t "chown")))
- "Name of chown command (usually `chown')."
- :group 'dired
---- lisp/help.el
-+++ lisp/help.el 2012-06-27 10:44:38.572010511 +0000
-@@ -45,6 +45,9 @@
- (defvar help-window-point-marker (make-marker)
- "Marker to override default `window-point' in help windows.")
-
-+(defvar help-mode-hook nil
-+ "Normal hook run when entering Help mode.")
-+
- (defvar help-map
- (let ((map (make-sparse-keymap)))
- (define-key map (char-to-string help-char) 'help-for-help)
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2010-10-18 14:06:48.000000000 +0000
@@ -41,6 +41,7 @@
@@ -823,17 +774,6 @@
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von locale.el
---- src/config.in
-+++ src/config.in 2012-06-27 11:12:06.416510145 +0000
-@@ -1348,6 +1348,8 @@ along with GNU Emacs. If not, see <http
- code using `volatile' can become incorrect without. Disable with care. */
- #undef volatile
-
-+/* tparam() masking because of common name in ncurses */
-+#define tparam emacs_tparam
-
- /* On AIX 3 this must be included before any other include file. */
- #include <alloca.h>
--- src/lisp.mk
+++ src/lisp.mk 2012-06-27 11:10:56.532510062 +0000
@@ -142,6 +142,8 @@ lisp = \
@@ -845,31 +785,3 @@
$(lispsource)/disp-table.elc \
$(lispsource)/dos-w32.elc \
$(lispsource)/w32-fns.elc \
---- src/s/gnu-linux.h
-+++ src/s/gnu-linux.h 2012-06-27 11:35:27.128011252 +0000
-@@ -169,4 +169,15 @@ along with GNU Emacs. If not, see <http
- # define USE_MMAP_FOR_BUFFERS
- #endif
-
-+#ifndef HAVE_TERMIOS
-+# define HAVE_TERMIOS
-+#endif
-
-+/* When _USE_BSD is defined, which it will be on glibc based
-+ * systems, sigmask/sigpause will be defined in the system signal.h
-+ * header file, we want the one in emacs's syssignal.h or else things
-+ * blow up. Note this worked on Intel by luck because of how arguments
-+ * are passed on the stack ;-(
-+ */
-+#undef sigmask
-+#undef sigpause
---- src/sysdep.c
-+++ src/sysdep.c 2012-06-27 11:36:07.464510261 +0000
-@@ -89,6 +89,7 @@ along with GNU Emacs. If not, see <http
- #include "dispextern.h"
- #include "process.h"
- #include "cm.h" /* for reset_sys_modes */
-+extern void tputs (const char *, int, int (*)(int));
-
- #ifdef WINDOWSNT
- #include <direct.h>
++++++ site-lisp.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/site-lisp/site-start.el new/site-lisp/site-start.el
--- old/site-lisp/site-start.el 2010-11-18 11:07:01.000000000 +0100
+++ new/site-lisp/site-start.el 2010-11-18 11:07:01.000000000 +0100
@@ -134,19 +134,6 @@
;; ---------------------
; (delete-selection-mode 1)
;;
- ;; Multi-click for mouse
- ;; ---------------------
- (eval-when-compile
- (defvar mouse-sel-default-bindings)
- (defvar mouse-sel-leave-point-near-mouse)
- (defvar mouse-sel-cycle-clicks)
- (defvar mouse-yank-at-point))
- (setq mouse-sel-default-bindings 'interprogram-cut-paste)
- (setq mouse-sel-leave-point-near-mouse nil)
- (setq mouse-sel-cycle-clicks nil)
-; (setq mouse-yank-at-point t) ; just like old vi
- (require 'mouse-sel)
- ;;
;; Show corresponding braces
;; -------------------------
(show-paren-mode 1)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
