[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keymap.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/keymap.c |
Date: |
Fri, 10 Feb 2006 00:00:32 +0000 |
Index: emacs/src/keymap.c
diff -u emacs/src/keymap.c:1.317 emacs/src/keymap.c:1.318
--- emacs/src/keymap.c:1.317 Mon Feb 6 15:23:21 2006
+++ emacs/src/keymap.c Fri Feb 10 00:00:30 2006
@@ -68,7 +68,7 @@
/* 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
+/* keymap used for minibuffers when doing completion in filenames
with require-match*/
Lisp_Object Vminibuffer_local_must_match_filename_map;
@@ -1370,13 +1370,6 @@
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.
@@ -1478,9 +1471,7 @@
}
/* 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);
+ temp = Findirect_function (XCDR (assoc), Qt);
if (!NILP (temp))
{
cmm_modes[i] = var;
@@ -3882,11 +3873,11 @@
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",
+ 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,
+ Fset_keymap_parent (Vminibuffer_local_filename_completion_map,
Vminibuffer_local_completion_map);
@@ -3896,11 +3887,11 @@
Fset_keymap_parent (Vminibuffer_local_must_match_map,
Vminibuffer_local_completion_map);
- DEFVAR_LISP ("minibuffer-local-must-match-filename-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,
+ Fset_keymap_parent (Vminibuffer_local_must_match_filename_map,
Vminibuffer_local_must_match_map);
DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,