[Emacs-diffs] master 355ccbc: Fix problems found by clang 3.5.0

[Paul Eggert]

branch: master
commit 355ccbcf332d766231bd441e0971e481907785bc
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/cmds.c |    2 +-
 src/font.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cmds.c b/src/cmds.c
index 7a575ae..ccc6891 100644
--- 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 ce144e7..a52a653 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);