[slime-cvs] CVS slime

[heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-repl-return-behaviour): Deleted.  Rebind
the key if you don't like what the command does.

--- /project/slime/cvsroot/slime/ChangeLog	2008/03/17 11:36:00	1.1322
+++ /project/slime/cvsroot/slime/ChangeLog	2008/03/18 13:21:18	1.1323
@@ -34,6 +34,11 @@
 
 	* slime.el (slime-eval-macroexpand): Indent expansion.
 	
+2008-03-14  Helmut Eller  <heller at common-lisp.net>
+
+	* slime.el (slime-repl-return-behaviour): Deleted.  Rebind
+	the key if you don't like what the command does.
+
 2008-03-13  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-edit-definition-cont): If no definition could
--- /project/slime/cvsroot/slime/slime.el	2008/03/16 10:44:37	1.924
+++ /project/slime/cvsroot/slime/slime.el	2008/03/18 13:21:18	1.925
@@ -385,26 +385,6 @@
   :type '(boolean)
   :group 'slime-repl)
 
-(defcustom slime-repl-return-behaviour :send-if-complete
-  "Keyword specifying how slime-repl-return behaves when the
-  point is on a lisp expression (as opposed to being on a
-  previous output).
-
-Currently only two values are supported:
-
-:send-if-complete - If the current expression is complete, as per
-slime-input-complete-p, it is sent to the underlying lisp,
-otherwise a newline is inserted. The current value of (point) has
-no effect.
-
-:send-only-if-after-complete - If the current expression is complete
-and point is after the expression it is sent, otherwise a newline
-is inserted."
-  :type '(choice (const :tag "Send if complete" :value :send-if-complete)
-                 (const :tag "Send only if after complete" :value :send-only-if-after-complete))
-  :group 'slime-repl)
-  
-
 (defface slime-repl-prompt-face
   (if (slime-face-inheritance-possible-p)
       '((t (:inherit font-lock-keyword-face)))
@@ -519,23 +499,6 @@
 		((slime-modeline-package (":" slime-modeline-package) "")
 		 slime-state-name))))
 
-(defun slime-input-complete-p (start end)
-  "Return t if the region from START to END contains a complete sexp."
-  (save-excursion
-    (goto-char start)
-    (cond ((looking-at "\\s *['`#]?[(\"]")
-           (ignore-errors
-             (save-restriction
-               (narrow-to-region start end)
-               ;; Keep stepping over blanks and sexps until the end of
-               ;; buffer is reached or an error occurs. Tolerate extra
-               ;; close parens.
-               (loop do (skip-chars-forward " \t\r\n)")
-                     until (eobp)
-                     do (forward-sexp))
-               t)))
-          (t t))))
-
 
 ;;;;; Key bindings
 
@@ -3122,9 +3085,7 @@
          (slime-repl-recenter-if-needed))
         ((run-hook-with-args-until-success 'slime-repl-return-hooks))
         ((slime-input-complete-p slime-repl-input-start-mark
-                                 (ecase slime-repl-return-behaviour
-                                   (:send-only-if-after-complete (min (point) slime-repl-input-end-mark))
-                                   (:send-if-complete slime-repl-input-end-mark)))
+                                 slime-repl-input-end-mark)
          (slime-repl-send-input t))
         (t 
          (slime-repl-newline-and-indent)
@@ -3213,6 +3174,23 @@
     (insert "\n")
     (lisp-indent-line)))
 
+(defun slime-input-complete-p (start end)
+  "Return t if the region from START to END contains a complete sexp."
+  (save-excursion
+    (goto-char start)
+    (cond ((looking-at "\\s *['`#]?[(\"]")
+           (ignore-errors
+             (save-restriction
+               (narrow-to-region start end)
+               ;; Keep stepping over blanks and sexps until the end of
+               ;; buffer is reached or an error occurs. Tolerate extra
+               ;; close parens.
+               (loop do (skip-chars-forward " \t\r\n)")
+                     until (eobp)
+                     do (forward-sexp))
+               t)))
+          (t t))))
+
 (defun slime-repl-delete-current-input ()
   (delete-region slime-repl-input-start-mark slime-repl-input-end-mark))