# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 809910579 0
# Node ID 15f32c044bb8d829ce0e57cede322d3baf66877f
# Parent  88a47d611c4a40a02991127b59499b66e048140c
(Fcommand_execute): Ignore `disabled' property on
commands if `disable-command-hook' is nil.

(read_key_sequence): Validate the event position
before calling get_local_map.

diff -r 88a47d611c4a -r 15f32c044bb8 src/keyboard.c
--- a/src/keyboard.c	Thu Aug 31 17:23:50 1995 +0000
+++ b/src/keyboard.c	Thu Aug 31 23:09:39 1995 +0000
@@ -5562,7 +5562,8 @@
 		  if (CONSP (start) && CONSP (XCONS (start)->cdr))
 		    {
 		      pos = POSN_BUFFER_POSN (start);
-		      if (INTEGERP (pos))
+		      if (INTEGERP (pos)
+			  && XINT (pos) >= BEG && XINT (pos) <= Z)
 			{
 			  map_here = get_local_map (XINT (pos), current_buffer);
 			  if (!EQ (map_here, orig_local_map))
@@ -6217,7 +6218,11 @@
     {
       tem = Fget (cmd, Qdisabled);
       if (!NILP (tem) && !NILP (Vrun_hooks))
-	return call1 (Vrun_hooks, Qdisabled_command_hook);
+	{
+	  tem = Fsymbol_value (Qdisabled_command_hook);
+	  if (!NILP (tem))
+	    return call1 (Vrun_hooks, Qdisabled_command_hook);
+	}
     }
 
   while (1)