[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
Ignore linebreaks for the macroexpand test.
SBCL should now also pass it.

* slime.el (slime-test-macroexpansion=): New function.
([test] macroexpand): Use it.

--- /project/slime/cvsroot/slime/ChangeLog	2012/05/06 21:19:48	1.2335
+++ /project/slime/cvsroot/slime/ChangeLog	2012/05/07 06:10:50	1.2336
@@ -1,3 +1,11 @@
+2012-05-07  Helmut Eller  <heller at common-lisp.net>
+
+	Ignore linebreaks for the macroexpand test.
+	SBCL should now also pass it.
+
+	* slime.el (slime-test-macroexpansion=): New function.
+	([test] macroexpand): Use it.
+
 2012-05-06  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-sbcl.lisp (condition-timed-wait): Undo previous change.
--- /project/slime/cvsroot/slime/slime.el	2012/05/06 08:39:11	1.1405
+++ /project/slime/cvsroot/slime/slime.el	2012/05/07 06:10:50	1.1406
@@ -8293,7 +8293,7 @@
   (undo-boundary)
   (call-interactively name))
 
-(def-slime-test macroexpand 
+(def-slime-test macroexpand
     (macro-defs bufcontent expansion1 search-str expansion2)
     "foo"
     '((("(defmacro qwertz (&body body) `(list :qwertz ',body))"
@@ -8306,34 +8306,42 @@
   (setq slime-buffer-package ":swank")
   (with-temp-buffer
     (lisp-mode)
-    (dolist (def macro-defs) 
+    (dolist (def macro-defs)
       (slime-compile-string def 0)
       (slime-sync-to-top-level 5))
     (insert bufcontent)
     (goto-char (point-min))
     (slime-execute-as-command 'slime-macroexpand-1)
-    (slime-wait-condition "Macroexpansion buffer visible" 
-                          (lambda () 
-                            (slime-buffer-visible-p 
+    (slime-wait-condition "Macroexpansion buffer visible"
+                          (lambda ()
+                            (slime-buffer-visible-p
                              (slime-buffer-name :macroexpansion)))
                           5)
     (with-current-buffer (get-buffer (slime-buffer-name :macroexpansion))
       (slime-test-expect "Initial macroexpansion is correct"
-                         expansion1 
-                         (downcase (buffer-string)))
+                         expansion1
+                         (downcase (buffer-string))
+                         #'slime-test-macroexpansion=)
       (search-forward search-str)
       (backward-up-list)
       (slime-execute-as-command 'slime-macroexpand-1-inplace)
       (slime-sync-to-top-level 3)
       (slime-test-expect "In-place macroexpansion is correct"
-                         expansion2 
-                         (downcase (buffer-string)))
+                         expansion2
+                         (downcase (buffer-string))
+                         #'slime-test-macroexpansion=)
       (slime-execute-as-command 'slime-macroexpand-undo)
       (slime-test-expect "Expansion after undo is correct"
                          expansion1
-                         (downcase (buffer-string)))))
+                         (downcase (buffer-string))
+                         #'slime-test-macroexpansion=)))
     (setq slime-buffer-package ":cl-user"))
 
+(defun slime-test-macroexpansion= (string1 string2)
+  (let ((string1 (replace-regexp-in-string " *\n *" " " string1))
+        (string2 (replace-regexp-in-string " *\n *" " " string2)))
+    (equal string1 string2)))
+
 (def-slime-test indentation (buffer-content point-markers)
         "Check indentation update to work correctly."
     '(("