diff options
| author | Stefan Monnier | 2009-12-12 05:23:54 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-12-12 05:23:54 +0000 |
| commit | 1d4adede54232342cc50eb0cb19c1498d7cb8d9f (patch) | |
| tree | a9d1b5e6cae7b3cab9cf3c69426b7cb369d5f104 | |
| parent | 7d943b060dcde55d1f27a2f2f42c85f090667b81 (diff) | |
| download | emacs-1d4adede54232342cc50eb0cb19c1498d7cb8d9f.tar.gz emacs-1d4adede54232342cc50eb0cb19c1498d7cb8d9f.zip | |
(minibuffer-local-must-match-filename-map): Re-instate the varalias that was
accidentally removed by the 2009-11-19 change (bug#5186).
| -rw-r--r-- | lisp/ChangeLog | 23 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 4 |
2 files changed, 18 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c01c77b9c92..2a0aa18272e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2009-12-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * minibuffer.el (minibuffer-local-must-match-filename-map): Re-instate | ||
| 4 | the varalias that was accidentally removed by the 2009-11-19 change | ||
| 5 | (bug#5186). | ||
| 6 | |||
| 1 | 2009-12-12 Kenichi Handa <handa@m17n.org> | 7 | 2009-12-12 Kenichi Handa <handa@m17n.org> |
| 2 | 8 | ||
| 3 | * language/indian.el (indian-compose-regexp): New function. | 9 | * language/indian.el (indian-compose-regexp): New function. |
| @@ -15,19 +21,18 @@ | |||
| 15 | 21 | ||
| 16 | 2009-12-11 Michael McNamara <mac@mail.brushroad.com> | 22 | 2009-12-11 Michael McNamara <mac@mail.brushroad.com> |
| 17 | 23 | ||
| 18 | * verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re, | 24 | * verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re) |
| 19 | verilog-vmm-statement-re, verilog-ovm-statement-re, | 25 | (verilog-vmm-statement-re, verilog-ovm-statement-re) |
| 20 | verilog-defun-level-not-generate-re, verilog-calculate-indent, | 26 | (verilog-defun-level-not-generate-re, verilog-calculate-indent) |
| 21 | verilog-leap-to-head, verilog-backward-token): Fix | 27 | (verilog-leap-to-head, verilog-backward-token): |
| 22 | indenting VMM macros. Reported by Jonathan Ashbrook. | 28 | Fix indenting VMM macros. Reported by Jonathan Ashbrook. |
| 23 | 29 | ||
| 24 | 2009-12-11 Wilson Snyder <wsnyder@wsnyder.org> | 30 | 2009-12-11 Wilson Snyder <wsnyder@wsnyder.org> |
| 25 | 31 | ||
| 26 | * verilog-mode.el (verilog-auto-lineup, verilog-nameable-item-re): | 32 | * verilog-mode.el (verilog-auto-lineup, verilog-nameable-item-re): |
| 27 | Cleanup user-visible spelling and documentation errors. One | 33 | Cleanup user-visible spelling and documentation errors. |
| 28 | reported by Gary Delp. | 34 | One reported by Gary Delp. |
| 29 | (verilog-submit-bug-report): Mention bug tracking and CC | 35 | (verilog-submit-bug-report): Mention bug tracking and CC co-author. |
| 30 | co-author. | ||
| 31 | (verilog-read-decls): Fix AUTOWIRE with types declared in a | 36 | (verilog-read-decls): Fix AUTOWIRE with types declared in a |
| 32 | package, bug195. Reported by Pierre-David Pfister. | 37 | package, bug195. Reported by Pierre-David Pfister. |
| 33 | 38 | ||
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 40c3f4193c0..7338385fba2 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -1142,6 +1142,10 @@ Currently supported properties are: | |||
| 1142 | (completion-in-region start end (nth 2 res) | 1142 | (completion-in-region start end (nth 2 res) |
| 1143 | (plist-get plist :predicate))))))) | 1143 | (plist-get plist :predicate))))))) |
| 1144 | 1144 | ||
| 1145 | ;;; Key bindings. | ||
| 1146 | |||
| 1147 | (define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map | ||
| 1148 | 'minibuffer-local-filename-must-match-map "23.1") | ||
| 1145 | 1149 | ||
| 1146 | (let ((map minibuffer-local-map)) | 1150 | (let ((map minibuffer-local-map)) |
| 1147 | (define-key map "\C-g" 'abort-recursive-edit) | 1151 | (define-key map "\C-g" 'abort-recursive-edit) |