[slime-cvs] CVS slime

[jsnellman]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv1625

Modified Files:
	ChangeLog slime.el 
Log Message:
	* slime.el (slime-read-expression-map): Switch the slime-mode-map
        and minibuffer-local-map around, so that the minibuffer binding 
        for return takes precedence over the slime-mode one.


--- /project/slime/cvsroot/slime/ChangeLog	2007/01/11 17:33:21	1.1042
+++ /project/slime/cvsroot/slime/ChangeLog	2007/01/11 17:48:05	1.1043
@@ -1,7 +1,9 @@
 2007-01-11  Juho Snellman  <jsnell at iki.fi>
 
 	* slime.el (slime-read-expression-map): restore tab completion in
-	the minibuffer.
+	the minibuffer. Switch the slime-mode-map and minibuffer-local-map
+	around, so that the minibuffer binding for return takes precedence
+	over the slime-mode one.
 	
 2007-01-11  Marco Baringer  <mb at bese.it>
 
--- /project/slime/cvsroot/slime/slime.el	2007/01/11 17:33:21	1.740
+++ /project/slime/cvsroot/slime/slime.el	2007/01/11 17:48:05	1.741
@@ -6254,7 +6254,7 @@
 
 (defvar slime-read-expression-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parents map (list minibuffer-local-map slime-mode-map))
+    (set-keymap-parents map (list slime-mode-map minibuffer-local-map))
     (define-key map "\t" 'slime-complete-symbol)
     (define-key map "\M-\t" 'slime-complete-symbol)
     map)