[slime-cvs] CVS slime

[CVS User mevenson]

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

Modified Files:
	ChangeLog swank-abcl.lisp 
Log Message:
swank-abcl.lisp (arglist):  Fixes for functions with non-nil
arglist and for generic functions with empty argument lists.

Contributed by Matthias.



--- /project/slime/cvsroot/slime/ChangeLog	2009/11/23 19:54:55	1.1920
+++ /project/slime/cvsroot/slime/ChangeLog	2009/11/26 07:06:50	1.1921
@@ -1,3 +1,10 @@
+2009-11-26  Mark Evenson  <evenson at panix.com>>
+
+	* swank-abcl.lisp (arglist):  Fixes for functions with non-nil
+	arglist and for generic functions with empty argument lists.
+
+	Contributed by Matthias.
+
 2009-11-23  Stas Boukarev  <stassats at gmail.com>
 
 	* slime.el (slime-set-connection-info): Set slime-current-thread to t
--- /project/slime/cvsroot/slime/swank-abcl.lisp	2009/11/02 09:20:33	1.76
+++ /project/slime/cvsroot/slime/swank-abcl.lisp	2009/11/26 07:06:50	1.77
@@ -229,13 +229,16 @@
 
 (defimplementation arglist (fun)
   (cond ((symbolp fun)
-         (multiple-value-bind (arglist present) 
-             (or (sys::arglist fun)
-                 (and (fboundp fun)
-                      (typep (symbol-function fun) 'standard-generic-function)
-                      (let ((it (mop::generic-function-lambda-list (symbol-function fun))))
-                        (values it it))))
-           (if present arglist :not-available)))
+          (multiple-value-bind (arglist present) 
+              (sys::arglist fun)
+            (when (and (not present)
+                       (fboundp fun)
+                       (typep (symbol-function fun) 'standard-generic-function))
+              (setq arglist
+                    (mop::generic-function-lambda-list (symbol-function fun))
+                    present
+                    t))
+            (if present arglist :not-available)))
         (t :not-available)))
 
 (defimplementation function-name (function)