comparison src/keymap.c @ 68758:13c1b7c5f555

* data.c (Findirect_function): Add NOERROR arg. All callers changed to pass Qnil for NOERROR. * keymap.c (current_minor_maps_error): Remove. (current_minor_maps): Pass Qt for NOERROR to Findirect_function instead of using internal_condition_case_1+current_minor_maps_error.

68757:3c76b1d6eff0

Lisp_Object Vminibuffer_local_completion_map;

/* keymap used for minibuffers when doing completion in filenames */
Lisp_Object Vminibuffer_local_filename_completion_map;

/* keymap used for minibuffers when doing completion in filenames 
   with require-match*/
Lisp_Object Vminibuffer_local_must_match_filename_map;

/* keymap used for minibuffers when doing completion and require a match */
/* was MinibufLocalMustMatchMap */

   some systems, static gets macro-defined to be the empty string.
   Ickypoo.  */
static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL;
static int cmm_size = 0;

/* Error handler used in current_minor_maps.  */
static Lisp_Object
current_minor_maps_error ()
{
  return Qnil;
}

/* Store a pointer to an array of the keymaps of the currently active
   minor modes in *buf, and return the number of maps it contains.

   This function always returns a pointer to the same buffer, and may
   free or reallocate it, so if you want to keep it for a long time or

		  break;
		cmm_size = newsize;
	      }

	    /* Get the keymap definition--or nil if it is not defined.  */
	    temp = internal_condition_case_1 (Findirect_function,
					      XCDR (assoc),
					      Qerror, current_minor_maps_error);
	    if (!NILP (temp))
	      {
		cmm_modes[i] = var;
		cmm_maps [i] = temp;
		i++;

  DEFVAR_LISP ("minibuffer-local-completion-map", &Vminibuffer_local_completion_map,
	       doc: /* Local keymap for minibuffer input with completion.  */);
  Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map);

  DEFVAR_LISP ("minibuffer-local-filename-completion-map", 
	       &Vminibuffer_local_filename_completion_map,
	       doc: /* Local keymap for minibuffer input with completion for filenames.  */);
  Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_filename_completion_map, 
		      Vminibuffer_local_completion_map);


  DEFVAR_LISP ("minibuffer-local-must-match-map", &Vminibuffer_local_must_match_map,
	       doc: /* Local keymap for minibuffer input with completion, for exact match.  */);
  Vminibuffer_local_must_match_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_must_match_map,
		      Vminibuffer_local_completion_map);

  DEFVAR_LISP ("minibuffer-local-must-match-filename-map", 
	       &Vminibuffer_local_must_match_filename_map,
	       doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
  Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, 
		      Vminibuffer_local_must_match_map);

  DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,
	       doc: /* Alist of keymaps to use for minor modes.
Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read

68758:13c1b7c5f555

Lisp_Object Vminibuffer_local_completion_map;

/* keymap used for minibuffers when doing completion in filenames */
Lisp_Object Vminibuffer_local_filename_completion_map;

/* keymap used for minibuffers when doing completion in filenames
   with require-match*/
Lisp_Object Vminibuffer_local_must_match_filename_map;

/* keymap used for minibuffers when doing completion and require a match */
/* was MinibufLocalMustMatchMap */

   some systems, static gets macro-defined to be the empty string.
   Ickypoo.  */
static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL;
static int cmm_size = 0;

/* Store a pointer to an array of the keymaps of the currently active
   minor modes in *buf, and return the number of maps it contains.

   This function always returns a pointer to the same buffer, and may
   free or reallocate it, so if you want to keep it for a long time or

		  break;
		cmm_size = newsize;
	      }

	    /* Get the keymap definition--or nil if it is not defined.  */
	    temp = Findirect_function (XCDR (assoc), Qt);
	    if (!NILP (temp))
	      {
		cmm_modes[i] = var;
		cmm_maps [i] = temp;
		i++;

  DEFVAR_LISP ("minibuffer-local-completion-map", &Vminibuffer_local_completion_map,
	       doc: /* Local keymap for minibuffer input with completion.  */);
  Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map);

  DEFVAR_LISP ("minibuffer-local-filename-completion-map",
	       &Vminibuffer_local_filename_completion_map,
	       doc: /* Local keymap for minibuffer input with completion for filenames.  */);
  Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_filename_completion_map,
		      Vminibuffer_local_completion_map);


  DEFVAR_LISP ("minibuffer-local-must-match-map", &Vminibuffer_local_must_match_map,
	       doc: /* Local keymap for minibuffer input with completion, for exact match.  */);
  Vminibuffer_local_must_match_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_must_match_map,
		      Vminibuffer_local_completion_map);

  DEFVAR_LISP ("minibuffer-local-must-match-filename-map",
	       &Vminibuffer_local_must_match_filename_map,
	       doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
  Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil);
  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map,
		      Vminibuffer_local_must_match_map);

  DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,
	       doc: /* Alist of keymaps to use for minor modes.
Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read