[slime-cvs] CVS slime/contrib

[heller]

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

Modified Files:
	ChangeLog slime-fancy-inspector.el swank-fancy-inspector.lisp 
Log Message:
Fix some bugs introduced by the recent reorganization.

* swank-fancy-inspector.lisp (emacs-inspect pathname): Fix it
again.

* slime-fancy-inspector.el: Use slime-require.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2008/02/04 18:00:36	1.87
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2008/02/10 08:31:21	1.88
@@ -1,3 +1,12 @@
+2008-02-10  Helmut Eller  <heller at common-lisp.net>
+
+	Fix some bugs introduced by the recent reorganization.
+
+	* swank-fancy-inspector.lisp (emacs-inspect pathname): Fix it
+	again.
+
+	* slime-fancy-inspector.el: Use slime-require.
+
 2008-02-04  Marco Baringer  <mb at bese.it>
 
 	* swank-presentation-streams.lisp (presenting-object-1): Add
--- /project/slime/cvsroot/slime/contrib/slime-fancy-inspector.el	2007/09/20 14:55:53	1.2
+++ /project/slime/cvsroot/slime/contrib/slime-fancy-inspector.el	2008/02/10 08:31:21	1.3
@@ -3,26 +3,7 @@
 ;; Author: Marco Baringer <mb at bese.it> and others
 ;; License: GNU GPL (same license as Emacs)
 ;;
-;;; Installation
-;;
-;; Add this to your .emacs: 
-;;
-;;   (add-to-list 'load-path "<directory-of-this-file>")
-;;   (add-hook 'slime-load-hook (lambda () (require 'slime-fancy-inspector)))
-;;   (add-hook 'slime-connected-hook 'slime-install-fancy-inspector)
-
-(defun slime-install-fancy-inspector ()
-  (slime-eval-async '(swank:swank-require :swank-fancy-inspector)
-		    (lambda (_) 
-		      (slime-eval-async '(swank:fancy-inspector-init)))))
-
-(defun slime-deinstall-fancy-inspector ()
-  (slime-eval-async '(swank:fancy-inspector-unload)))
-
-(defun slime-fancy-inspector-init ()
-  (add-hook 'slime-connected-hook 'slime-install-fancy-inspector))
 
-(defun slime-fancy-inspector-unload ()
-  (remove-hook 'slime-connected-hook 'slime-install-fancy-inspector))
+(slime-require :swank-fancy-inspector)
 
 (provide 'slime-fancy-inspector)
\ No newline at end of file
--- /project/slime/cvsroot/slime/contrib/swank-fancy-inspector.lisp	2008/02/09 19:23:41	1.10
+++ /project/slime/cvsroot/slime/contrib/swank-fancy-inspector.lisp	2008/02/10 08:31:21	1.11
@@ -535,21 +535,21 @@
 
 
 (defmethod emacs-inspect ((pathname pathname))
-          (list* (if (wild-pathname-p pathname)
-		      "A wild pathname."
-		      "A pathname.")
-		  '(:newline)
-		  (label-value-line*
-                   ("Namestring" (namestring pathname))
-                   ("Host"       (pathname-host pathname))
-                   ("Device"     (pathname-device pathname))
-                   ("Directory"  (pathname-directory pathname))
-                   ("Name"       (pathname-name pathname))
-                   ("Type"       (pathname-type pathname))
-                   ("Version"    (pathname-version pathname)))
-                  (unless (or (wild-pathname-p pathname)
-                              (not (probe-file pathname)))
-                    (label-value-line "Truename" (truename pathname)))))
+  `(,(if (wild-pathname-p pathname)
+	 "A wild pathname."
+	 "A pathname.")
+     (:newline)
+     ,@(label-value-line*
+	("Namestring" (namestring pathname))
+	("Host"       (pathname-host pathname))
+	("Device"     (pathname-device pathname))
+	("Directory"  (pathname-directory pathname))
+	("Name"       (pathname-name pathname))
+	("Type"       (pathname-type pathname))
+	("Version"    (pathname-version pathname)))
+     ,@ (unless (or (wild-pathname-p pathname)
+		    (not (probe-file pathname)))
+	  (label-value-line "Truename" (truename pathname)))))
 
 (defmethod emacs-inspect ((pathname logical-pathname))
           (append 
@@ -651,7 +651,7 @@
              content)))
 
 (defmethod emacs-inspect ((condition stream-error))
-  (multiple-value-bind (title content)
+  (multiple-value-bind (content)
       (call-next-method)
     (let ((stream (stream-error-stream condition)))
       (if (typep stream 'file-stream)
@@ -684,13 +684,4 @@
     (set-pprint-dispatch '(cons (member function)) nil)
     (princ-to-string list)))
 
-(defvar *fancy-inpector-undo-list* nil)
-
-(defslimefun fancy-inspector-init ()
-  t)
-
-(defslimefun fancy-inspector-unload ()
-  (loop while *fancy-inpector-undo-list* do
-	(funcall (pop *fancy-inpector-undo-list*))))
-
 (provide :swank-fancy-inspector)