From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 31 Aug 1995 23:09:39 +0000 (+0000)
Subject: (Fcommand_execute): Ignore `disabled' property on
X-Git-Tag: emacs-19.34~2881
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b78ce8fbdbf6abcb3e8a50b070c1c2955bf88452;p=emacs.git

(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 --git a/src/keyboard.c b/src/keyboard.c
index 77ed7a3ab3e..ef50a2b81fb 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5562,7 +5562,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
 		  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 @@ Otherwise, that is done only if an arg is read using the minibuffer.")
     {
       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)