(PC-bindings): Don't bind things already bound in the parent keymap.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c5a6300ae0ad82db62ba468826819a2fb05aa24..c9b2e0adecf8317387c131eee3422e08813a2bbc 100644 (file)
--- 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 b1bb36f9dfaf0501d67849b10e14f181db1e9ac2..7d9bd989089f563b34da3888b4887d2e4c57aefb 100644 (file)
--- 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)))))