aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2008-06-05 05:44:12 +0000
committerStefan Monnier2008-06-05 05:44:12 +0000
commit8ba31f366fc04228330e55c9ae48f2a6ba73760f (patch)
tree88ff83169a0c5977911825316cba6cdd10529e22 /lisp
parent6b1f69f1af2b8483b9c59518b40c8e47dc4b9996 (diff)
downloademacs-8ba31f366fc04228330e55c9ae48f2a6ba73760f.tar.gz
emacs-8ba31f366fc04228330e55c9ae48f2a6ba73760f.zip
* 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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/minibuffer.el5
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59600dd747f..44378452af4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-06-05 Stefan Monnier <monnier@iro.umontreal.ca> 12008-06-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * minibuffer.el (minibuffer-local-must-match-filename-map):
4 Declare obsolete alias for the old name.
5
3 * abbrev.el (unexpand-abbrev): Better preserve markers. 6 * abbrev.el (unexpand-abbrev): Better preserve markers.
4 7
52008-06-05 Glenn Morris <rgm@gnu.org> 82008-06-05 Glenn Morris <rgm@gnu.org>
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."
906 906
907;;; Key bindings. 907;;; Key bindings.
908 908
909(define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map
910 'minibuffer-local-filename-must-match-map "23.1")
911
909(let ((map minibuffer-local-map)) 912(let ((map minibuffer-local-map))
910 (define-key map "\C-g" 'abort-recursive-edit) 913 (define-key map "\C-g" 'abort-recursive-edit)
911 (define-key map "\r" 'exit-minibuffer) 914 (define-key map "\r" 'exit-minibuffer)
@@ -925,7 +928,7 @@ specified by COMMON-SUBSTRING."
925 928
926(let ((map minibuffer-local-filename-completion-map)) 929(let ((map minibuffer-local-filename-completion-map))
927 (define-key map " " nil)) 930 (define-key map " " nil))
928(let ((map minibuffer-local-must-match-filename-map)) 931(let ((map minibuffer-local-filename-must-match-map))
929 (define-key map " " nil)) 932 (define-key map " " nil))
930 933
931(let ((map minibuffer-local-ns-map)) 934(let ((map minibuffer-local-ns-map))