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.
This commit is contained in:
Paul Eggert 2015-10-02 08:34:15 -07:00
parent da4ce83c62
commit 355ccbcf33
2 changed files with 2 additions and 2 deletions

View file

@ -264,7 +264,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'. */)
CHECK_NUMBER (n);
if (abs (XINT (n)) < 2)
if (eabs (XINT (n)) < 2)
remove_excessive_undo_boundaries ();
pos = PT + XINT (n);

View file

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