From: Kenichi Handa <handa@gnu.org>
To: Kenichi Handa <handa@gnu.org>
Cc: 12823@debbugs.gnu.org
Subject: bug#12823: Invalid font name
Date: Tue, 13 Nov 2012 20:55:10 +0900 [thread overview]
Message-ID: <878va5u38h.fsf@gnu.org> (raw)
In-Reply-To: <87ip9euaxb.fsf@gnu.org> (message from Kenichi Handa on Fri, 09 Nov 2012 23:07:44 +0900)
In article <87ip9euaxb.fsf@gnu.org>, Kenichi Handa <handa@gnu.org> writes:
> Yes. The first elements in those table should match the
> face attribute values for :weight, :width, and :slant (see
> set-face-attribute). I should have wrote that in the
> comment.
> Could you please try this patch instead?
Oops, sorry, I've sent the wrong version. Here's the
correct patch.
=== modified file 'src/font.c'
--- src/font.c 2012-11-03 05:11:34 +0000
+++ src/font.c 2012-11-13 11:50:50 +0000
@@ -1185,7 +1185,7 @@
font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
{
char *p;
- const char *f[XLFD_REGISTRY_INDEX + 1];
+ char *f[XLFD_REGISTRY_INDEX + 1];
Lisp_Object val;
int i, j, len;
@@ -1234,8 +1234,21 @@
f[j] = "*";
else
{
+ int c, k, l;
+ ptrdiff_t alloc;
+
val = SYMBOL_NAME (val);
- f[j] = SSDATA (val);
+ alloc = SBYTES (val) + 1;
+ if (nbytes <= alloc)
+ return -1;
+ f[j] = alloca (alloc);
+ /* Copy the name while excluding '-', '?', ',', and '"'. */
+ for (k = l = 0; k < alloc; k++)
+ {
+ c = SREF (val, k);
+ if (c != '-' && c != '?' && c != ',' && c != '"')
+ f[j][l++] = c;
+ }
}
}
---
Kenichi Handa
handa@gnu.org
next prev parent reply other threads:[~2012-11-13 11:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 15:15 bug#12823: Invalid font name Stefan Monnier
2012-11-07 16:52 ` Jan Djärv
2012-11-09 14:07 ` Kenichi Handa
2012-11-13 11:55 ` Kenichi Handa [this message]
2012-11-13 19:25 ` Andreas Schwab
2012-11-15 13:30 ` Kenichi Handa
2012-11-27 14:26 ` Kenichi Handa
2012-11-27 15:10 ` Stefan Monnier
2012-11-28 9:20 ` Kenichi Handa
2012-11-28 14:57 ` Stefan Monnier
2012-12-03 9:21 ` Kenichi Handa
2012-12-03 17:51 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878va5u38h.fsf@gnu.org \
--to=handa@gnu.org \
--cc=12823@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.