Mercurial > emacs
changeset 81312:b6eaf964a6cf
(PC-bindings): Don't bind things already bound in the parent keymap.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 11 Jun 2007 22:10:24 +0000 |
| parents | 9746ea590b08 |
| children | 8021008d25bf |
| files | lisp/ChangeLog lisp/complete.el |
| diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jun 11 22:06:36 2007 +0000 +++ b/lisp/ChangeLog Mon Jun 11 22:10:24 2007 +0000 @@ -1,5 +1,8 @@ 2007-06-11 Stefan Monnier <monnier@iro.umontreal.ca> + * complete.el (PC-bindings): Don't bind things already bound in the + parent keymap. + * textmodes/bibtex-style.el: New file. 2007-06-11 Riccardo Murri <riccardo.murri@gmail.com>
--- a/lisp/complete.el Mon Jun 11 22:06:36 2007 +0000 +++ b/lisp/complete.el Mon Jun 11 22:10:24 2007 +0000 @@ -153,11 +153,8 @@ (define-key completion-map " " 'minibuffer-complete-word) (define-key completion-map "?" 'minibuffer-completion-help) - (define-key must-match-map "\t" 'minibuffer-complete) - (define-key must-match-map " " 'minibuffer-complete-word) (define-key must-match-map "\r" 'minibuffer-complete-and-exit) (define-key must-match-map "\n" 'minibuffer-complete-and-exit) - (define-key must-match-map "?" 'minibuffer-completion-help) (define-key global-map [remap lisp-complete-symbol] nil)) (PC-default-bindings @@ -173,17 +170,11 @@ (define-key completion-map "\e\n" 'PC-force-complete-and-exit) (define-key completion-map "\e?" 'PC-completion-help) - (define-key must-match-map "\t" 'PC-complete) - (define-key must-match-map " " 'PC-complete-word) (define-key must-match-map "\r" 'PC-complete-and-exit) (define-key must-match-map "\n" 'PC-complete-and-exit) - (define-key must-match-map "?" 'PC-completion-help) - (define-key must-match-map "\e\t" 'PC-complete) - (define-key must-match-map "\e " 'PC-complete-word) (define-key must-match-map "\e\r" 'PC-complete-and-exit) (define-key must-match-map "\e\n" 'PC-complete-and-exit) - (define-key must-match-map "\e?" 'PC-completion-help) (define-key global-map [remap lisp-complete-symbol] 'PC-lisp-complete-symbol)))))