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.

diff --git a/src/cmds.c b/src/cmds.c
index 7a575ae734820277b199902ac48500fd92a1bfe2..ccc68911624b14b8d3fbf100e238b6183d1fa52a 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -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);

diff --git a/src/font.c b/src/font.c
index ce144e78a08620636f6f4d272202f34f6068e7d9..a52a653d29bec26c16269d16b2541f540faa068c 100644 (file)
--- 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);