[slime-cvs] CVS slime

[alendvai]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
FIX: set-keymap-parents for GNU Emacs was bogus, fixed by Ariel Badichi.


--- /project/slime/cvsroot/slime/ChangeLog	2007/01/07 11:45:46	1.1037
+++ /project/slime/cvsroot/slime/ChangeLog	2007/01/10 09:42:47	1.1038
@@ -1,3 +1,8 @@
+2007-01-010  Attila Lendvai  <attila.lendvai at gmail.com>
+
+	* slime.el: FIX: set-keymap-parents for GNU Emacs was bogus, fixed
+	by Ariel Badichi.
+
 2007-01-07  Helmut Eller  <heller at common-lisp.net>
 
 	* swank.lisp (open-streams): Don't pass nil to make-fn-streams;
--- /project/slime/cvsroot/slime/slime.el	2007/01/09 20:19:56	1.736
+++ /project/slime/cvsroot/slime/slime.el	2007/01/10 09:42:47	1.737
@@ -1060,7 +1060,7 @@
       (set-keymap-parent
        m
        (cond
-         ((not (consp parents)) parents)
+         ((or (keymapp parents) (not (consp parents))) parents)
          ((not (cdr parents)) (car parents))
          (t (let ((m (copy-keymap (pop parents))))
               (set-keymap-parents m parents)