From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 9 Nov 2015 18:31:45 +0000 (+0200)
Subject: Fix assertion violation in define-key
X-Git-Tag: emacs-25.0.90~864
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86c19714b097aa477d339ed99ffb5136c755a046;p=emacs.git

Fix assertion violation in define-key

* src/keymap.c (store_in_keymap): Don't use XFASTINT on non-character
objects.  Reported by Drew Adams <drew.adams@oracle.com>
and Juanma Barranquero <lekktu@gmail.com>.
---

diff --git a/src/keymap.c b/src/keymap.c
index c28885ab132..67a4a1075d9 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -853,7 +853,9 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
 		XSETCDR (elt, def);
 		return def;
 	      }
-	    else if (CONSP (idx) && CHARACTERP (XCAR (idx)))
+	    else if (CONSP (idx)
+		     && CHARACTERP (XCAR (idx))
+		     && CHARACTERP (XCAR (elt)))
 	      {
 		int from = XFASTINT (XCAR (idx));
 		int to = XFASTINT (XCDR (idx));