From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 11 Jun 2007 22:10:24 +0000 (+0000)
Subject: (PC-bindings): Don't bind things already bound in the parent keymap.
X-Git-Tag: emacs-pretest-23.0.90~12363
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4879b4331e5b51d40e0d144fbe3f7570047f838;p=emacs.git

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

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)))))