From 7a98d237bc3bc6f9a476a6bdb863184110e70916 Mon Sep 17 00:00:00 2001
From: "Jonathan G. Underwood" <jgu@fedoraproject.org>
Date: Tue, 30 Mar 2010 21:49:18 +0000
Subject: [PATCH] - Add fix for BZ 53346

---
 emacs-23.1-nxml.patch | 45 +++++++++++++++++++++++++++++++++++++++++++
 emacs.spec            | 12 +++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 emacs-23.1-nxml.patch

diff --git a/emacs-23.1-nxml.patch b/emacs-23.1-nxml.patch
new file mode 100644
index 0000000..3431f4e
--- /dev/null
+++ b/emacs-23.1-nxml.patch
@@ -0,0 +1,45 @@
+=== modified file 'lisp/nxml/nxml-mode.el'
+--- lisp/nxml/nxml-mode.el	2009-09-24 23:22:17 +0000
++++ lisp/nxml/nxml-mode.el	2009-10-24 21:32:19 +0000
+@@ -1254,29 +1254,31 @@
+ 
+ (defun nxml-balanced-close-start-tag (block-or-inline)
+   (let ((token-end (nxml-token-before))
+-	(pos (1+ (point))))
++	(pos (1+ (point)))
++	(token-start xmltok-start))
+     (unless (or (eq xmltok-type 'partial-start-tag)
+ 		(and (memq xmltok-type '(start-tag
+ 					 empty-element
+ 					 partial-empty-element))
+ 		     (>= token-end pos)))
+       (error "Not in a start-tag"))
++    ;; Note that this insertion changes xmltok-start.
+     (insert "></"
+ 	    (buffer-substring-no-properties (+ xmltok-start 1)
+ 					    (min xmltok-name-end (point)))
+ 	    ">")
+     (if (eq block-or-inline 'inline)
+ 	(goto-char pos)
+-      (goto-char xmltok-start)
++      (goto-char token-start)
+       (back-to-indentation)
+-      (if (= (point) xmltok-start)
++      (if (= (point) token-start)
+ 	  (let ((indent (current-column)))
+-	  (goto-char pos)
+-	  (insert "\n")
+-	  (indent-line-to indent)
+-	  (goto-char pos)
+-	  (insert "\n")
+-	  (indent-line-to (+ nxml-child-indent indent)))
++	    (goto-char pos)
++	    (insert "\n")
++	    (indent-line-to indent)
++	    (goto-char pos)
++	    (insert "\n")
++	    (indent-line-to (+ nxml-child-indent indent)))
+ 	(goto-char pos)))))
+ 
+ (defun nxml-finish-element ()
+
diff --git a/emacs.spec b/emacs.spec
index 623843f..df2ea36 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -43,6 +43,12 @@ Patch10: emacs-23.1-fontdpi.patch
 # Reported upstream: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5313
 Patch11: emacs-23.1-hexl-mode.patch
 
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=553346
+# Upstream: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=2840
+# Backported fix from upstream:
+# http://bazaar.launchpad.net/~vcs-imports/emacs/trunk/revision/98299
+Patch12: emacs-23.1-nxml.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -144,6 +150,7 @@ Emacs packages or see some elisp examples.
 %patch9 -p1 -b .memmove
 %patch10 -p1 -b .fontdpi
 %patch11 -p0
+%patch12 -p0
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -415,6 +422,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Mar 30 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1:23.1-20
+- Add fix for BZ 53346 
+
 * Tue Mar 23 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1:23.1-19
 - Backport fixes for bugs 516391, 484830, 474958 from F-13 branch
 - Add cwd to load-path in byte-compile macro for add-on packaging