[climacs-cvs] CVS climacs

[thenriksen]

Update of /project/climacs/cvsroot/climacs
In directory clnet:/tmp/cvs-serv20620

Modified Files:
	lisp-syntax.lisp 
Log Message:
Guess what - fixed `indices-match-arglist' again. :-)


--- /project/climacs/cvsroot/climacs/lisp-syntax.lisp	2006/07/29 21:39:50	1.103
+++ /project/climacs/cvsroot/climacs/lisp-syntax.lisp	2006/07/30 15:04:59	1.104
@@ -1,7 +1,7 @@
 ;;; -*- Mode: Lisp; Package: CLIMACS-LISP-SYNTAX -*-
 
 ;;;  (c) copyright 2005 by
-;;;           Robert Strandh (strandh at labri.fr)
+;;;           Robert Strandh (7strandh at labri.fr)
 ;;;
 ;;; This library is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Library General Public
@@ -3631,11 +3631,13 @@
          (pure-arglist (remove-if #'arglist-keyword-p arglist))
          (arg (when (< index (length pure-arglist))
                 (elt pure-arglist index))))
-    (cond ((and (>= index (or (position #'arglist-keyword-p arglist) 0))
-                (not (null (rest arg-indices)))
-                (> (length pure-arglist)
-                   index)
-                (not (listp (elt pure-arglist index))))
+    (cond ((or (and (>= index (or (position-if #'arglist-keyword-p arglist)
+                                  (1+ index)))
+                    (not (null (rest arg-indices))))
+               (and (not (null (rest arg-indices)))
+                    (> (length pure-arglist)
+                       index)
+                    (not (listp (elt pure-arglist index)))))
            nil)
           ((and (not (null arg))
                 (listp arg)