Accepting request 67526 from editors

Accepted submit request 67526 from user coolo

OBS-URL: https://build.opensuse.org/request/show/67526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=63

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;

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
 

emacs.spec

@@ -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