From a92361ba365483e42d3d7d3efaf4827074dae37a Mon Sep 17 00:00:00 2001
From: Jonathan G. Underwood <jgu@fedoraproject.org>
Date: Jan 14 2010 12:12:50 +0000
Subject: - Add patch to fix rhbz#547566 (from Juanma Barranquero)


---

diff --git a/emacs-23.1-hexl-mode.patch b/emacs-23.1-hexl-mode.patch
new file mode 100644
index 0000000..15cd903
--- /dev/null
+++ b/emacs-23.1-hexl-mode.patch
@@ -0,0 +1,12 @@
+=== modified file 'lisp/hexl.el'
+--- lisp/hexl.el	2010-01-13 08:35:10 +0000
++++ lisp/hexl.el	2010-01-14 00:38:04 +0000
+@@ -779,7 +779,7 @@
+
+ (defun hexl-printable-character (ch)
+   "Return a displayable string for character CH."
+-  (format "%c" (if hexl-iso
++  (format "%c" (if (not (equal hexl-iso ""))
+ 		   (if (or (< ch 32) (and (>= ch 127) (< ch 160)))
+ 		       46
+ 		     ch)
diff --git a/emacs.spec b/emacs.spec
index 48bccba..63a2dd4 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -34,6 +34,10 @@ Patch8: emacs-23.1-indian.patch
 Patch9: emacs-23.1-memmove.patch
 Patch10: emacs-23.1-fontdpi.patch
 
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=547566
+# Reported upstream: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5313
+Patch11: emacs-23.1-hexl-mode.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
@@ -130,6 +134,7 @@ Emacs packages or see some elisp examples.
 %patch8 -p1
 %patch9 -p1 -b .memmove
 %patch10 -p1 -b .fontdpi
+%patch11 -p0
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -392,6 +397,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Jan 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> 1:23.1-18
+- Add patch to fix rhbz#547566 (from Juanma Barranquero)
+
 * Thu Jan  7 2010 Karel Klic <kklic@redhat.com> 1:23.1-17
 - Simpler fix for rhbz#517272