[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
Move some var-defs before first use.

* slime.el (slime-show-xref-buffer, slime-read-connection)
(slime-thread-index-to-id):

--- /project/slime/cvsroot/slime/ChangeLog	2010/05/28 10:49:44	1.2102
+++ /project/slime/cvsroot/slime/ChangeLog	2010/05/28 13:37:40	1.2103
@@ -1,5 +1,12 @@
 2010-05-28  Helmut Eller  <heller at common-lisp.net>
 
+	Move some var-defs before first use.
+
+	* slime.el (slime-show-xref-buffer, slime-read-connection)
+	(slime-thread-index-to-id):
+
+2010-05-28  Helmut Eller  <heller at common-lisp.net>
+
 	Move wacky parsing code to contrib.
 
 	* slime.el (slime-extract-context, slime-parse-context)
--- /project/slime/cvsroot/slime/slime.el	2010/05/28 10:49:44	1.1323
+++ /project/slime/cvsroot/slime/slime.el	2010/05/28 13:37:40	1.1324
@@ -771,19 +771,6 @@
                               `(swank:list-all-package-names t)))
 		     nil t initial-value)))
 
-(defun slime-read-connection (prompt &optional initial-value)
-  "Read a connection from the minibuffer. Returns the net
-process, or nil."
-  (assert (memq initial-value slime-net-processes))
-  (flet ((connection-identifier (p)
-           (format "%s (pid %d)" (slime-connection-name p) (slime-pid p))))
-    (let ((candidates (mapcar #'(lambda (p)
-                                  (cons (connection-identifier p) p))
-                              slime-net-processes)))
-      (cdr (assoc (completing-read prompt candidates 
-                                   nil t (connection-identifier initial-value))
-                  candidates)))))
-
 ;; Interface
 (defun slime-read-symbol-name (prompt &optional query)
   "Either read a symbol name or choose the one at point.
@@ -4602,14 +4589,6 @@
     (:error (message "%s" (cadr loc)))
     ((nil))))
 
-(defun slime-show-xref-buffer (xrefs type symbol package)
-  (slime-with-xref-buffer (type symbol package)
-    (slime-insert-xrefs xrefs)
-    (setq slime-next-location-function 'slime-goto-next-xref)
-    (setq slime-previous-location-function 'slime-goto-previous-xref)
-    (setq slime-xref-last-buffer (current-buffer))
-    (goto-char (point-min))))
-
 (defvar slime-next-location-function nil
   "Function to call for going to the next location.")
 
@@ -4620,6 +4599,14 @@
   "The most recent XREF results buffer.
 This is used by `slime-goto-next-xref'")
 
+(defun slime-show-xref-buffer (xrefs type symbol package)
+  (slime-with-xref-buffer (type symbol package)
+    (slime-insert-xrefs xrefs)
+    (setq slime-next-location-function 'slime-goto-next-xref)
+    (setq slime-previous-location-function 'slime-goto-previous-xref)
+    (setq slime-xref-last-buffer (current-buffer))
+    (goto-char (point-min))))
+
 (defun slime-show-xrefs (xrefs type symbol package)
   "Show the results of an XREF query."
   (if (null xrefs)
@@ -5961,6 +5948,18 @@
         (insert cmd)
         (comint-send-input)))))
 
+(defun slime-read-connection (prompt &optional initial-value)
+  "Read a connection from the minibuffer. Returns the net
+process, or nil."
+  (assert (memq initial-value slime-net-processes))
+  (flet ((connection-identifier (p)
+           (format "%s (pid %d)" (slime-connection-name p) (slime-pid p))))
+    (let ((candidates (mapcar #'(lambda (p)
+                                  (cons (connection-identifier p) p))
+                              slime-net-processes)))
+      (cdr (assoc (completing-read prompt candidates 
+                                   nil t (connection-identifier initial-value))
+                  candidates)))))
 
 (defun sldb-step ()
   "Step to next basic-block boundary."
@@ -6073,6 +6072,8 @@
       (mapc 'process-line list-of-lines)
       lengths)))
 
+(defvar slime-thread-index-to-id nil)
+
 (defun slime-quit-threads-buffer (&optional _)
   (when slime-threads-buffer-timer
     (cancel-timer slime-threads-buffer-timer)
@@ -6087,8 +6088,6 @@
     (slime-eval-async '(swank:list-threads)
       'slime-display-threads)))
 
-(defvar slime-thread-index-to-id nil)
-
 (defun slime-move-point (position)
   "Move point in the current buffer and in the window the buffer is displayed."
   (let ((window (get-buffer-window (current-buffer) t)))