[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv13317

Modified Files:
	ChangeLog slime-repl.el 
Log Message:
* contrib/slime-repl.el (slime-repl-mode-map): Use both
`slime-editing-map' and `lisp-mode-map' as parent keymaps.
(slime-repl-mode): Don't use `slime-editing-mode' because
its keymap is already used above.
That way `slime-repl-mode-map' takes precedence of.
`slime-editing-map'.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/08 10:59:46	1.338
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/14 15:53:33	1.339
@@ -1,3 +1,12 @@
+2010-01-14  Stas Boukarev  <stassats at gmail.com>
+
+	* slime-repl.el (slime-repl-mode-map): Use both
+	`slime-editing-map' and `lisp-mode-map' as parent keymaps.
+	(slime-repl-mode): Don't use `slime-editing-mode' because
+	its keymap is already used above.
+	That way `slime-repl-mode-map' takes precedence of.
+	`slime-editing-map'.
+
 2010-01-08  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-asdf.lisp: Doing list-all-systems-in-central-registry
--- /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/01/03 15:58:29	1.34
+++ /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/01/14 15:53:33	1.35
@@ -413,7 +413,8 @@
 
 (defvar slime-repl-mode-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map lisp-mode-map)
+    (set-keymap-parent map
+                       (append slime-editing-map lisp-mode-map))
     map))
 
 (slime-define-keys slime-prefix-map
@@ -492,7 +493,6 @@
        'slime-repl-mode-beginning-of-defun)
   (set (make-local-variable 'end-of-defun-function) 
        'slime-repl-mode-end-of-defun)
-  (slime-editing-mode 1)
   (slime-run-mode-hooks 'slime-repl-mode-hook))
 
 (defun slime-repl-buffer (&optional create connection)