rpms/emacs/F-12 emacs-23.1-spacing.patch, NONE, 1.1 emacs.spec, 1.155, 1.156

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/emacs/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19584

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-spacing.patch 
Log Message:
Fixed handling of dual spacing fonts

emacs-23.1-spacing.patch:
 ftfont.c  |    2 +-
 xftfont.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE emacs-23.1-spacing.patch ---
diff --git a/src/ftfont.c b/src/ftfont.c
index 4ebc4be..bac9a4f 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size)
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
     spacing = FC_PROPORTIONAL;
-  if (spacing != FC_PROPORTIONAL)
+  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
     font->min_width = font->average_width = font->space_width
       = (scalable ? ft_face->max_advance_width * size / upEM
 	 : ft_face->size->metrics.max_advance >> 6);
diff --git a/src/xftfont.c b/src/xftfont.c
index 82701ce..e74ce31 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -418,7 +418,7 @@ xftfont_open (f, entity, pixel_size)
 	ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;
-  if (spacing != FC_PROPORTIONAL)
+  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
     {
       font->min_width = font->average_width = font->space_width
 	= xftfont->max_advance_width;


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- emacs.spec	27 May 2010 15:03:43 -0000	1.155
+++ emacs.spec	3 Jun 2010 13:03:55 -0000	1.156
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -55,6 +55,8 @@ Patch13: emacs-23.1-movemail.patch
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=595546
 # Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
 Patch14: emacs-23.1-hideshow-comment.patch
+# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
+Patch15: emacs-23.1-spacing.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
@@ -159,6 +161,7 @@ Emacs packages or see some elisp example
 %patch12 -p0
 %patch13 -p1
 %patch14 -p0
+%patch15 -p1 -b .spacing
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -437,6 +440,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Jun  3 2010 Karel Klic  <kklic at redhat.com> - 1:23.1-24
+- Fixed handling of dual spacing fonts rhbz#599437
+
 * Thu May 27 2010 Karel Klíč <kklic at redhat.com> - 1:23.1-23
 - Add patch to fix rhbz#595546 hideshow library matches wrong parenthesis
   under certain circumstances