aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-10-02 08:34:15 -0700
committerPaul Eggert2015-10-02 08:34:50 -0700
commit355ccbcf332d766231bd441e0971e481907785bc (patch)
tree7100141eb11890f74cab3d689e4076c2a320438f /src
parentda4ce83c621f31c4b6690ab7fcb77c1104ed2295 (diff)
downloademacs-355ccbcf332d766231bd441e0971e481907785bc.tar.gz
emacs-355ccbcf332d766231bd441e0971e481907785bc.zip
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')
-rw-r--r--src/cmds.c2
-rw-r--r--src/font.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cmds.c b/src/cmds.c
index 7a575ae7348..ccc68911624 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -264,7 +264,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'. */)
264 264
265 CHECK_NUMBER (n); 265 CHECK_NUMBER (n);
266 266
267 if (abs (XINT (n)) < 2) 267 if (eabs (XINT (n)) < 2)
268 remove_excessive_undo_boundaries (); 268 remove_excessive_undo_boundaries ();
269 269
270 pos = PT + XINT (n); 270 pos = PT + XINT (n);
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
1770 p1 = strchr (p0, '-'); 1770 p1 = strchr (p0, '-');
1771 if (! p1) 1771 if (! p1)
1772 { 1772 {
1773 AUTO_STRING (extra, ("*-*" + (len && p0[len - 1] == '*'))); 1773 AUTO_STRING (extra, (&"*-*"[len && p0[len - 1] == '*']));
1774 registry = concat2 (registry, extra); 1774 registry = concat2 (registry, extra);
1775 } 1775 }
1776 registry = Fdowncase (registry); 1776 registry = Fdowncase (registry);