comparison src/keymap.c @ 35706:952bdd6fb8e5

Undo last change.

35705:6c05ec832ecc

/* Manipulation of keymaps
   Copyright (C) 1985, 86,87,88,93,94,95,98,99, 2000, 2001
   Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify

static void describe_command P_ ((Lisp_Object));
static void describe_translation P_ ((Lisp_Object));
static void describe_map P_ ((Lisp_Object, Lisp_Object,
			      void (*) P_ ((Lisp_Object)),
			      int, Lisp_Object, Lisp_Object*, int));
static int mouse_key_p P_ ((Lisp_Object));
static int ascii_sequence_p P_ ((Lisp_Object));


/* Keymap object support - constructors and predicates.			*/

DEFUN ("make-keymap", Fmake_keymap, Smake_keymap, 0, 1, 0,
  "Construct and return a new keymap, of the form (keymap CHARTABLE . ALIST).\n\

  return build_string (str);
}

/* Return non-zero if SEQ contains only ASCII characters, perhaps with
   a meta bit.  */

static int
ascii_sequence_p (seq)
     Lisp_Object seq;
{
  int i;

	return 0;
    }

  return 1;
}


/* Value is non-zero if SEQ is a mouse key.

   Note: We can't use the property lists of mouse-key symbols to
   determine this, because these symbols and their property lists are
   created only when a mouse-event has been seen.  */

static int
mouse_key_p (seq)
     Lisp_Object seq;
{
  int mouse_p = 0;
  
  seq = Faref (seq, 0);
  if (SYMBOLP (seq))
    {
      unsigned char *name = XSYMBOL (seq)->name->data;

      while (*(name + 1) == '-'
	     && (*name == 'S' || *name == 'C' || *name == 'M'
		 || *name == 'A' || *name == 'H'))
	name += 2;

      if (bcmp (name, "up-", 3) == 0)
	name += 3;
      else if (bcmp (name, "down-", 5) == 0)
	name += 5;

      if (bcmp (name, "mouse-", 6) == 0)
	{
	  name += 6;
	  while (*name >= '0' && *name <= '9')
	    ++name;
	}

      mouse_p = *name == '\0';
    }

  return mouse_p;
}



/* where-is - finding a command in a set of keymaps.			*/

static Lisp_Object where_is_internal_1 ();

      map  = Fcdr (Fcar (maps));
      last = make_number (XINT (Flength (this)) - 1);
      last_is_meta = (XINT (last) >= 0
		      && EQ (Faref (this, last), meta_prefix_char));

      if (nomenus && !ascii_sequence_p (this) && !mouse_key_p (this))
	/* If no menu entries should be returned, skip over the
	   keymaps bound to `menu-bar' and `tool-bar' and other
	   non-ascii prefixes.  */
	continue;
      

		 binding we find.  If firstonly is not Qnon_ascii but not
		 nil, then we should return the first ascii-only binding
		 we find.  */
	      if (EQ (firstonly, Qnon_ascii))
		RETURN_UNGCPRO (sequence);
	      else if (!NILP (firstonly)
		       && (ascii_sequence_p (sequence)
			   || mouse_key_p (sequence)))
		RETURN_UNGCPRO (sequence);
	    }
	}
    }

	 the following can GC.  */
      GCPRO2 (definition, keymaps);
      result = Qnil;
      for (i = n - 1; i >= 0; --i)
	if (EQ (shadow_lookup (keymaps, defns[i], Qnil), definition)
	    && (ascii_sequence_p (defns[i])
		|| mouse_key_p (defns[i])))
	  break;

      result = i >= 0 ? defns[i] : Qnil;
      UNGCPRO;
    }

35706:952bdd6fb8e5

/* Manipulation of keymaps
   Copyright (C) 1985, 86,87,88,93,94,95,98,99, 2000
   Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify

static void describe_command P_ ((Lisp_Object));
static void describe_translation P_ ((Lisp_Object));
static void describe_map P_ ((Lisp_Object, Lisp_Object,
			      void (*) P_ ((Lisp_Object)),
			      int, Lisp_Object, Lisp_Object*, int));

/* Keymap object support - constructors and predicates.			*/

DEFUN ("make-keymap", Fmake_keymap, Smake_keymap, 0, 1, 0,
  "Construct and return a new keymap, of the form (keymap CHARTABLE . ALIST).\n\

  return build_string (str);
}

/* Return non-zero if SEQ contains only ASCII characters, perhaps with
   a meta bit.  */
static int
ascii_sequence_p (seq)
     Lisp_Object seq;
{
  int i;

	return 0;
    }

  return 1;
}


/* where-is - finding a command in a set of keymaps.			*/

static Lisp_Object where_is_internal_1 ();

      map  = Fcdr (Fcar (maps));
      last = make_number (XINT (Flength (this)) - 1);
      last_is_meta = (XINT (last) >= 0
		      && EQ (Faref (this, last), meta_prefix_char));

      if (nomenus && !ascii_sequence_p (this))
	/* If no menu entries should be returned, skip over the
	   keymaps bound to `menu-bar' and `tool-bar' and other
	   non-ascii prefixes.  */
	continue;
      

		 binding we find.  If firstonly is not Qnon_ascii but not
		 nil, then we should return the first ascii-only binding
		 we find.  */
	      if (EQ (firstonly, Qnon_ascii))
		RETURN_UNGCPRO (sequence);
	      else if (! NILP (firstonly) && ascii_sequence_p (sequence))
		RETURN_UNGCPRO (sequence);
	    }
	}
    }

	 the following can GC.  */
      GCPRO2 (definition, keymaps);
      result = Qnil;
      for (i = n - 1; i >= 0; --i)
	if (EQ (shadow_lookup (keymaps, defns[i], Qnil), definition)
	    && ascii_sequence_p (defns[i]))
	  break;

      result = i >= 0 ? defns[i] : Qnil;
      UNGCPRO;
    }