(minibuffer-local-must-match-filename-map): Re-instate the varalias that was

accidentally removed by the 2009-11-19 change (bug#5186).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c01c77b9c92b28befebdf99350432dddb64161a3..2a0aa18272e232f8c857ed19927d222d88f852cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuffer.el (minibuffer-local-must-match-filename-map): Re-instate
+       the varalias that was accidentally removed by the 2009-11-19 change
+       (bug#5186).
+
 2009-12-12  Kenichi Handa  <handa@m17n.org>
 
        * language/indian.el (indian-compose-regexp): New function.
@@ -15,19 +21,18 @@
 
 2009-12-11  Michael McNamara  <mac@mail.brushroad.com>
 
-       * verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re,
-       verilog-vmm-statement-re, verilog-ovm-statement-re,
-       verilog-defun-level-not-generate-re, verilog-calculate-indent,
-       verilog-leap-to-head, verilog-backward-token): Fix
-       indenting VMM macros.  Reported by Jonathan Ashbrook.
+       * verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re)
+       (verilog-vmm-statement-re, verilog-ovm-statement-re)
+       (verilog-defun-level-not-generate-re, verilog-calculate-indent)
+       (verilog-leap-to-head, verilog-backward-token):
+       Fix indenting VMM macros.  Reported by Jonathan Ashbrook.
 
 2009-12-11  Wilson Snyder  <wsnyder@wsnyder.org>
 
        * verilog-mode.el (verilog-auto-lineup, verilog-nameable-item-re):
-       Cleanup user-visible spelling and documentation errors.  One
-       reported by Gary Delp.
-       (verilog-submit-bug-report): Mention bug tracking and CC
-       co-author.
+       Cleanup user-visible spelling and documentation errors.
+       One reported by Gary Delp.
+       (verilog-submit-bug-report): Mention bug tracking and CC co-author.
        (verilog-read-decls): Fix AUTOWIRE with types declared in a
        package, bug195.  Reported by Pierre-David Pfister.
 

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 40c3f4193c06d3842962ad247bb732a27c638ba1..7338385fba2f13dc870e8a781df691978fc7c36d 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1142,6 +1142,10 @@ Currently supported properties are:
         (completion-in-region start end (nth 2 res)
                               (plist-get plist :predicate)))))))
 
+;;; 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)