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

[Luke Gorrie]

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

Modified Files:
	slime.el 
Log Message:
(slime-keys): Moved `slime-reindent-defun' from C-M-q to C-cM-q. This
avoids overriding the standard binding of C-M-q to index-sexp.

Date: Fri Jul 16 09:38:33 2004
Author: lgorrie

Index: slime/slime.el
diff -u slime/slime.el:1.364 slime/slime.el:1.365
--- slime/slime.el:1.364	Fri Jul 16 09:12:58 2004
+++ slime/slime.el	Fri Jul 16 09:38:33 2004
@@ -449,7 +449,7 @@
     ("\M-." slime-edit-definition :inferior t :sldb t)
     ("\M-," slime-pop-find-definition-stack :inferior t :sldb t)
     ("\C-q" slime-close-parens-at-point :prefixed t :inferior t)
-    ("\C-\M-q" slime-reindent-defun :inferior t)
+    ("\C-c\M-q" slime-reindent-defun :inferior t)
     ;; Evaluating
     ("\C-x\C-e" slime-eval-last-expression :inferior t)
     ("\C-x\M-e" slime-eval-last-expression-display-output :inferior t)
@@ -4697,6 +4697,13 @@
 
 ;;; Interactive evaluation.
 
+(defun slime-interactive-eval (string)
+  "Read and evaluate STRING and print value in minibuffer. "
+  (interactive (list (slime-read-from-minibuffer "Slime Eval: ")))
+  (slime-insert-transcript-delimiter string)
+  (slime-eval-with-transcript `(swank:interactive-eval ,string)
+                              (slime-buffer-package t)))
+
 (defun slime-eval-with-transcript (form package &optional fn)
   "Send FROM and PACKAGE to Lisp and pass the result to FN.
 Display the result in the message area, if FN is nil.
@@ -4728,13 +4735,6 @@
                                     (substring string 0 
                                                (min 60 (length string))))
       " ...\n"))))
-
-(defun slime-interactive-eval (string)
-  "Read and evaluate STRING and print value in minibuffer. "
-  (interactive (list (slime-read-from-minibuffer "Slime Eval: ")))
-  (slime-insert-transcript-delimiter string)
-  (slime-eval-with-transcript `(swank:interactive-eval ,string)
-                              (slime-buffer-package t)))
 
 (defun slime-display-buffer-region (buffer start end &optional other-window)
   "Like `display-buffer', but only display the specified region."