[slime-cvs] CVS slime/contrib

[CVS User heller]

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

Modified Files:
	ChangeLog slime-autodoc.el slime-fancy.el 
Log Message:
Disable slime-autodoc for XEmacs.

* slime-autodoc.el, slime-fancy.el: XEmacs's version of eldoc
doesn't have the neccessary hooks.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/08/11 17:08:21	1.232
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/08/15 08:35:00	1.233
@@ -3,11 +3,18 @@
 	* slime-autodoc.el (slime-arglist): Pass properly formed argument
 	in the rpc call.
 
+2009-08-15  Helmut Eller  <heller at common-lisp.net>
+
+	Disable slime-autodoc for XEmacs.
+
+	* slime-autodoc.el, slime-fancy.el: XEmacs's version of eldoc
+	doesn't have the neccessary hooks.
+
 2009-08-09  Stas Boukarev  <stassats at gmail.com>
 
 	* slime-fuzzy.el (slime-fuzzy-complete-symbol): change
-	`comint-completion-addsuffix' to not add space after completing
-	a filename.
+	`comint-completion-addsuffix' to not add space after completing a
+	filename.
 
 2009-08-05  Stas Boukarev  <stassats at gmail.com>
 
--- /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2009/08/11 17:08:21	1.17
+++ /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2009/08/15 08:35:00	1.18
@@ -16,6 +16,10 @@
 ;;   (add-hook 'slime-load-hook (lambda () (require 'slime-autodoc)))
 ;;
 
+(eval-and-compile
+  (assert (not (featurep 'xemacs)) ()
+	  "slime-autodoc doesn't work with XEmacs"))
+
 (require 'slime-parse)
 (require 'slime-enclosing-context)
 
@@ -229,7 +233,6 @@
     (save-match-data
       (slime-compute-autodoc-internal))))
 
-
 (make-variable-buffer-local (defvar slime-autodoc-mode nil))
 
 (defun slime-autodoc-mode (&optional arg)
@@ -238,14 +241,14 @@
   (make-local-variable 'eldoc-idle-delay)
   (setq eldoc-documentation-function 'slime-compute-autodoc)
   (setq eldoc-idle-delay slime-autodoc-delay)
-  (if (eldoc-mode arg)
-      (progn 
-        (setq slime-echo-arglist-function 
-              #'(lambda () (eldoc-message (slime-compute-autodoc))))
-        (setq slime-autodoc-mode t))
-      (progn 
-        (setq slime-echo-arglist-function 'slime-show-arglist)
-        (setq slime-autodoc-mode nil))))
+  (eldoc-mode arg)
+  (cond (eldoc-mode
+	 (setq slime-echo-arglist-function 
+	       (lambda () (eldoc-message (slime-compute-autodoc))))
+	 (setq slime-autodoc-mode t))
+	(t
+	 (setq slime-echo-arglist-function 'slime-show-arglist)
+	 (setq slime-autodoc-mode nil))))
 
 (defadvice eldoc-display-message-no-interference-p 
     (after slime-autodoc-message-ok-p)
--- /project/slime/cvsroot/slime/contrib/slime-fancy.el	2008/12/24 08:13:43	1.8
+++ /project/slime/cvsroot/slime/contrib/slime-fancy.el	2009/08/15 08:35:00	1.9
@@ -21,8 +21,9 @@
 (slime-repl-init)
 
 ;; Better arglist display, can be turned off by customization.
-(require 'slime-autodoc)
-(slime-autodoc-init)
+(unless (featurep 'xemacs)
+  (require 'slime-autodoc)
+  (slime-autodoc-init))
 
 ;; Adds new commands and installs compound-prefix-completion as
 ;; default completion command.  Behaves similar to standard Emacs