Hello community,
here is the log from the commit of package emacs for openSUSE:Factory checked
in at 2013-05-28 07:29:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/emacs (Old)
and /work/SRC/openSUSE:Factory/.emacs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2013-05-06
10:13:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2013-05-28
07:29:24.000000000 +0200
@@ -1,0 +2,121 @@
+Fri May 24 10:30:24 UTC 2013 - wer...@suse.de
+
+- Make emacs launch script smart, that is search for a valid dbus
+ on the current system if if not found launch a own dbus session
+- With emacs version 24.3 the package epg becoes obsolate
+
+-------------------------------------------------------------------
+Wed May 22 10:13:13 UTC 2013 - wer...@suse.de
+
+- Update to to emacs version 24.3
+ * Emacs no longer searches for `leim-list.el' files beneath the standard
+ lisp/ directory. There should not be any there anyway. If you have
+ been adding them there, put them somewhere else; e.g., site-lisp.
+ * `C-h f' (`describe-function') can now perform autoloading.
+ When this command is called for an autoloaded function whose docstring
+ contains a key substitution construct, that function's library is
+ automatically loaded, so that the documentation can be shown
+ correctly. To disable this, set `help-enable-auto-load' to nil.
+ * `C-h f' now reports previously-autoloaded functions as "autoloaded",
+ even after their associated libraries have been loaded (and the
+ autoloads have been redefined as functions).
+ * Images displayed via ImageMagick now support transparency and the
+ :background image specification property.
+ * When available, ImageMagick support is automatically enabled.
+ It is no longer necessary to call `imagemagick-register-types'
+ explicitly to install ImageMagick image types; that function is called
+ automatically at startup, or when customizing an imagemagick- option.
+ * Setting `imagemagick-types-inhibit' to t now disables the use of
+ ImageMagick to view images. (You must call `imagemagick-register-types'
+ afterwards if you do not use customize to change this.)
+ * The new variable `imagemagick-enabled-types' also affects which
+ ImageMagick types are treated as images. The function
+ `imagemagick-filter-types' returns the list of types that will be
+ treated as images.
+ * In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
+ next and previous path separator, respectively.
+ * `minibuffer-electric-default-mode' can shorten "(default ...)" to "[...]"
+ in minibuffer prompts. Just set `minibuffer-eldef-shorten-default'
+ non-nil before enabling the mode.
+ * New option `mode-line-default-help-echo' specifies the help text
+ (shown in a tooltip or in the echo area) for any part of the mode line
+ that does not have its own specialized help text.
+ * You can now click mouse-3 in the coding system indicator to invoke
+ `set-buffer-file-coding-system'.
+ * emacsclient now obeys string values for `initial-buffer-choice',
+ if it is told to open a new frame without specifying any file to visit
+ or expression to evaluate.
+ * New option `server-auth-key' specifies a shared server key.
+ * Emacs now generates backtraces on fatal errors.
+ On encountering a fatal error, Emacs now outputs a textual description
+ of the fatal signal, and a short backtrace on platforms like glibc
+ that support backtraces.
+ * `C-x C-q' is now bound to the new minor mode `read-only-mode'.
+ This minor mode replaces `toggle-read-only', which is now obsolete.
+ * Most `y-or-n' prompts now allow you to scroll the selected window.
+ Typing `C-v' or `M-v' at a y-or-n prompt scrolls forward or backward
+ respectively, without exiting from the prompt.
+ * In the Package Menu, newly-available packages are listed as "new",
+ and sorted above the other "available" packages by default.
+ * If your Emacs was built from a bzr checkout, the new variable
+ `emacs-bzr-version' contains information about the bzr revision used.
+ * New option `create-lockfiles' specifies usage of lockfiles.
+ It defaults to t. Changing it to nil inhibits the creation of lock
+ files (use this with caution).
+ * New option `enable-remote-dir-locals', if non-nil, allows directory-local
+ variables on remote hosts.
+ * The entry for PCL-CVS has been removed from the Tools menu.
+ The PCL-CVS commands are still available via the keyboard.
+ * Using "unibyte: t" in Lisp source files is obsolete.
+ Use "coding: raw-text" instead.
+ * In the buffer made by `M-x report-emacs-bug', the `C-c m' binding
+ has been changed to `C-c M-i' (`report-emacs-bug-insert-to-mailer').
+ The previous binding, introduced in Emacs 24.1, was a mistake, because
+ `C-c LETTER' bindings are reserved for user customizations.
+ * Non-regexp Isearch now performs "lax" space matching.
+ Each sequence of spaces in the supplied search string may match any
+ sequence of one or more whitespace characters, as specified by the
+ variable `search-whitespace-regexp'. (This variable is also used by a
+ similar existing feature for regexp Isearch.)
+ * New Isearch command `M-s SPC' toggles lax space matching.
+ This applies to both ordinary and regexp Isearch.
+ * New option `replace-lax-whitespace'.
+ If non-nil, `query-replace' uses flexible whitespace matching too.
+ The default is nil.
+ * Global `M-s _' starts a symbol (identifier) incremental search,
+ and `M-s _' in Isearch toggles symbol search mode.
+ `M-s c' in Isearch toggles search case-sensitivity.
+ * New binding `M-g c' for `goto-char'.
+ * New binding `M-g TAB' for `move-to-column'.
+ * `M-g TAB' (`move-to-column') prompts for a column number if called
+ interactively with no prefix arg. Previously, it moved to column 1.
+ * New option `yank-handled-properties' allows processing of text
+ properties on yanked text, in ways that are more general than just
+ removing them (as is done by `yank-excluded-properties').
+ * New option `delete-trailing-lines' specifies whether
+ M-x delete-trailing-whitespace should delete trailing lines at the end
+ of the buffer. It defaults to t.
+ * `C-u M-=' now counts lines/words/characters in the entire buffer.
+ * `C-x 8 RET' is now bound to `insert-char', which is now a command.
+ `ucs-insert' is now an obsolete alias for `insert-char'.
+ * The `z' key no longer has a binding in most special modes.
+ It used to be bound to `kill-this-buffer', but `z' is too easy to
+ accidentally type.
+ * New command `C-x r M-w' (`copy-rectangle-as-kill').
+ It copies the region-rectangle as the last rectangle kill.
+ * `C-x r +' is now overloaded to invoke `append-to-register'.
+ * New option `register-separator' specifies the register containing
+ the text to put between collected texts for use with
+ M-x append-to-register and M-x prepend-to-register.
+- Update file lists
+- Remove patches done upstream
+- Port remaining patches
+- Exclude info.info page as this is part of package info
+
+-------------------------------------------------------------------
+Tue May 21 14:38:23 UTC 2013 - wer...@suse.de
+
+- Do not install etags below OS 13.0 (bnc#820567)
+- Use UTF-8 even in changelog for old entries
+
+-------------------------------------------------------------------
@@ -1687,2 +1808,2 @@
- - Drucken sollte jetzt m�glich sein
- - Aufr�umen von term/linux.el und term/xterm.el
+ - Drucken sollte jetzt möglich sein
+ - Aufräumen von term/linux.el und term/xterm.el
@@ -1693 +1814 @@
- - Delete l�scht Zeichen unter dem Cursor
+ - Delete löscht Zeichen unter dem Cursor
Old:
----
emacs-22.0.99-x11r7.patch
emacs-22.0.99-xim.patch
emacs-22.2-iconic.patch
emacs-23.1-asian-print.patch
emacs-23.1-flyspell.patch
emacs-24.1-decl.dif
emacs-24.1-glibc.patch
emacs-24.1-nonvoid.patch
emacs-24.1-ps-bdf.patch
emacs-24.1-s390x.dif
emacs-24.1-tinfo.dif
emacs-24.1-xevent.patch
emacs-24.1-xgselect.patch
emacs-24.1.dif
emacs-24.2-giflib5.patch
emacs-24.2.tar.bz2
emacs.desktop
New:
----
emacs-24.3-asian-print.patch
emacs-24.3-decl.dif
emacs-24.3-flyspell.patch
emacs-24.3-giflib5.patch
emacs-24.3-glibc.patch
emacs-24.3-iconic.patch
emacs-24.3-nonvoid.patch
emacs-24.3-ps-bdf.patch
emacs-24.3-x11r7.patch
emacs-24.3-xevent.patch
emacs-24.3-xim.patch
emacs-24.3.dif
emacs-24.3.tar.xz
emacs.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
++++ 1040 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/emacs/emacs.spec
++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs.spec
++++++ emacs-23.1-asian-print.patch -> emacs-24.3-asian-print.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-23.1-asian-print.patch
2011-09-23 01:56:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-asian-print.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
--- lisp/ps-mule.el
-+++ lisp/ps-mule.el 2009-08-10 18:18:24.585901695 +0200
-@@ -240,7 +240,7 @@ Currently, data for Japanese and Korean
++++ lisp/ps-mule.el 2009-08-10 16:18:24.585901695 +0000
+@@ -239,7 +239,7 @@ Currently, data for Japanese and Korean
(japanese-jisx0208
(normal bdf "jiskan24.bdf"))
(korean-ksc5601
++++++ emacs-24.1-decl.dif -> emacs-24.3-decl.dif ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-24.1-decl.dif 2012-06-28
17:24:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-decl.dif 2013-05-28
07:29:23.000000000 +0200
@@ -1,12 +1,12 @@
--- src/frame.c
-+++ src/frame.c 2012-06-26 16:09:59.692010311 +0000
-@@ -21,6 +21,9 @@ along with GNU Emacs. If not, see <http
++++ src/frame.c 2013-05-21 15:13:32.849939500 +0000
+@@ -22,6 +22,9 @@ along with GNU Emacs. If not, see <http
+ #define FRAME_INLINE EXTERN_INLINE
#include <stdio.h>
- #include <ctype.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
#include <errno.h>
#include <limits.h>
- #include <setjmp.h>
+
++++++ emacs-23.1-flyspell.patch -> emacs-24.3-flyspell.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-23.1-flyspell.patch 2011-09-23
01:56:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-flyspell.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
--- lisp/textmodes/flyspell.el
-+++ lisp/textmodes/flyspell.el 2009-08-11 14:54:35.749901460 +0200
-@@ -279,6 +279,12 @@ If `flyspell-large-region' is nil, all r
++++ lisp/textmodes/flyspell.el 2009-08-11 12:54:35.749901460 +0000
+@@ -284,6 +284,12 @@ If this variable is nil, all regions are
"The key binding for flyspell auto correction."
:group 'flyspell)
@@ -13,7 +13,7 @@
;;*---------------------------------------------------------------------*/
;;* Mode specific options */
;;* ------------------------------------------------------------- */
-@@ -302,7 +308,6 @@ property of the major mode name.")
+@@ -307,7 +313,6 @@ property of the major mode name.")
;;*--- mail mode -------------------------------------------------------*/
(put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
(put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@@ -21,7 +21,7 @@
(defun mail-mode-flyspell-verify ()
"Function used for `flyspell-generic-check-word-predicate' in Mail mode."
(let ((header-end (save-excursion
-@@ -314,11 +319,11 @@ property of the major mode name.")
+@@ -319,11 +324,11 @@ property of the major mode name.")
nil t)
(point)))
(signature-begin
++++++ emacs-24.2-giflib5.patch -> emacs-24.3-giflib5.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-24.2-giflib5.patch 2013-03-23
07:38:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-giflib5.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,8 +1,6 @@
-diff --git a/src/image.c b/src/image.c
-index 73490fe..7acd5a3 100644
---- a/src/image.c
-+++ b/src/image.c
-@@ -7176,7 +7176,11 @@ gif_load (struct frame *f, struct image *img)
+--- src/image.c
++++ src/image.c 2013-05-21 15:49:41.945819346 +0000
+@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
}
/* Open the GIF file. */
@@ -14,7 +12,7 @@
if (gif == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
-@@ -7197,7 +7201,11 @@ gif_load (struct frame *f, struct image *img)
+@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
memsrc.len = SBYTES (specified_data);
memsrc.index = 0;
++++++ emacs-24.1-glibc.patch -> emacs-24.3-glibc.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-24.1-glibc.patch 2013-01-14
22:20:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-glibc.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
---- configure
-+++ configure
-@@ -10020,6 +10020,7 @@ system_malloc=no
+--- configure.ac
++++ configure.ac 2013-05-21 14:16:11.589439382 +0000
+@@ -1692,6 +1692,7 @@ system_malloc=no
case "$opsys" in
## darwin ld insists on the use of malloc routines in the System framework.
darwin|sol2-10) system_malloc=yes ;;
@@ -8,17 +8,17 @@
esac
if test "${system_malloc}" = "yes"; then
-@@ -10063,6 +10064,7 @@ fi
+@@ -1732,6 +1733,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+ gnu-linux) use_mmap_for_buffers=yes ;;
esac
-
---- configure.in
-+++ configure.in
-@@ -1661,6 +1661,7 @@ system_malloc=no
+ AC_FUNC_MMAP
+--- configure
++++ configure 2013-05-21 13:59:14.357439665 +0000
+@@ -9828,6 +9828,7 @@ system_malloc=no
case "$opsys" in
## darwin ld insists on the use of malloc routines in the System framework.
darwin|sol2-10) system_malloc=yes ;;
@@ -26,61 +26,52 @@
esac
if test "${system_malloc}" = "yes"; then
-@@ -1701,6 +1702,7 @@ fi
+@@ -9871,6 +9872,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+ gnu-linux) use_mmap_for_buffers=yes ;;
esac
- AC_FUNC_MMAP
+
--- lib-src/Makefile.in
-+++ 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
++++ lib-src/Makefile.in 2013-05-21 14:51:33.357939393 +0000
+@@ -296,14 +296,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
+ ../lib/libgnu.a: $(config_h)
cd ../lib && $(MAKE) libgnu.a
+REGEXPOBJ =
+#REGEXPOBJ = regex.o
- regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
+ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
${srcdir}/../src/regex.c
--etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h
-+etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) ../src/config.h
+-etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
++etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) $(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
+ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h)
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
-@@ -325,7 +330,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
+@@ -314,7 +316,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
ctags${EXEEXT}: etags${EXEEXT}
$(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
+ profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+ $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
--- lib-src/etags.c
-+++ lib-src/etags.c 2012-06-26 16:03:43.356510061 +0000
-@@ -92,7 +92,7 @@ char pot_etags_version[] = "@(#) pot rev
++++ lib-src/etags.c 2013-05-21 14:52:23.881939078 +0000
+@@ -91,7 +91,7 @@ char pot_etags_version[] = "@(#) pot rev
+ # define NDEBUG /* disable assert */
#endif
- #ifdef HAVE_CONFIG_H
--# include <config.h>
-+# include <../src/config.h>
- /* 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 2012-06-26 16:05:56.116010465 +0000
-@@ -159,3 +159,6 @@ along with GNU Emacs. If not, see <http
- } while (0)
- #endif
- #endif
-+
-+/* we have regex in the GNU C-library. */
-+#define REGEXP_IN_LIBC
+-#include <config.h>
++#include <../src/config.h>
+
+ #ifndef _GNU_SOURCE
+ # define _GNU_SOURCE 1 /* enables some compiler checks on GNU
*/
++++++ emacs-22.2-iconic.patch -> emacs-24.3-iconic.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-22.2-iconic.patch 2011-09-23
01:56:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-iconic.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
--- lisp/startup.el
-+++ lisp/startup.el 2008-03-31 12:23:04.503065574 +0200
-@@ -1996,6 +1996,9 @@ A fancy display is used on graphic displ
++++ lisp/startup.el 2008-03-31 10:23:04.503065574 +0000
+@@ -2171,6 +2171,9 @@ A fancy display is used on graphic displ
((equal argi "-no-splash")
(setq inhibit-startup-screen t))
++++++ emacs-24.1-nonvoid.patch -> emacs-24.3-nonvoid.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-24.1-nonvoid.patch 2012-06-28
17:24:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-nonvoid.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
--- src/xmenu.c
-+++ src/xmenu.c 2012-06-26 17:12:22.856009442 +0000
-@@ -316,8 +316,8 @@ for instance using the window manager, t
++++ src/xmenu.c 2013-05-21 15:21:41.301439390 +0000
+@@ -310,8 +310,8 @@ for instance using the window manager, t
#else
{
Lisp_Object title;
@@ -8,6 +8,6 @@
- Lisp_Object selection;
+ const char *error_name = NULL;
+ Lisp_Object selection = Qnil;
- int specpdl_count = SPECPDL_INDEX ();
+ ptrdiff_t specpdl_count = SPECPDL_INDEX ();
/* Decode the dialog items from what was specified. */
++++++ emacs-24.1-ps-bdf.patch -> emacs-24.3-ps-bdf.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-24.1-ps-bdf.patch 2012-06-28
17:24:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-ps-bdf.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,7 +1,7 @@
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el 2012-06-26 16:26:01.900010474 +0000
-@@ -23074,9 +23074,9 @@ With prefix argument ARG, restart the Pr
- ;;;;;; 65510))
+@@ -21658,9 +21658,9 @@ With prefix argument ARG, restart the Pr
+ ;;;;;; 18685 911514 0))
;;; 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")) "\
++++++ emacs-22.0.99-x11r7.patch -> emacs-24.3-x11r7.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-22.0.99-x11r7.patch 2011-09-23
01:56:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-x11r7.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
--- src/xrdb.c
-+++ src/xrdb.c 2007-05-15 18:01:41.439517668 +0200
-@@ -54,6 +54,9 @@ Boston, MA 02110-1301, USA. */
++++ src/xrdb.c 2007-05-15 16:01:41.439517668 +0000
+@@ -39,6 +39,9 @@ along with GNU Emacs. If not, see <http
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
@@ -10,7 +10,7 @@
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
-@@ -609,6 +612,15 @@ x_load_resources (display, xrm_string, m
+@@ -539,6 +542,15 @@ x_load_resources (Display *display, cons
XrmPutLineResource (&rdb, line);
#endif /* not USE_MOTIF */
@@ -26,7 +26,7 @@
user_database = get_user_db (display);
-@@ -651,6 +663,10 @@ x_load_resources (display, xrm_string, m
+@@ -580,6 +592,10 @@ x_load_resources (Display *display, cons
XrmMergeDatabases (db, &rdb);
}
++++++ emacs-24.1-xevent.patch -> emacs-24.3-xevent.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-24.1-xevent.patch 2012-07-23
10:15:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-xevent.patch
2013-05-28 07:29:23.000000000 +0200
@@ -1,9 +1,9 @@
--- src/xmenu.c
-+++ src/xmenu.c 2012-07-03 11:51:37.448009822 +0000
-@@ -964,7 +964,7 @@ set_frame_menubar (FRAME_PTR f, int firs
++++ src/xmenu.c 2013-05-21 15:42:44.917439139 +0000
+@@ -953,7 +953,7 @@ set_frame_menubar (FRAME_PTR f, bool fir
{
deep_p = 1;
- f->output_data.x->saved_menu_event = (XEvent*)xmalloc (sizeof (XEvent));
+ f->output_data.x->saved_menu_event = xmalloc (sizeof (XEvent));
- f->output_data.x->saved_menu_event->type = 0;
+ memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));
}
@@ -11,7 +11,7 @@
#ifdef USE_GTK
--- src/xselect.c
+++ src/xselect.c 2012-07-03 11:08:10.732010284 +0000
-@@ -2344,7 +2344,14 @@ x_fill_property_data (Display *dpy, Lisp
+@@ -2350,7 +2350,14 @@ x_fill_property_data (Display *dpy, Lisp
Lisp_Object o = XCAR (iter);
if (INTEGERP (o) || FLOATP (o) || CONSP (o))
@@ -26,18 +26,19 @@
+ }
else if (STRINGP (o))
{
- BLOCK_INPUT;
+ block_input ();
--- src/xterm.c
-+++ src/xterm.c 2012-07-03 11:47:12.060510503 +0000
-@@ -5753,9 +5753,10 @@ static struct x_display_info *next_noop_
++++ src/xterm.c 2013-05-21 15:44:18.617938988 +0000
+@@ -5764,9 +5764,11 @@ static struct x_display_info *next_noop_
#define SET_SAVED_BUTTON_EVENT \
do
\
{ \
- if (f->output_data.x->saved_menu_event == 0) \
+ if (f->output_data.x->saved_menu_event == 0) { \
- f->output_data.x->saved_menu_event \
- = (XEvent *) xmalloc (sizeof (XEvent)); \
-+ memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent));}\
- *f->output_data.x->saved_menu_event = event; \
+ f->output_data.x->saved_menu_event =
\
+ xmalloc (sizeof (XEvent)); \
++ memset(f->output_data.x->saved_menu_event,0,sizeof(XEvent)); \
++ } \
+ *f->output_data.x->saved_menu_event = event; \
inev.ie.kind = MENU_BAR_ACTIVATE_EVENT; \
XSETFRAME (inev.ie.frame_or_window, f); \
++++++ emacs-22.0.99-xim.patch -> emacs-24.3-xim.patch ++++++
--- /work/SRC/openSUSE:Factory/emacs/emacs-22.0.99-xim.patch 2011-09-23
01:56:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3-xim.patch 2013-05-28
07:29:23.000000000 +0200
@@ -1,6 +1,6 @@
--- src/xfns.c
-+++ src/xfns.c 2007-05-15 18:37:13.282161551 +0200
-@@ -1959,8 +1959,8 @@ static XIMStyle best_xim_style P_ ((XIMS
++++ src/xfns.c 2007-05-15 16:37:13.282161551 +0000
+@@ -1845,8 +1845,8 @@ static XIMStyle best_xim_style (XIMStyle
static XIMStyle supported_xim_styles[] =
{
++++++ emacs-24.1-decl.dif -> emacs-24.3.dif ++++++
++++ 788 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/emacs/emacs-24.1-decl.dif
++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs-24.3.dif
++++++ emacs-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.ondvl3/_old 2013-05-28 07:29:28.000000000 +0200
+++ /var/tmp/diff_new_pack.ondvl3/_new 2013-05-28 07:29:28.000000000 +0200
@@ -2,3 +2,7 @@
addFilter(".*zero-length.*/var/games/emacs/.*-scores.*")
addFilter(".*hidden-file-or-dir.*/etc/skel/.gnu-emacs.*")
addFilter(".*file-in-usr-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*")
+addFilter(".*non-etc-or-var-file-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*")
+addFilter(".*no-manual-page-for-binary.*emacs-*")
+addFilter(".*name-repeated-in-summar.*")
+addFilter(".*idden-file-or-dir.*\.dir-locals.el.*")
++++++ emacs.sh ++++++
#!/bin/bash
#
# Launch a GNU Emacs
#
# The environment variable EMACS_TOOLKIT is used to determine
# the prefered GUI. Possible values/types of EMACS_TOOLKIT are
#
# nox -- for pure console based GNU Emacs
# gtk -- for full GTK2/3 based GNU Emacs
# x11 -- for full LUCID based GNU Emacs (used Xaw3d)
#
# Should work but remember history
# bnc#345669 -- Emacs doesn't un-maximize in KDE/KWin
# bnc#342385 -- Emacs doesn't keep the iconic information in KDE/KWin
#
# if test -z "$EMACS_TOOLKIT" ; then
# EMACS_TOOLKIT=gtk
# KDE_FULL_SESSION=$(xprop -root KDE_FULL_SESSION 2>/dev/null)
# case "$KDE_FULL_SESSION" in
# *true*) EMACS_TOOLKIT=x11
# esac
# fi
#
: ${EMACS_TOOLKIT:=gtk}
if test "$EMACS_TOOLKIT" = gtk; then
# Currently (2013/05/24) the parser of the GNOME libs
# are broken that is it is not independent from locale
LC_NUMERIC=POSIX
export LC_NUMERIC
fi
arg0=$0
argv=("$@")
if test -e ${arg0}-${EMACS_TOOLKIT}
then
set -- ${arg0}-${EMACS_TOOLKIT}
elif test -e ${arg0}-x11
then
set -- ${arg0}-x11
elif test -e ${arg0}-nox
then
set -- ${arg0}-nox
else
echo "no emacs binary found"
exit 1
fi
#
# Now check for valid dbus, e.g. after su/sudo/slogin
#
if dbusdaemon=$(type -p dbus-daemon) && dbuslaunch=$(type -p dbus-launch) ; then
#
# Currently (2013/05/24) the option --autolaunch for scanning for an
# already existing session is an internal option of dbus-launch(1).
#
if test -s /var/lib/dbus/machine-id ; then
read -t1 mid < /var/lib/dbus/machine-id
elif test -s /etc/machine-id ; then
read -t1 mid < /etc/machine-id
else
mid=
fi
if test -n "$DBUS_SESSION_BUS_ADDRESS" ; then
# Determine dbus identifier
for guid in ${DBUS_SESSION_BUS_ADDRESS//,/ } ; do
case "$guid" in
guid=*) break
esac
done
# Check if dbus-daemon is active
dpid=
for suid in "${HOME}/.dbus/session-bus/"${mid}* ; do
test -e "$suid" || break
grep -q $guid "$suid" || continue
dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' "$suid")
test /proc/${dpid#*=}/exe -ef $dbusdaemon && continue
unset DBUS_SESSION_BUS_ADDRESS
break
done
test -n "$dpid" || unset DBUS_SESSION_BUS_ADDRESS
fi
# Find a valid dbus-daemon if active
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
for suid in "${HOME}/.dbus/session-bus/"${mid}* ; do
test -e "$suid" || break
dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' "$suid")
test /proc/${dpid#*=}/exe -ef $dbusdaemon || continue
dadd=$(grep -E '^DBUS_SESSION_BUS_ADDRESS=' "$suid")
DBUS_SESSION_BUS_ADDRESS=${dadd#*=}
export DBUS_SESSION_BUS_ADDRESS
done
fi
unset mid guid suid dadd
# Oops ... no dbus-daemon then launch a new session
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session
${1+"$@"}
arg0=$dbuslaunch
fi
unset dbuslaunch dbusdaemon
fi
exec -a $arg0 ${1+"$@"} "${argv[@]}"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
