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

[Luke Gorrie]

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

Modified Files:
	slime.el 
Log Message:
Rolled back some things that I committed by accident.

Date: Wed Jun 30 11:59:45 2004
Author: lgorrie

Index: slime/slime.el
diff -u slime/slime.el:1.349 slime/slime.el:1.350
--- slime/slime.el:1.349	Wed Jun 30 11:54:37 2004
+++ slime/slime.el	Wed Jun 30 11:59:45 2004
@@ -2168,13 +2168,7 @@
     (slime-insert-propertized '(face slime-repl-result-face) result)
     (unless (bolp) (insert "\n"))
     (let ((prompt-start (point))
-          (prompt (if (sldb-find-buffer)
-                      ;; Debugger is active: add debug level to prompt
-                      (format "%s[%S]> "
-                              (slime-lisp-package)
-                              (with-current-buffer (sldb-find-buffer)
-                                sldb-level))
-                    (format "%s> "  (slime-lisp-package)))))
+          (prompt (format "%s> "  (slime-lisp-package))))
       (slime-propertize-region
           '(face slime-repl-prompt-face
                  read-only t
@@ -2339,22 +2333,19 @@
 balanced."
   (interactive)
   (slime-check-connected)
-  ;; If the REPL is in the debugger then pop up SLDB instead.
-  (if (sldb-find-buffer slime-current-thread)
-      (pop-to-buffer (sldb-find-buffer slime-current-thread))
-    (assert (<= (point) slime-repl-input-end-mark))
-    (cond ((get-text-property (point) 'slime-repl-old-input)
-           (slime-repl-grab-old-input))
-          (current-prefix-arg
-           (slime-repl-send-input))
-          (slime-repl-read-mode ; bad style?
-           (slime-repl-send-input t))
-          ((slime-input-complete-p slime-repl-input-start-mark 
-                                   slime-repl-input-end-mark)
-           (slime-repl-send-input t))
-          (t 
-           (slime-repl-newline-and-indent)
-           (message "[input not complete]")))))
+  (assert (<= (point) slime-repl-input-end-mark))
+  (cond ((get-text-property (point) 'slime-repl-old-input)
+         (slime-repl-grab-old-input))
+        (current-prefix-arg
+         (slime-repl-send-input))
+        (slime-repl-read-mode ; bad style?
+         (slime-repl-send-input t))
+        ((slime-input-complete-p slime-repl-input-start-mark 
+                                 slime-repl-input-end-mark)
+         (slime-repl-send-input t))
+        (t 
+         (slime-repl-newline-and-indent)
+         (message "[input not complete]"))))
 
 (defun slime-repl-send-input (&optional newline)
   "Goto to the end of the input and send the current input.
@@ -5416,8 +5407,8 @@
 (defvar sldb-buffers '()
   "List of sldb-buffers.")
 
-(defun sldb-find-buffer (&optional thread)
-  (cdr (assoc* (cons (slime-connection) (or thread slime-current-thread) )
+(defun sldb-find-buffer (thread)
+  (cdr (assoc* (cons (slime-connection) thread) 
                sldb-buffers 
                :test #'equal)))
 
@@ -7413,12 +7404,13 @@
 
 (slime-defun-if-undefined line-beginning-position (&optional n)
   (save-excursion
-    (beginning-of-line n)
+    (forward-line n)
     (point)))
 
 (slime-defun-if-undefined line-end-position (&optional n)
   (save-excursion
-    (end-of-line n)
+    (forward-line n)
+    (end-of-line)
     (point)))
 
 (slime-defun-if-undefined check-parens ()