summaryrefslogtreecommitdiff
path: root/src/font.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-10-02 08:34:15 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-10-02 08:34:50 -0700
commit355ccbcf332d766231bd441e0971e481907785bc (patch)
tree7100141eb11890f74cab3d689e4076c2a320438f /src/font.c
parentda4ce83c621f31c4b6690ab7fcb77c1104ed2295 (diff)
downloademacs-355ccbcf332d766231bd441e0971e481907785bc.tar.gz
Fix problems found by clang 3.5.0
* src/cmds.c (Fdelete_char): Don’t assume XINT returns int. * src/font.c (font_parse_family_registry): Use &"str"[X] instead of "str"+X, to pacify clang -Wstring-plus-int.
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c
index ce144e78a08..a52a653d29b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1770,7 +1770,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
p1 = strchr (p0, '-');
if (! p1)
{
- AUTO_STRING (extra, ("*-*" + (len && p0[len - 1] == '*')));
+ AUTO_STRING (extra, (&"*-*"[len && p0[len - 1] == '*']));
registry = concat2 (registry, extra);
}
registry = Fdowncase (registry);