pool/emacs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=11
This commit is contained in:
Dr. Werner Fink 2009-11-26 13:55:05 +00:00 committed by Git OBS Bridge
parent dc6f678c6e
commit 4ed14d38e8
3 changed files with 85 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
emacs-23.1-bnc556175.patch Normal file
View File

@ -0,0 +1,71 @@
--- 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);

11
emacs.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 26 14:54:17 CET 2009 - werner@suse.de
- Add patch from upstream to fix bug bnc#556175
-------------------------------------------------------------------
Thu Nov 19 11:18:54 CET 2009 - werner@suse.de
- Remove binaries from main package as theyx are provided by the
x11 sub package (bnc#555682)
-------------------------------------------------------------------
Fri Aug 14 13:19:59 CEST 2009 - werner@suse.de

8
emacs.spec
View File

@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/emacs/
License: GPL v2 or later
Group: Productivity/Editors/Emacs
Version: 23.1
Release: 2
Release: 3
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 @@ Patch10: emacs-22.0.99-sentinel.patch
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
@ -230,6 +231,7 @@ Authors:
%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
@ -556,10 +558,6 @@ done
/etc/skel/.gnu-emacs
%{_bindir}/b2m
%{_bindir}/ebrowse
%{_bindir}/emacs
%{_bindir}/emacs-gtk
%{_bindir}/emacs-nox
%{_bindir}/emacs-x11
%{_bindir}/emacsclient
%{_bindir}/grep-changelog
%{_bindir}/rcs-checkin