Mercurial > emacs
changeset 95575:d34a432d5863
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 05 Jun 2008 05:44:12 +0000 |
| parents | fa7d768bdd0b |
| children | abcb40dd43a2 |
| files | etc/NEWS lisp/ChangeLog lisp/minibuffer.el src/ChangeLog src/commands.h src/keymap.c src/minibuf.c |
| diffstat | 7 files changed, 25 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu Jun 05 05:40:11 2008 +0000 +++ b/etc/NEWS Thu Jun 05 05:44:12 2008 +0000 @@ -811,6 +811,9 @@ * 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
--- a/lisp/ChangeLog Thu Jun 05 05:40:11 2008 +0000 +++ b/lisp/ChangeLog Thu Jun 05 05:44:12 2008 +0000 @@ -1,5 +1,8 @@ 2008-06-05 Stefan Monnier <monnier@iro.umontreal.ca> + * 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 <rgm@gnu.org>
--- a/lisp/minibuffer.el Thu Jun 05 05:40:11 2008 +0000 +++ b/lisp/minibuffer.el Thu Jun 05 05:44:12 2008 +0000 @@ -906,6 +906,9 @@ ;;; 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 @@ (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))
--- a/src/ChangeLog Thu Jun 05 05:40:11 2008 +0000 +++ b/src/ChangeLog Thu Jun 05 05:44:12 2008 +0000 @@ -1,3 +1,11 @@ +2008-06-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * 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 <handa@m17n.org> * xfont.c (xfont_list): Don't set registry to iso8859-1 even if it
--- a/src/commands.h Thu Jun 05 05:40:11 2008 +0000 +++ b/src/commands.h Thu Jun 05 05:44:12 2008 +0000 @@ -43,7 +43,7 @@ /* 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;
--- a/src/keymap.c Thu Jun 05 05:40:11 2008 +0000 +++ b/src/keymap.c Thu Jun 05 05:44:12 2008 +0000 @@ -74,7 +74,7 @@ /* 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 @@ 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,
--- a/src/minibuf.c Thu Jun 05 05:40:11 2008 +0000 +++ b/src/minibuf.c Thu Jun 05 05:44:12 2008 +0000 @@ -1815,7 +1815,7 @@ : (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));