[slime-cvs] CVS update: slime/slime.el

[Helmut Eller]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv20672

Modified Files:
	slime.el 
Log Message:
(slime-keys): Bind it to C-c C-x t to slime-list-threads and C-c C-x c
to slime-list-connections.

(slime): Disconnect before reconnecting if the inferior-lisp buffer
wasn't renamed.

(slime-connect): Use the host argument and the "localhost".

(slime-compilation-finished): Undo last change.  We need to switch to
the buffer to remove old annotations.

(slime-choose-overlay-region): Ignore errors in slime-forward-sexp.

Date: Sat Feb 21 02:32:52 2004
Author: heller

Index: slime/slime.el
diff -u slime/slime.el:1.212 slime/slime.el:1.213
--- slime/slime.el:1.212	Wed Feb 18 14:43:26 2004
+++ slime/slime.el	Sat Feb 21 02:32:52 2004
@@ -457,7 +457,8 @@
     ;; "Other"
     ("\I"  slime-inspect :prefixed t :inferior t :sldb t)
     ("\C-]" slime-close-all-sexp :prefixed t :inferior t :sldb t)
-    ("\C-xt" slime-thread-control-panel :prefixed t :inferior t :sldb t)))
+    ("\C-xt" slime-list-threads :prefixed t :inferior t :sldb t)
+    ("\C-xc" slime-list-connections :prefixed t :inferior t :sldb t)))
 
 ;; Maybe a good idea, maybe not..
 (defvar slime-prefix-key "\C-c"
@@ -904,11 +905,12 @@
 (defun slime ()
   "Start an inferior^_superior Lisp and connect to its Swank server."
   (interactive)
-  (if (and current-prefix-arg
-           (slime-connected-p)
-           (get-buffer "*inferior-lisp*"))
-      (slime-maybe-rearrange-inferior-lisp)
-    (slime-disconnect))
+  (cond ((and current-prefix-arg
+              (slime-connected-p)
+              (get-buffer "*inferior-lisp*"))
+         (unless (slime-maybe-rearrange-inferior-lisp)
+           (slime-disconnect)))
+        (t (slime-disconnect)))
   (slime-maybe-start-lisp)
   (slime-read-port-and-connect))
 
@@ -997,7 +999,7 @@
                        (y-or-n-p "Close old connections first? "))))
   (when kill-old-p (slime-disconnect))
   (message "Connecting to Swank on port %S.." port)
-  (slime-init-connection (slime-net-connect "localhost" port))
+  (slime-init-connection (slime-net-connect host port))
   (when-let (buffer (get-buffer "*inferior-lisp*"))
     (delete-windows-on buffer)
     (bury-buffer buffer))
@@ -1417,6 +1419,7 @@
   "*Log protocol events to the *slime-events* buffer.")
 
 ;;;;;;; Event logging to *slime-events*
+
 (defun slime-log-event (event)
   (when slime-log-events
     (with-current-buffer (slime-events-buffer)
@@ -2349,10 +2352,11 @@
 
 (defun slime-compilation-finished (result buffer show-notes-buffer)
   (let ((notes (slime-compiler-notes)))
-    (multiple-value-bind (result secs) result
-      (slime-show-note-counts notes secs)
-      (slime-highlight-notes notes))
-    (when (and show-notes-buffer (slime-length> notes 1))
+    (with-current-buffer buffer
+      (multiple-value-bind (result secs) result
+        (slime-show-note-counts notes secs)
+        (slime-highlight-notes notes)))
+    (when (and show-notes-buffer (slime-length> notes 0))
       (slime-list-compiler-notes notes))
     ;;(let ((xrefs (slime-xrefs-for-notes notes)))
     ;;  (when (> (length xrefs) 1) ; >1 file
@@ -2640,7 +2644,7 @@
     (unless (eql (car location) :error) 
       (slime-goto-source-location location)
       (let ((start (point)))
-        (slime-forward-sexp)
+        (ignore-errors (slime-forward-sexp))
         (if (slime-same-line-p start (point))
             (values start (point))
             (values (1+ start)