[slime-cvs] CVS slime

[heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-pop-to-location): Slight cleanups.
(slime-goto-xref, slime-goto-next-xref): Use it.


--- /project/slime/cvsroot/slime/ChangeLog	2008/02/22 14:09:00	1.1295
+++ /project/slime/cvsroot/slime/ChangeLog	2008/02/22 14:10:36	1.1296
@@ -1,5 +1,10 @@
 2008-02-22  Helmut Eller  <heller at common-lisp.net>
 
+	* slime.el (slime-pop-to-location): Slight cleanups.
+	(slime-goto-xref, slime-goto-next-xref): Use it.
+
+2008-02-22  Helmut Eller  <heller at common-lisp.net>
+
 	Remove save-restriction-if-possible.
 
 	* slime.el (save-restriction-if-possible): Deleted.  It was only
--- /project/slime/cvsroot/slime/slime.el	2008/02/22 14:09:00	1.908
+++ /project/slime/cvsroot/slime/slime.el	2008/02/22 14:10:36	1.909
@@ -5179,17 +5179,11 @@
            (format "%s (previously existing buffer)" bufname))))))
 
 (defun slime-pop-to-location (location &optional where)
+  (slime-goto-source-location location)
   (ecase where
-    ((nil)
-     (slime-goto-source-location location)
-     (switch-to-buffer (current-buffer)))
-    (window
-     (slime-goto-source-location location)
-     (pop-to-buffer (current-buffer) t))
-    (frame
-     (let ((pop-up-frames t))
-       (slime-goto-source-location location)
-       (pop-to-buffer (current-buffer) t)))))
+    ((nil) (switch-to-buffer (current-buffer)))
+    (window (pop-to-buffer (current-buffer) t))
+    (frame (let ((pop-up-frames t)) (pop-to-buffer (current-buffer) t)))))
 
 (defun slime-find-definitions (name cont)
   "Find definitions for NAME and pass them to CONT."
@@ -6156,8 +6150,7 @@
   (interactive)
   (let ((location (slime-xref-location-at-point)))
     (slime-xref-cleanup)
-    (slime-goto-source-location location)
-    (switch-to-buffer (current-buffer))))
+    (slime-pop-to-location location)))
 
 (defun slime-show-xref ()
   "Display the xref at point in the other window."
@@ -6178,8 +6171,7 @@
                           (t 
                            (slime-xref-location-at-point))))))
     (when location
-      (slime-goto-source-location location)
-      (switch-to-buffer (current-buffer)))))
+      (slime-pop-to-location location))))
 
 (defun slime-next-location ()
   "Go to the next location, depending on context.