[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el swank.lisp 
Log Message:
Rename slime-macro/compiler-macro-expand-1 => slime-expand-1

* slime.el (slime-expand-1): Renamed from
slime-macro/compiler-macro-expand-1.
(slime-expand-1-inplace): Renamed from
slime-macro/compiler-macro-expand-1-inplace.

* swank.lisp (swank-expand-1): Renamed from
swank-macro/compiler-macro-expand-1.
(swank-expand): Renamed from swank-macro/compiler-macro-expand.
(expand-1): Renamed from macro/compiler-macro-expand-1.
(expand): Renamed from macro/compiler-macro-expand.

--- /project/slime/cvsroot/slime/ChangeLog	2010/10/01 09:30:43	1.2146
+++ /project/slime/cvsroot/slime/ChangeLog	2010/10/02 11:16:54	1.2147
@@ -1,3 +1,18 @@
+2010-10-02  Helmut Eller  <heller at common-lisp.net>
+
+	Rename slime-macro/compiler-macro-expand-1 => slime-expand-1
+
+	* slime.el (slime-expand-1): Renamed from
+	slime-macro/compiler-macro-expand-1.
+	(slime-expand-1-inplace): Renamed from
+	slime-macro/compiler-macro-expand-1-inplace.
+
+	* swank.lisp (swank-expand-1): Renamed from
+	swank-macro/compiler-macro-expand-1.
+	(swank-expand): Renamed from swank-macro/compiler-macro-expand.
+	(expand-1): Renamed from macro/compiler-macro-expand-1.
+	(expand): Renamed from macro/compiler-macro-expand.
+
 2010-10-01  Helmut Eller  <heller at common-lisp.net>
 
 	Don't use indent-sexp for macroexpanded code.
--- /project/slime/cvsroot/slime/slime.el	2010/10/01 09:30:43	1.1342
+++ /project/slime/cvsroot/slime/slime.el	2010/10/02 11:16:54	1.1343
@@ -550,7 +550,7 @@
     ;;("\C-x\M-e" slime-eval-last-expression-display-output :inferior t)
     ("\C-c\C-p"   slime-pprint-eval-last-expression)
     ;; Macroexpand
-    ("\C-c\C-m"   slime-macro/compiler-macro-expand-1)
+    ("\C-c\C-m"   slime-expand-1)
     ("\C-c\M-m"   slime-macroexpand-all)
     ;; Misc
     ("\C-c\C-u"   slime-undefine-function)
@@ -4892,8 +4892,8 @@
   (remap 'slime-macroexpand-1 'slime-macroexpand-1-inplace)
   (remap 'slime-macroexpand-all 'slime-macroexpand-all-inplace)
   (remap 'slime-compiler-macroexpand-1 'slime-compiler-macroexpand-1-inplace)
-  (remap 'slime-macro/compiler-macro-expand-1 
-         'slime-macro/compiler-macro-expand-1-inplace)
+  (remap 'slime-expand-1 
+         'slime-expand-1-inplace)
   (remap 'advertised-undo 'slime-macroexpand-undo)
   (remap 'undo 'slime-macroexpand-undo))
 
@@ -5029,25 +5029,25 @@
        'swank:swank-compiler-macroexpand
        'swank:swank-compiler-macroexpand-1)))
 
-(defun slime-macro/compiler-macro-expand-1 (&optional repeatedly)
+(defun slime-expand-1 (&optional repeatedly)
   "Display the macro expansion of the form at point.
 The form is expanded with CL:MACROEXPAND-1 or, if a prefix
 argument is given, with CL:MACROEXPAND."
   (interactive "P")
   (slime-eval-macroexpand
    (if repeatedly
-       'swank:swank-macro/compiler-macro-expand
-       'swank:swank-macro/compiler-macro-expand-1)))
+       'swank:swank-expand
+       'swank:swank-expand-1)))
 
-(defun slime-macro/compiler-macro-expand-1-inplace (&optional repeatedly)
+(defun slime-expand-1-inplace (&optional repeatedly)
   "Display the macro expansion of the form at point.
 The form is expanded with CL:MACROEXPAND-1 or, if a prefix
 argument is given, with CL:MACROEXPAND."
   (interactive "P")
   (slime-eval-macroexpand-inplace
    (if repeatedly
-       'swank:swank-macro/compiler-macro-expand
-       'swank:swank-macro/compiler-macro-expand-1)))
+       'swank:swank-expand
+       'swank:swank-expand-1)))
 
 (defun slime-format-string-expand ()
   "Expand the format-string at point and display it."
--- /project/slime/cvsroot/slime/swank.lisp	2010/09/22 19:17:35	1.729
+++ /project/slime/cvsroot/slime/swank.lisp	2010/10/02 11:16:54	1.730
@@ -2975,20 +2975,20 @@
 (defslimefun swank-compiler-macroexpand (string)
   (apply-macro-expander #'compiler-macroexpand string))
 
-(defslimefun swank-macro/compiler-macro-expand-1 (string)
-  (apply-macro-expander #'macro/compiler-macro-expand-1 string))
+(defslimefun swank-expand-1 (string)
+  (apply-macro-expander #'expand-1 string))
 
-(defslimefun swank-macro/compiler-macro-expand (string)
-  (apply-macro-expander #'macro/compiler-macro-expand string))
+(defslimefun swank-expand (string)
+  (apply-macro-expander #'expand string))
 
-(defun macro/compiler-macro-expand-1 (form)
+(defun expand-1 (form)
   (multiple-value-bind (expansion expanded?) (macroexpand-1 form)
     (if expanded?
         (values expansion t)
         (compiler-macroexpand-1 form))))
 
-(defun macro/compiler-macro-expand (form)
-  (expand-repeatedly #'macro/compiler-macro-expand-1 form))
+(defun expand (form)
+  (expand-repeatedly #'expand-1 form))
 
 (defun expand-repeatedly (expander form)
   (loop