[slime-cvs] CVS slime

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el: In minor-mode-alist for slime-popup-buffer-mode,
run slime-modeline-string only if slime-mode isn't active, because
slime-mode runs slime-modeline-string from minor-mode-alist too
resulting in duplicate modeline strings.
Reported by Leo Liu.


--- /project/slime/cvsroot/slime/ChangeLog	2010/02/18 18:46:02	1.1988
+++ /project/slime/cvsroot/slime/ChangeLog	2010/02/20 14:37:32	1.1989
@@ -1,3 +1,11 @@
+2010-02-20  Stas Boukarev  <stassats at gmail.com>
+
+	* slime.el: In minor-mode-alist for slime-popup-buffer-mode,
+	run slime-modeline-string only if slime-mode isn't active, because
+	slime-mode runs slime-modeline-string from minor-mode-alist too
+	resulting in duplicate modeline strings.
+	Reported by Leo Liu.
+
 2010-02-18  Mark Harig <idirectscm at aim.com>
 
 	The compiler warns about various stuff. Fix some of it.
--- /project/slime/cvsroot/slime/slime.el	2010/02/18 18:46:02	1.1277
+++ /project/slime/cvsroot/slime/slime.el	2010/02/20 14:37:32	1.1278
@@ -955,7 +955,8 @@
              `(slime-popup-buffer-mode
                ,(if (featurep 'xemacs)
                     'slime-modeline-string
-                  '(:eval (slime-modeline-string)))))
+                    '(:eval (unless slime-mode
+                              (slime-modeline-string))))))
 
 (set-keymap-parent slime-popup-buffer-mode-map slime-parent-map)