[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime-repl.el 
Log Message:
* contrib/slime-repl.el: Revert the previous change because it
didn't work in some cases.
(slime-repl-map-mode): New minor mode which sole purpose is to
enable `slime-repl-mode-map'.
(slime-repl-mode): Enable `slime-repl-map-mode' after enabling
`slime-editing-map'.
This will finally allow `slime-repl-mode-map' to take precedence of
`slime-editing-map'.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/14 15:53:33	1.339
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/14 21:53:11	1.340
@@ -1,10 +1,21 @@
 2010-01-14  Stas Boukarev  <stassats at gmail.com>
 
+	* slime-repl.el: Revert the previous change because it
+	didn't work in some cases.
+	(slime-repl-map-mode): New minor mode which sole purpose is to
+	enable `slime-repl-mode-map'.
+	(slime-repl-mode): Enable `slime-repl-map-mode' after enabling
+	`slime-editing-map'.
+	This will finally allow `slime-repl-mode-map' to take precedence of
+	`slime-editing-map'.
+
+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.
+	That way `slime-repl-mode-map' takes precedence of
 	`slime-editing-map'.
 
 2010-01-08  Stas Boukarev  <stassats at gmail.com>
--- /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/01/14 15:53:33	1.35
+++ /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/01/14 21:53:11	1.36
@@ -413,8 +413,7 @@
 
 (defvar slime-repl-mode-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map
-                       (append slime-editing-map lisp-mode-map))
+    (set-keymap-parent map lisp-mode-map)
     map))
 
 (slime-define-keys slime-prefix-map
@@ -465,6 +464,13 @@
   "SLIME Read-Eval-Print-Loop."
   (slime-output-buffer))
 
+(define-minor-mode slime-repl-map-mode
+  "Minor mode which makes slime-repl-mode-map available.
+\\{slime-repl-mode-map}"
+  nil
+  nil
+  slime-repl-mode-map)
+
 (defun slime-repl-mode () 
   "Major mode for interacting with a superior Lisp.
 \\{slime-repl-mode-map}"
@@ -472,6 +478,8 @@
   (kill-all-local-variables)
   (setq major-mode 'slime-repl-mode)
   (use-local-map slime-repl-mode-map)
+  (slime-editing-mode 1)
+  (slime-repl-map-mode 1)
   (lisp-mode-variables t)
   (set (make-local-variable 'lisp-indent-function)
        'common-lisp-indent-function)