[slime-cvs] CVS slime

[jsnellman]

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

Modified Files:
	slime.el ChangeLog 
Log Message:
	* slime.el (slime-read-expression-map): Switch the slime-mode-map
	and minibuffer-local-map back the way they were. The original change
	was made due to a misunderstanding caused by a keybinding for
	[(return)] apparently being more specific than one for (kbd "RET"),
	even when the former is in a parent keymap and the latter in the
	child.


--- /project/slime/cvsroot/slime/slime.el	2007/01/12 00:06:56	1.744
+++ /project/slime/cvsroot/slime/slime.el	2007/01/12 10:21:01	1.745
@@ -6266,7 +6266,7 @@
 
 (defvar slime-read-expression-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parents map (list slime-mode-map minibuffer-local-map))
+    (set-keymap-parents map (list minibuffer-local-map slime-mode-map))
     (define-key map "\t" 'slime-complete-symbol)
     (define-key map "\M-\t" 'slime-complete-symbol)
     map)
--- /project/slime/cvsroot/slime/ChangeLog	2007/01/12 07:50:34	1.1047
+++ /project/slime/cvsroot/slime/ChangeLog	2007/01/12 10:21:01	1.1048
@@ -1,3 +1,12 @@
+2007-01-12  Juho Snellman  <jsnell at iki.fi>
+
+	* slime.el (slime-read-expression-map): Switch the slime-mode-map
+	and minibuffer-local-map back the way they were. The previous change
+	was made due to a misunderstanding, caused by a keybinding for
+	[(return)] apparently being more specific than one for (kbd "RET"),
+	even when the former is in a parent keymap and the latter in the
+	child.
+	
 2007-01-12  Helmut Eller  <heller at common-lisp.net>
 
 	* swank.lisp (handle-request): Use 'abort as restart name, but