Accepting request 184061 from home:ailin_nemui:branches:M17N:back

bug fix for bnc#830221

OBS-URL: https://build.opensuse.org/request/show/184061
OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=66

xemacs-21.5.31-array.patch

@@ -14,14 +14,3 @@
  }
  
  void
---- src/mule-wnnfns.c
-+++ src/mule-wnnfns.c	2012-05-31 15:27:10.952509987 +0000
-@@ -2117,7 +2117,7 @@ yes_or_no (UExtbyte *s)
-   c2m (s, mbuf, charset);
-   /* truncate "(Y/N)" */
-   for (len = 0; (mbuf[len]) && (len < 512); len++);
--  for (; (mbuf[len] != '(') && (len > 0); len--);
-+  for (len--; (mbuf[len] != '(') && (len >= 0); len--);
-   {
-      Lisp_Object yes, str;
-      struct gcpro gcpro1;

xemacs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 23 08:59:47 UTC 2013 - ailin.nemui@gmail.com
+
+- remove incorrect patch which breaks XEmacs/wnn introduced by
+  request 123104 (fix crashbug bnc#830221)
+
 -------------------------------------------------------------------
 Sun Jan  6 15:25:50 UTC 2013 - ailin.nemui@gmail.com
 

xemacs.spec

@@ -41,6 +41,8 @@ BuildRequires:  gpm-devel
 %else
 BuildRequires:  gpm
 %endif
+%define _id     bee2e2568828
+%define _hg     hg%{_id}
 Version:        21.5.33
 Release:        0
 Summary:        XEmacs
@@ -50,8 +52,6 @@ Group:          Productivity/Editors/Emacs
 %define xbindir    /usr/bin
 %define xincludes  /usr/include
 %define xlibraries /usr/%{_lib}
-%define _id     bee2e2568828
-%define _hg     beta-%{_id}
 Url:            http://www.xemacs.org
 # Howto get the Mercurial tree of XEmacs:
 # See: http://xemacs.digimirror.nl/Develop/hgaccess.html