From 8ba31f366fc04228330e55c9ae48f2a6ba73760f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 5 Jun 2008 05:44:12 +0000 Subject: [PATCH] * keymap.c (Vminibuffer_local_filename_must_match_map): Rename from Vminibuffer_local_must_match_filename_map. (syms_of_keymap): * minibuf.c (Fcompleting_read): Adjust accordingly. * commands.h: Rename declaration as well. * minibuffer.el (minibuffer-local-must-match-filename-map): Declare obsolete alias for the old name. --- etc/NEWS | 3 +++ lisp/ChangeLog | 3 +++ lisp/minibuffer.el | 5 ++++- src/ChangeLog | 8 ++++++++ src/commands.h | 2 +- src/keymap.c | 10 +++++----- src/minibuf.c | 2 +- 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index f5211acaff0..8483845b6ec 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -811,6 +811,9 @@ functions and variables (formerly used for Tamil script). * Lisp Changes in Emacs 23.1 +** minibuffer-local-must-match-filename-map is now named +minibuffer-local-filename-must-match-map. + ** `all-completions' may now return the base size in the last cdr. Since this means the returned list is not properly nil-terminated, this is an incompatible change and is thus enabled by the new variable diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 59600dd747f..44378452af4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-06-05 Stefan Monnier + * minibuffer.el (minibuffer-local-must-match-filename-map): + Declare obsolete alias for the old name. + * abbrev.el (unexpand-abbrev): Better preserve markers. 2008-06-05 Glenn Morris diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 510fe4b1721..2582afab3c1 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -906,6 +906,9 @@ specified by COMMON-SUBSTRING." ;;; Key bindings. +(define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map + 'minibuffer-local-filename-must-match-map "23.1") + (let ((map minibuffer-local-map)) (define-key map "\C-g" 'abort-recursive-edit) (define-key map "\r" 'exit-minibuffer) @@ -925,7 +928,7 @@ specified by COMMON-SUBSTRING." (let ((map minibuffer-local-filename-completion-map)) (define-key map " " nil)) -(let ((map minibuffer-local-must-match-filename-map)) +(let ((map minibuffer-local-filename-must-match-map)) (define-key map " " nil)) (let ((map minibuffer-local-ns-map)) diff --git a/src/ChangeLog b/src/ChangeLog index 454aa92093f..178e5b38969 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-06-05 Stefan Monnier + + * keymap.c (Vminibuffer_local_filename_must_match_map): + Rename from Vminibuffer_local_must_match_filename_map. + (syms_of_keymap): + * minibuf.c (Fcompleting_read): Adjust accordingly. + * commands.h: Rename declaration as well. + 2008-06-05 Kenichi Handa * xfont.c (xfont_list): Don't set registry to iso8859-1 even if it diff --git a/src/commands.h b/src/commands.h index c882757f0c1..ad0615b9717 100644 --- a/src/commands.h +++ b/src/commands.h @@ -43,7 +43,7 @@ extern Lisp_Object Vminibuffer_local_must_match_map; /* keymap used for minibuffers when doing completion in filenames and require a match */ -extern Lisp_Object Vminibuffer_local_must_match_filename_map; +extern Lisp_Object Vminibuffer_local_filename_must_match_map; /* Last character of last key sequence. */ extern Lisp_Object last_command_char; diff --git a/src/keymap.c b/src/keymap.c index e11c7b97637..7a9b5949151 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -74,7 +74,7 @@ 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; +Lisp_Object Vminibuffer_local_filename_must_match_map; /* keymap used for minibuffers when doing completion and require a match */ /* was MinibufLocalMustMatchMap */ @@ -3936,11 +3936,11 @@ don't alter it yourself. */); 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, + DEFVAR_LISP ("minibuffer-local-filename-must-match-map", + &Vminibuffer_local_filename_must_match_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_filename_must_match_map = Fmake_sparse_keymap (Qnil); + Fset_keymap_parent (Vminibuffer_local_filename_must_match_map, Vminibuffer_local_must_match_map); DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, diff --git a/src/minibuf.c b/src/minibuf.c index 1c1bf0356e1..7c22b6b5b99 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1815,7 +1815,7 @@ Completion ignores case if the ambient value of : (NILP (Vminibuffer_completing_file_name) || EQ (Vminibuffer_completing_file_name, Qlambda) ? Vminibuffer_local_must_match_map - : Vminibuffer_local_must_match_filename_map), + : Vminibuffer_local_filename_must_match_map), init, prompt, make_number (pos), 0, histvar, histpos, def, 0, !NILP (inherit_input_method)); -- 2.39.2