Mercurial > emacs

changeset 12979:15f32c044bb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Richard M. Stallman <rms@gnu.org>
date Thu, 31 Aug 1995 23:09:39 +0000
parents 88a47d611c4a
children 4f9052477a81
files src/keyboard.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)