[emacs21 commit] c480fcaa14eeae679b0f03a2107b79cc18b5eb27

[Jérôme Marant]

commit c480fcaa14eeae679b0f03a2107b79cc18b5eb27
Author: Jérôme Marant <jerome at marant.org>
Date:   Mon Oct 16 17:41:42 2006 +0200

    Add patch removing erroneous semicolon character when reading XBM files

diff --git a/changelog b/changelog
index 604b15a..ec550d9 100644
--- a/changelog
+++ b/changelog
@@ -42,7 +42,12 @@ emacs21 (21.4a+1-1) unstable; urgency=lo
     - debian/emacs-*.*: renamed to debian/emacsVER-*.*
     - debian/rules: changed accordingly.
 
- -- Jerome Marant <jerome at debian.org>  Fri,  6 Oct 2006 19:30:06 +0200
+  * Remove erroneous semicolon character when reading XBM files
+    (closes: #392651) [Jérôme Marant]
+    - debian/patches/xbm-read-erroneous-semicolon.diff: new file.
+    - debian/patches/series: updated.
+
+ -- Jerome Marant <jerome at debian.org>  Mon, 16 Oct 2006 17:39:32 +0200
 
 emacs21 (21.4a-6.2) unstable; urgency=low
 
diff --git a/patches/series b/patches/series
index 99f7190..036763e 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,4 @@
+xbm-read-erroneous-semicolon.diff
 handle-dfsg-split.diff
 autoconf-updates.diff
 misc-unseparated.diff
diff --git a/patches/xbm-read-erroneous-semicolon.diff b/patches/xbm-read-erroneous-semicolon.diff
new file mode 100644
index 0000000..f5e9f75
--- /dev/null
+++ b/patches/xbm-read-erroneous-semicolon.diff
@@ -0,0 +1,20 @@
+* Remove erroneous semicolon character when reading XBM files 
+  Patch: xbm-read-erroneous-semicolon.diff 
+  Provided-by: Jerome Marant <jerome at debian.org> 
+  Added-by: Jerome Marant <jerome at debian.org>
+  Date: Mon, 16 Oct 2006 17:35:25 +0200 
+  Status: has been incorporated upstream
+
+Index: emacs21-21.4a+1/src/xfns.c
+===================================================================
+--- emacs21-21.4a+1.orig/src/xfns.c	2006-10-16 17:22:09.322903834 +0200
++++ emacs21-21.4a+1/src/xfns.c	2006-10-16 17:23:55.987962891 +0200
+@@ -6743,7 +6743,7 @@
+       expect_ident ("define");
+       expect (XBM_TK_IDENT);
+ 
+-      if (LA1 == XBM_TK_NUMBER);
++      if (LA1 == XBM_TK_NUMBER)
+ 	{
+           char *p = strrchr (buffer, '_');
+ 	  p = p ? p + 1 : buffer;