[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime-autodoc.el 
Log Message:
* slime-autodoc.el (slime-autodoc-manually): Rename from
slime-autodoc-full.
Like slime-autodoc, but when called twice,
or after slime-autodoc was already automatically called,
display multiline arglist.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/04/05 14:48:55	1.366
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/04/05 15:15:21	1.367
@@ -1,5 +1,13 @@
 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,
+	or after slime-autodoc was already automatically called,
+	display multiline arglist.
+
+2010-04-05  Stas Boukarev  <stassats at gmail.com>
+
 	* slime-autodoc.el (slime-autodoc-full): New command,
 	displays multiline arglists. Bound to C-c C-d a.
 	(slime-make-autodoc-rpc-form): Don't send
--- /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2010/04/05 14:48:55	1.41
+++ /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2010/04/05 15:15:22	1.42
@@ -149,9 +149,9 @@
         (multiple-value-bind (cache-key retrieve-form)
             (slime-make-autodoc-rpc-form)
           (let* (cached
-                 (multiline-cached (slime-autodoc-cache-multine (car cache-key)
-                                                                cache-multiline))
-                 (multilinep (or multilinep multiline-cached)))
+                 (multilinep (or (slime-autodoc-multiline-cached (car cache-key))
+                                 multilinep)))
+            (slime-autodoc-cache-multiline (car cache-key) cache-multiline)
             (cond
               ((not cache-key) nil)
               ((setq cached (slime-get-cached-autodoc cache-key))
@@ -174,20 +174,26 @@
 
 (defvar slime-autodoc-cache-car nil)
 
-(defun slime-autodoc-cache-multine (cache-key cache-new-p)
+(defun slime-autodoc-multiline-cached (cache-key)
+  (equal cache-key
+         slime-autodoc-cache-car))
+
+(defun slime-autodoc-cache-multiline (cache-key cache-new-p)
   (cond (cache-new-p
          (setq slime-autodoc-cache-car
                cache-key))
         ((not (equal cache-key
                      slime-autodoc-cache-car))
-         (setq slime-autodoc-cache-car nil)))
-  (equal cache-key
-         slime-autodoc-cache-car))
+         (setq slime-autodoc-cache-car nil))))
 
-(defun slime-autodoc-full ()
-  "Like slime-autodoc, but with slime-autodoc-use-multiline-p enabled"
+(defun slime-autodoc-manually ()
+  "Like slime-autodoc, but when called twice,
+or after slime-autodoc was already automatically called, 
+display multiline arglist"
   (interactive)
-  (eldoc-message (slime-autodoc t t)))
+  (eldoc-message (slime-autodoc (or slime-autodoc-use-multiline-p
+                                    slime-autodoc-mode)
+                                t)))
 
 (make-variable-buffer-local (defvar slime-autodoc-mode nil))
 
@@ -215,7 +221,7 @@
                ;; Display arglist only when inferior Lisp will be able
                ;; to cope with the request.
                (slime-background-activities-enabled-p)))
-    (slime-bind-keys slime-doc-map t '((?a slime-autodoc-full))))
+    (slime-bind-keys slime-doc-map t '((?a slime-autodoc-manually))))
   ad-return-value)