rpms/emacs/devel emacs-23.2-spacing.patch, NONE, 1.1 emacs.spec, 1.170, 1.171
Karel Klíč
kklic at fedoraproject.org
Thu Jun 3 10:26:51 UTC 2010
Author: kklic
Update of /cvs/extras/rpms/emacs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4572
Modified Files:
emacs.spec
Added Files:
emacs-23.2-spacing.patch
Log Message:
Fixed handling of dual spacing fonts
emacs-23.2-spacing.patch:
ftfont.c | 2 +-
xftfont.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE emacs-23.2-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/devel/emacs.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- emacs.spec 27 May 2010 17:13:55 -0000 1.170
+++ emacs.spec 3 Jun 2010 10:26:51 -0000 1.171
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -33,7 +33,8 @@ Patch5: emacs-23.2-m17ncheck.patch
# Fix rhbz#595546
# Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
Patch6: emacs-23.2-hideshow-comment.patch
-
+# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
+Patch7: emacs-23.2-spacing.patch
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
@@ -141,6 +142,7 @@ Emacs packages or see some elisp example
%patch4 -p1 -b .xdg
%patch5 -p1 -b .m17ncheck
%patch6 -p0 -b .hideshow-comment
+%patch7 -p1 -b .spacing
# Install site-lisp files
cp %SOURCE7 %SOURCE9 %SOURCE10 site-lisp
@@ -404,6 +406,9 @@ alternatives --install %{_bindir}/etags
%dir %{_datadir}/emacs/%{version}
%changelog
+* Thu Jun 3 2010 Karel Klic <kklic at redhat.com> - 1:23.2-5
+- Fixed handling of dual spacing fonts rhbz#599437
+
* Thu May 27 2010 Karel Klíč <karel at agata> - 1:23.2-4
- Add patch to fix rhbz#595546 hideshow library matches wrong parenthesis
under certain circumstances
More information about the scm-commits
mailing list