[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime-presentations.el 
Log Message:
contrib/slime-presentations.el(slime-reify-old-output): Quote
the CL expession behind presentations, so _(1 2 3)_ (representing a
presentation) is not tried to be evaluated.
(slime-copy-presentation-to-repl): Use `looking-back' for looking back.
Apply De Morgan's law to conditions.
Patch by Tobias C. Rittweiler.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/12/11 03:05:24	1.298
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/12/11 05:52:20	1.299
@@ -1,5 +1,14 @@
 2009-12-11  Stas Boukarev  <stassats at gmail.com>
 
+	* slime-presentations.el (slime-reify-old-output): Quote
+	the CL expession behind presentations, so _(1 2 3)_ (representing a
+	presentation) is not tried to be evaluated.
+	(slime-copy-presentation-to-repl): Use `looking-back' for looking back.
+	Apply De Morgan's law to conditions.
+	Patch by Tobias C. Rittweiler.
+
+2009-12-11  Stas Boukarev  <stassats at gmail.com>
+
 	* swank-asdf.lisp (find-operation): New function for
 	finding asdf operations independent of readtable
 	case sensitivity (read Allegro Modern Mode).
--- /project/slime/cvsroot/slime/contrib/slime-presentations.el	2009/11/30 14:47:28	1.25
+++ /project/slime/cvsroot/slime/contrib/slime-presentations.el	2009/12/11 05:52:20	1.26
@@ -415,12 +415,11 @@
     (unless (eql major-mode 'slime-repl-mode)
       (slime-switch-to-output-buffer))
     (flet ((do-insertion ()
-			 (when (not (string-match "\\s-"
-						  (buffer-substring (1- (point)) (point))))
-			   (insert " "))
-			 (insert presentation-text)
-			 (when (and (not (eolp)) (not (looking-at "\\s-")))
-			   (insert " "))))
+	     (unless (looking-back "\\s-")
+	       (insert " "))
+	     (insert presentation-text)
+	     (unless (or (eolp) (looking-at "\\s-"))
+	       (insert " "))))
       (if (>= (point) slime-repl-prompt-start-mark)
 	  (do-insertion)
 	(save-excursion
@@ -656,7 +655,7 @@
               (concat (substring str-no-props 0 pos)
                       ;; Eval in the reader so that we play nice with quote.
                       ;; -luke (19/May/2005)
-                      "#." (slime-presentation-expression presentation)
+                      "'#." (slime-presentation-expression presentation)
                       (slime-reify-old-output (substring str-props end-pos)
                                               (substring str-no-props end-pos))))))))