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

Modified Files: java-syntax.lisp Log Message: Removed definition of `line-indentation' that clobbered the Drei base function of the same name.

--- /project/climacs/cvsroot/climacs/java-syntax.lisp 2007/05/01 17:46:38 1.1 +++ /project/climacs/cvsroot/climacs/java-syntax.lisp 2007/05/06 07:48:31 1.2 @@ -1288,27 +1288,13 @@

;;;# Indentation

-(defun line-indentation (mark tab-width syntax) - "Return the column of the first non-whitespace object, or nil." - (setf mark (clone-mark mark)) - (beginning-of-line mark) - (loop until (end-of-line-p mark) - while (whitespacep syntax (object-after mark)) - with column = 0 - if (eql (object-after mark) #\Tab) - do (incf column (- tab-width (mod column tab-width))) - else - do (incf column) - do (forward-object mark) - finally (return (if (end-of-line-p mark) nil column)))) - (defmethod syntax-line-indentation (mark tab-width (syntax java-syntax)) (setf mark (clone-mark mark)) - (let ((this-indentation (line-indentation mark tab-width syntax))) + (let ((this-indentation (line-indentation mark tab-width))) (beginning-of-line mark) (loop until (beginning-of-buffer-p mark) do (previous-line mark 0) - when (line-indentation mark tab-width syntax) + when (line-indentation mark tab-width) return it finally (return this-indentation))))