rpms/emacs-nxml-mode/devel nxml-mode.el.2006-01-03.patch, NONE, 1.1 xsd-regexp.el.2006-01-26.patch, NONE, 1.1 emacs-nxml-mode.spec, 1.1, 1.2

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/emacs-nxml-mode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17895

Modified Files:
	emacs-nxml-mode.spec 
Added Files:
	nxml-mode.el.2006-01-03.patch xsd-regexp.el.2006-01-26.patch 
Log Message:
* Thu Jul  5 2007 Tim Waugh <twaugh at redhat.com - 0.20041004-6
- Include patches from Yahoo! Groups list (bug #247020).  Thanks to Matej
  Cepl <mcepl at redhat.com>.


nxml-mode.el.2006-01-03.patch:

--- NEW FILE nxml-mode.el.2006-01-03.patch ---
--- nxml-mode-20041004/nxml-mode.el.jon-hurst	2007-07-05 15:40:37.000000000 +0200
+++ nxml-mode-20041004/nxml-mode.el	2007-07-05 15:42:00.000000000 +0200
@@ -2050,7 +2050,7 @@ Return nil at start of buffer, t otherwi
       (setq had-data (nxml-token-contains-data-p nil offset))
       (goto-char xmltok-start)
       (while (and (not pos) (< (point-min) (point)))
-	(cond ((search-backward "<" nxml-prolog-end t)
+	(cond ((re-search-backward "[<&]" nxml-prolog-end t)
 	       (nxml-move-outside-backwards)
 	       (save-excursion
 		 (while (< (point) last-tag-pos)

xsd-regexp.el.2006-01-26.patch:

--- NEW FILE xsd-regexp.el.2006-01-26.patch ---
--- xsd-regexp.el.orig	2006-01-27 00:31:24.000000000 +0100
+++ xsd-regexp.el	2006-01-27 00:32:20.328529600 +0100
@@ -290,7 +290,8 @@
 (defun xsdre-compile-single-char (ch)
   (if (memq ch '(?. ?* ?+ ?? ?\[ ?\] ?^ ?$ ?\\))
       (string ?\\ ch)
-    (string (decode-char 'ucs ch))))
+    (let ((utf-translate-cjk-mode nil))
+      (string (decode-char 'ucs ch)))))
   
 (defun xsdre-char-class-to-range-list (cc)
   "Return a range-list for a symbolic char-class."
@@ -403,7 +404,8 @@
       (setq range-list (cdr range-list)))
     (setq chars
 	  (mapcar (lambda (c)
-		    (decode-char 'ucs c))
+                    (let ((utf-translate-cjk-mode nil))
+                      (decode-char 'ucs c)))
 		  chars))
     (when caret
       (setq chars (cons ?^ chars)))


Index: emacs-nxml-mode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-nxml-mode/devel/emacs-nxml-mode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-nxml-mode.spec	15 Feb 2007 10:41:48 -0000	1.1
+++ emacs-nxml-mode.spec	5 Jul 2007 14:16:20 -0000	1.2
@@ -2,12 +2,16 @@
 Summary: Emacs package for editing XML
 Name: emacs-nxml-mode
 Version: 0.%{snapshot}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://www.thaiopensource.com/nxml-mode/
 Source0: http://www.thaiopensource.com/download/nxml-mode-%{snapshot}.tar.gz
 Source1: http://docbook.sourceforge.net/release/slides/3.4.0/schema/relaxng/slides.rnc
+# from http://tech.groups.yahoo.com/group/emacs-nxml-mode/message/1178
+Patch1:   xsd-regexp.el.2006-01-26.patch
+# from http://tech.groups.yahoo.com/group/emacs-nxml-mode/message/1133
+Patch2:   nxml-mode.el.2006-01-03.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -24,6 +28,8 @@
 
 %prep
 %setup -q -n nxml-mode-%{snapshot}
+%patch1 -p0 -b .drkm
+%patch2 -p1 -b .jon-hurst
 cp -a %SOURCE1 schema
 
 %build
@@ -67,6 +73,10 @@
 exit 0
 
 %changelog
+* Thu Jul  5 2007 Tim Waugh <twaugh at redhat.com - 0.20041004-6
+- Include patches from Yahoo! Groups list (bug #247020).  Thanks to Matej
+  Cepl <mcepl at redhat.com>.
+
 * Wed Feb 14 2007 Tim Waugh <twaugh at redhat.com>  0.20041004.1-5
 - First build.
 
@@ -97,5 +107,3 @@
 
 * Thu Oct 23 2003 Tim Waugh <twaugh at redhat.com> 
 - Initial build.
-
-