diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-06-11 22:10:24 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-06-11 22:10:24 +0000 |
| commit | b4879b4331e5b51d40e0d144fbe3f7570047f838 (patch) | |
| tree | d5baaa21131b0d61f74aa230a0bf25e88a6f6be4 | |
| parent | 37fcd54a632122f70869a1ad9bf209ef2b856d08 (diff) | |
| download | emacs-b4879b4331e5b51d40e0d144fbe3f7570047f838.tar.gz | |
(PC-bindings): Don't bind things already bound in the parent keymap.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/complete.el | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c5a6300ae0..c9b2e0adecf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/complete.el b/lisp/complete.el index b1bb36f9dfa..7d9bd989089 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -153,11 +153,8 @@ If nil, means use the colon-separated path in the variable $INCPATH instead." (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 @@ If nil, means use the colon-separated path in the variable $INCPATH instead." (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))))) |