From 387d00f102b58beb84c6c915d8e52f4172fbe7f02c09b1167fbaaa707578c713 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 15 Apr 2011 13:20:43 +0000
Subject: [PATCH] Accepting request 67518 from home:ftake

Thanks a lot

OBS-URL: https://build.opensuse.org/request/show/67518
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=49
---
 emacs-23.2-dual-font.patch | 22 ++++++++++++++++++++++
 emacs.changes              |  5 +++++
 emacs.spec                 |  4 +++-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 emacs-23.2-dual-font.patch

diff --git a/emacs-23.2-dual-font.patch b/emacs-23.2-dual-font.patch
new file mode 100644
index 0000000..77307d6
--- /dev/null
+++ b/emacs-23.2-dual-font.patch
@@ -0,0 +1,22 @@
+--- src/ftfont.c	
++++ 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);
+--- src/xftfont.c	
++++ 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;
diff --git a/emacs.changes b/emacs.changes
index b503329..2d923f5 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 23 14:38:32 JST 2011 - ftake@geeko.jp
+- Add a new patch to fix "dual font spacing problem"
+  * from https://bugzilla.redhat.com/show_bug.cgi?id=599437
+
 -------------------------------------------------------------------
 Tue Dec 21 16:42:06 CET 2010 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 455d19d..2e235db 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -30,7 +30,7 @@ Url:            http://www.gnu.org/software/emacs/
 License:        GPLv2+
 Group:          Productivity/Editors/Emacs
 Version:        23.2
-Release:        2
+Release:        3
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
@@ -63,6 +63,7 @@ Patch18:        emacs-sparc.diff
 Patch20:        emacs-23.2-gcc45.dif
 Patch22:        emacs-23.1-bnc628268.patch
 Patch23:        emacs-23.1-rst.patch
+Patch24:        emacs-23.2-dual-font.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global bug_345669  0
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -254,6 +255,7 @@ fi
 %patch20 -p0 -b .gcc45
 %patch22
 %patch23
+%patch24
 
 %build
   CC=gcc-4.3