From: John Mastro <john.b.mastro@gmail.com>
To: 31845@debbugs.gnu.org
Cc: andrewjmoreton@gmail.com
Subject: bug#31845: 27.0.50; Error building master on MacOS
Date: Fri, 15 Jun 2018 12:12:22 -0700 [thread overview]
Message-ID: <CAOj2CQSwHGuGHguYnbuaq4MHtPOgBAWXtP87saeEYvou0=Jvdw@mail.gmail.com> (raw)
In-Reply-To: <vz1r2l83qta.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
Andy Moreton <andrewjmoreton@gmail.com> wrote:
> > macfont.m:911:56: error: use of undeclared identifier 'traits'
> > Fcons (make_mint_ptr ((void *) name), make_number (traits)));
> ^
> This is a typo from commit 6c04c848. Replacing traits with sym_traits
> should fix it.
Indeed; trivial patch attached
Thanks
John
[-- Attachment #2: 0001-Fix-a-typo-from-commit-6c04c848.patch --]
[-- Type: application/octet-stream, Size: 994 bytes --]
From 437820549bd171d3f56e39a69474533259f21dcb Mon Sep 17 00:00:00 2001
From: John Mastro <john.b.mastro@gmail.com>
Date: Fri, 15 Jun 2018 12:08:59 -0700
Subject: [PATCH] ; Fix a typo from commit 6c04c848
---
src/macfont.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/macfont.m b/src/macfont.m
index 3a1e9e5f47..ed4e7c9d98 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -908,7 +908,8 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char,
ASET (entity, FONT_EXTRA_INDEX, Fcopy_sequence (extra));
name = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute);
font_put_extra (entity, QCfont_entity,
- Fcons (make_mint_ptr ((void *) name), make_number (traits)));
+ Fcons (make_mint_ptr ((void *) name),
+ make_number (sym_traits)));
if (synth_sym_traits & kCTFontTraitItalic)
FONT_SET_STYLE (entity, FONT_SLANT_INDEX,
make_number (FONT_SLANT_SYNTHETIC_ITALIC));
--
2.17.1
next prev parent reply other threads:[~2018-06-15 19:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-15 16:05 bug#31845: 27.0.50; Error building master on MacOS John Mastro
2018-06-15 16:56 ` John Mastro
2018-06-15 17:25 ` Andy Moreton
2018-06-15 19:12 ` John Mastro [this message]
[not found] <20180517203706.10244-1-ambrevar@gmail.com>
[not found] ` <376d786a-bd59-2878-22f2-16f4297be1b0@cs.ucla.edu>
[not found] ` <87h8m2ogfo.fsf@gnu.org>
2018-06-16 16:32 ` Paul Eggert
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOj2CQSwHGuGHguYnbuaq4MHtPOgBAWXtP87saeEYvou0=Jvdw@mail.gmail.com' \
--to=john.b.mastro@gmail.com \
--cc=31845@debbugs.gnu.org \
--cc=andrewjmoreton@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).