Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Fri Nov 27 14:35:15 CET 2009. -------- --- emacs/emacs.changes 2009-11-19 11:22:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2009-11-26 14:55:05.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 26 14:54:17 CET 2009 - werner@suse.de + +- Add patch from upstream to fix bug bnc#556175 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emacs-23.1-bnc556175.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.10gK5Z/_old 2009-11-27 14:33:17.000000000 +0100 +++ /var/tmp/diff_new_pack.10gK5Z/_new 2009-11-27 14:33:17.000000000 +0100 @@ -21,10 +21,10 @@ Name: emacs BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel Url: http://www.gnu.org/software/emacs/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 3 +Release: 4 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -52,6 +52,7 @@ Patch11: emacs-22.0.99-xim.patch Patch12: emacs-22.0.99-x11r7.patch Patch13: emacs-23.1-s390x.dif +Patch14: emacs-23.1-bnc556175.patch Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,7 +94,7 @@ Ken Stevens <k.stevens@ieee.org> %package -n emacs-nox -License: GPL v2 or later +License: GPLv2+ PreReq: fileutils Requires: emacs = %{version}-%{release} Provides: emacs_program = %{version}-%{release} @@ -125,7 +126,7 @@ Ken Stevens <k.stevens@ieee.org> %package -n emacs-x11 -License: GPL v2 or later +License: GPLv2+ PreReq: fileutils Requires: emacs = %{version}-%{release} Enhances: xorg-x11-libs @@ -160,7 +161,7 @@ Ken Stevens <k.stevens@ieee.org> %package -n emacs-el -License: GPL v2 or later +License: GPLv2+ Obsoletes: ge_lisp Requires: emacs = %{version}-%{release} Summary: Several Lisp Files for GNU Emacs @@ -187,7 +188,7 @@ Eric S. Raymond <esr@thyrsus.com> %package -n emacs-info -License: GPL v2 or later +License: GPLv2+ Obsoletes: ge_info elispman elisp-manual elispint emacs-lisp-intro Provides: elispman elisp-manual elispint emacs-lisp-intro Summary: Info files for GNU Emacs @@ -230,6 +231,7 @@ %patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch13 -p0 -b .s390x +%patch14 -p0 -b .loop %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %patch ++++++ emacs-23.1-bnc556175.patch ++++++ --- src/term.c +++ src/term.c 2009-11-26 14:09:38.631431310 +0100 @@ -37,6 +37,7 @@ along with GNU Emacs. If not, see <http #include <signal.h> #include <stdarg.h> +#include <setjmp.h> #include "lisp.h" #include "termchar.h" @@ -1650,7 +1651,7 @@ produce_glyphs (it) if (unibyte_display_via_language_environment && (it->c >= 0240)) { - it->char_to_display = unibyte_char_to_multibyte (it->c); + it->char_to_display = BYTE8_TO_CHAR (it->c); it->pixel_width = CHAR_WIDTH (it->char_to_display); it->nglyphs = it->pixel_width; if (it->glyph_row) @@ -3467,9 +3465,7 @@ init_tty (char *name, char *terminal_typ tty->type = xstrdup (terminal_type); -#ifdef subprocesses add_keyboard_wait_descriptor (fileno (tty->input)); -#endif #endif /* !DOS_NT */ @@ -3959,8 +3957,6 @@ static void delete_tty (struct terminal *terminal) { struct tty_display_info *tty; - Lisp_Object tail, frame; - int last_terminal; /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ @@ -3972,19 +3968,6 @@ delete_tty (struct terminal *terminal) tty = terminal->display_info.tty; - last_terminal = 1; - FOR_EACH_FRAME (tail, frame) - { - struct frame *f = XFRAME (frame); - if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) - { - last_terminal = 0; - break; - } - } - if (last_terminal) - error ("Attempt to delete the sole terminal device with live frames"); - if (tty == tty_list) tty_list = tty->next; else @@ -4025,10 +4008,8 @@ delete_tty (struct terminal *terminal) xfree (tty->old_tty); xfree (tty->Wcm); - if (tty->termcap_strings_buffer) - xfree (tty->termcap_strings_buffer); - if (tty->termcap_term_buffer) - xfree (tty->termcap_term_buffer); + xfree (tty->termcap_strings_buffer); + xfree (tty->termcap_term_buffer); bzero (tty, sizeof (struct tty_display_info)); xfree (tty); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org