[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime-autodoc.el slime-repl.el 
Log Message:
* slime-repl.el (slime-repl-inside-string-or-comment-p): New
function, when in the REPL prompt, narrow the search to the
prompt, otherwise stray " from the previous prompts
or outputs may confuse slime-inside-string-or-comment-p.

* slime-autodoc.el (slime-autodoc): Use
slime-repl-inside-string-or-comment-p when fbound.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/04/05 15:15:21	1.367
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/04/05 23:45:23	1.368
@@ -1,5 +1,15 @@
 2010-04-05  Stas Boukarev  <stassats at gmail.com>
 
+	* slime-repl.el (slime-repl-inside-string-or-comment-p): New
+	function, when in the REPL prompt, narrow the search to the
+	prompt, otherwise stray " from the previous prompts
+	or outputs may confuse slime-inside-string-or-comment-p.
+
+	* slime-autodoc.el (slime-autodoc): Use
+	slime-repl-inside-string-or-comment-p when fbound.
+
+2010-04-05  Stas Boukarev  <stassats at gmail.com>
+
 	* slime-autodoc.el (slime-autodoc-manually): Rename from
 	slime-autodoc-full.
 	Like slime-autodoc, but when called twice,
--- /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2010/04/05 15:15:22	1.42
+++ /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2010/04/05 23:45:23	1.43
@@ -145,7 +145,9 @@
     ;; background, so it'd be rather disastrous if it touched match
     ;; data.
     (save-match-data
-      (unless (slime-inside-string-or-comment-p)
+      (unless (if (fboundp 'slime-repl-inside-string-or-comment-p)
+                  (slime-repl-inside-string-or-comment-p)
+                  (slime-inside-string-or-comment-p))
         (multiple-value-bind (cache-key retrieve-form)
             (slime-make-autodoc-rpc-form)
           (let* (cached
--- /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/03/09 14:10:37	1.39
+++ /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/04/05 23:45:23	1.40
@@ -1540,6 +1540,14 @@
   (let ((slime-dispatching-connection (slime-connection-at-point)))
     (switch-to-buffer (slime-output-buffer))))
 
+(defun slime-repl-inside-string-or-comment-p ()
+  (save-restriction
+    (when (and (boundp 'slime-repl-input-start-mark)
+               slime-repl-input-start-mark
+               (>= (point) slime-repl-input-start-mark))
+      (narrow-to-region slime-repl-input-start-mark (point)))
+    (slime-inside-string-or-comment-p)))
+
 (defvar slime-repl-easy-menu
   (let ((C '(slime-connected-p)))
     `("REPL"