[slime-cvs] CVS slime/contrib

[CVS User heller]

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

Modified Files:
	ChangeLog slime-typeout-frame.el 
Log Message:
* slime-typeout-frame.el (slime-typeout-message): Don't call
slime-autodoc-stop-timer which no longer exists since 2009-01-01.
(slime-typeout-frame-init): Don't create a frame in a tty-only
session.
(slime-typeout-tty-only-p): New predicate.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/08/15 08:35:00	1.233
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/08/15 08:35:04	1.234
@@ -5,6 +5,14 @@
 
 2009-08-15  Helmut Eller  <heller at common-lisp.net>
 
+	* slime-typeout-frame.el (slime-typeout-message): Don't call
+	slime-autodoc-stop-timer which no longer exists since 2009-01-01.
+	(slime-typeout-frame-init): Don't create a frame in a tty-only
+	session.
+	(slime-typeout-tty-only-p): New predicate.
+
+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
--- /project/slime/cvsroot/slime/contrib/slime-typeout-frame.el	2008/08/05 18:19:34	1.7
+++ /project/slime/cvsroot/slime/contrib/slime-typeout-frame.el	2009/08/15 08:35:04	1.8
@@ -42,12 +42,7 @@
 	(insert msg)))))
 
 (defun slime-typeout-message (format-string &rest format-args)
-  (apply #'slime-typeout-message-aux format-string format-args)
-  ;; Disable the timer for autodoc temporarily, as it would overwrite
-  ;; the current typeout message otherwise.
-  (when (and (featurep 'slime-autodoc) slime-autodoc-mode)
-    (slime-autodoc-stop-timer)
-    (add-hook 'pre-command-hook #'slime-autodoc-start-timer)))
+  (apply #'slime-typeout-message-aux format-string format-args))
 
 (defun slime-make-typeout-frame ()
   "Create a frame for displaying messages (e.g. arglists)."
@@ -69,6 +64,7 @@
 
 (defun slime-typeout-autodoc-message (doc)
   ;; No need for refreshing per `slime-autodoc-pre-command-refresh-echo-area'.
+  ;; FIXME: eldoc doesn't know anything about this
   (setq slime-autodoc-last-message "")
   (slime-typeout-message-aux "%s" doc))
 
@@ -84,19 +80,26 @@
 (defvar slime-typeout-frame-unbind-stack ())
 
 (defun slime-typeout-frame-init ()
-  (add-hook 'slime-connected-hook 'slime-ensure-typeout-frame)
-  (loop for (var value) in 
-	'((slime-message-function slime-typeout-message)
-	  (slime-background-message-function slime-typeout-message)
-	  (slime-autodoc-message-function slime-typeout-autodoc-message)
-	  (slime-autodoc-dimensions-function slime-typeout-autodoc-dimensions))
-	do (slime-typeout-frame-init-var var value)))
+  (unless (slime-typeout-tty-only-p)
+    (add-hook 'slime-connected-hook 'slime-ensure-typeout-frame)
+    (loop for (var value) in 
+	  '((slime-message-function slime-typeout-message)
+	    (slime-background-message-function slime-typeout-message)
+	    (slime-autodoc-message-function slime-typeout-autodoc-message)
+	    (slime-autodoc-dimensions-function
+	     slime-typeout-autodoc-dimensions))
+	  do (slime-typeout-frame-init-var var value))))
 
 (defun slime-typeout-frame-init-var (var value)
   (push (list var (if (boundp var) (symbol-value var) 'slime-unbound))
 	slime-typeout-frame-unbind-stack)
   (set var value))
 
+(defun slime-typeout-tty-only-p ()
+  (cond ((featurep 'xemacs)
+	 (null (remove 'tty (mapcar #'device-type (console-device-list)))))
+	(t (not (window-system)))))
+
 (defun slime-typeout-frame-unload ()
   (remove-hook 'slime-connected-hook 'slime-ensure-typeout-frame)
   (loop for (var value) in slime-typeout-frame-unbind-stack