[slime-devel] Daily ChangeLog diff

[Helmut Eller]

Index: slime/ChangeLog
diff -u slime/ChangeLog:1.1963 slime/ChangeLog:1.1964
--- slime/ChangeLog:1.1963	Wed Jan 13 08:45:49 2010
+++ slime/ChangeLog	Thu Jan 14 09:33:58 2010
@@ -1,3 +1,9 @@
+2010-01-14  Stas Boukarev  <stassats at gmail.com>
+
+	* doc/slime.texi (Setting up the lisp image):
+	(swank-loader:init) is also needed for loading swank.
+	Reported by Evgeny Bahvalov.
+
 2010-01-13  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* swank.lisp (*swank-state-stack*): Delete. Not needed anymore.
Index: slime/contrib/ChangeLog
diff -u slime/contrib/ChangeLog:1.338 slime/contrib/ChangeLog:1.340
--- slime/contrib/ChangeLog:1.338	Fri Jan  8 05:59:46 2010
+++ slime/contrib/ChangeLog	Thu Jan 14 16:53:11 2010
@@ -1,3 +1,23 @@
+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
+	`slime-editing-map'.
+
 2010-01-08  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-asdf.lisp: Doing list-all-systems-in-central-registry