This commit is contained in:
parent
08f3a20346
commit
673355a56c
38
bugzilla-301352-fix-wrong-incrementing-in-macros.patch
Normal file
38
bugzilla-301352-fix-wrong-incrementing-in-macros.patch
Normal file
@ -0,0 +1,38 @@
|
||||
--- xemacs-21.5.28.20070807/src/mule-ccl.c 2007-08-21 15:48:12.000000000 +0200
|
||||
+++ xemacs-21.5.28.20070807/src/mule-ccl.c 2007-08-21 17:22:14.000000000 +0200
|
||||
@@ -1578,7 +1578,7 @@
|
||||
Lisp_Object map, content, attrib, value;
|
||||
int point, size, fin_ic;
|
||||
|
||||
- j = XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps. */
|
||||
+ j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps. */
|
||||
fin_ic = ic + j;
|
||||
op = reg[rrr];
|
||||
if ((j > reg[RRR]) && (j >= 0))
|
||||
@@ -1596,7 +1596,7 @@
|
||||
for (;i < j;i++)
|
||||
{
|
||||
size = XVECTOR (Vcode_conversion_map_vector)->size;
|
||||
- point = XCHAR_OR_INT (ccl_prog[ic++]);
|
||||
+ point = XCHAR_OR_INT (ccl_prog[ic]); ic++;
|
||||
if (point >= size) continue;
|
||||
map =
|
||||
XVECTOR (Vcode_conversion_map_vector)->contents[point];
|
||||
@@ -1693,7 +1693,7 @@
|
||||
stack_idx_of_map_multiple = 0;
|
||||
|
||||
map_set_rest_length =
|
||||
- XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps and separators. */
|
||||
+ XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps and separators. */
|
||||
fin_ic = ic + map_set_rest_length;
|
||||
op = reg[rrr];
|
||||
|
||||
@@ -1880,7 +1880,7 @@
|
||||
{
|
||||
Lisp_Object map, attrib, value, content;
|
||||
int size, point;
|
||||
- j = XCHAR_OR_INT (ccl_prog[ic++]); /* map_id */
|
||||
+ j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* map_id */
|
||||
op = reg[rrr];
|
||||
if (j >= XVECTOR (Vcode_conversion_map_vector)->size)
|
||||
{
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 21 17:45:56 CEST 2007 - mfabian@suse.de
|
||||
|
||||
- Bugzilla #301352: fix wrong incrementing in macros in mule-ccl.c.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 07 14:54:13 CEST 2007 - mfabian@suse.de
|
||||
|
||||
|
10
xemacs.spec
10
xemacs.spec
@ -37,7 +37,7 @@ Requires: xemacs-info xemacs-packages ctags
|
||||
Conflicts: gnuserv
|
||||
Autoreqprov: on
|
||||
Version: 21.5.28.20070807
|
||||
Release: 1
|
||||
Release: 7
|
||||
Summary: XEmacs
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# Howto get the cvs tree of XEmacs:
|
||||
@ -85,6 +85,7 @@ Patch43: set-language-unicode-precedence-list.patch
|
||||
Patch45: fix-defface-custom-modified-face.patch
|
||||
Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
|
||||
Patch294746: bugzilla-294746-support-windows-1252.patch
|
||||
Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch
|
||||
|
||||
%description
|
||||
This is the current version of XEmacs, formerly known as Lucid-Emacs.
|
||||
@ -175,6 +176,7 @@ Authors:
|
||||
%patch45 -p0
|
||||
%patch292811 -p1
|
||||
%patch294746 -p1
|
||||
%patch301352 -p1
|
||||
%patch0 -p1
|
||||
find lisp/ etc/ -name '*.elc' | xargs -r rm -f
|
||||
%ifarch ia64
|
||||
@ -227,6 +229,10 @@ LIBEXEC=${LIB}/xemacs/${VERSION}
|
||||
%ifarch s390x
|
||||
CFLAGS="$CFLAGS -O0"
|
||||
%endif
|
||||
# To to the menu translations, add:
|
||||
# $CFLAGS="$CFLAGS -DPRINT_XLWMENU_RESOURCE_CONVERSIONS "
|
||||
# this prints the Xresources used for the Menus to stdout
|
||||
# when the Menus are used.
|
||||
LDFLAGS=
|
||||
export CFLAGS LDFLAGS
|
||||
#
|
||||
@ -569,6 +575,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /usr/share/xemacs/site-packages/lisp/term/
|
||||
|
||||
%changelog
|
||||
* Tue Aug 21 2007 - mfabian@suse.de
|
||||
- Bugzilla #301352: fix wrong incrementing in macros in mule-ccl.c.
|
||||
* Tue Aug 07 2007 - mfabian@suse.de
|
||||
- update to 21.5.28.20070807.
|
||||
- remove w3-xft-problem.patch (included now).
|
||||
|
Loading…
Reference in New Issue
Block a user