Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2012-05-26 13:08:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs", Maintainer is "werner@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2012-05-07 22:46:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2012-05-26 13:08:58.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 24 11:39:36 UTC 2012 - werner@suse.de + +- Avoid endless loop due multiplying zero with two as this results + also in zero (bnc#763851) ... found in xgselect.c for increasing + the allocated memory used for g_main_context_query(). + +------------------------------------------------------------------- New: ---- emacs-23.3-xgselect.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.h14czg/_old 2012-05-26 13:09:00.000000000 +0200 +++ /var/tmp/diff_new_pack.h14czg/_new 2012-05-26 13:09:00.000000000 +0200 @@ -83,6 +83,7 @@ Patch18: emacs-sparc.diff Patch22: emacs-23.1-bnc628268.patch Patch23: emacs-23.3-bnc740447.patch +Patch24: emacs-23.3-xgselect.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -186,6 +187,7 @@ fi %patch22 %patch23 +%patch24 # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) %if %suse_version >= 1110 ++++++ emacs-23.3-xgselect.patch ++++++ --- 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); } + else if (!gfds) + { + gfds_size = 1; + gfds = xmalloc (sizeof (*gfds)); + } n_gfds = g_main_context_query (context, G_PRIORITY_LOW, ++++++ emacs-23.3.dif ++++++ --- /var/tmp/diff_new_pack.h14czg/_old 2012-05-26 13:09:00.000000000 +0200 +++ /var/tmp/diff_new_pack.h14czg/_new 2012-05-26 13:09:00.000000000 +0200 @@ -678,7 +678,7 @@ :help ,(purecopy "Supply explicit dictionary file name"))) --- site-lisp/term/func-keys.el +++ site-lisp/term/func-keys.el 2003-07-23 16:08:56.000000000 +0000 -@@ -0,0 +1,31 @@ +@@ -0,0 +1,33 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/func-keys.el for site-lisp path +;;; Copyright (c) 1996-2001 SuSE Gmbh Nuernberg, Germany. @@ -707,7 +707,9 @@ +;; +;; Wheel mouse support +;; -+(mouse-wheel-mode 1) ++(if (fboundp 'mouse-wheel-mode) ++ (mouse-wheel-mode 1) ++) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von func-keys.el --- site-lisp/term/gnome.el -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org