rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

Accepting request 67518 from home:ftake

Browse Source 
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
This commit is contained in:
Dr. Werner Fink 2011-04-15 13:20:43 +00:00 committed by Git OBS Bridge
parent 06f8895358
commit 387d00f102
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
emacs-23.2-dual-font.patch Normal file
View File

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

5
emacs.changes
View File

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

4
emacs.spec
View File

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