[mcclim-cvs] CVS mcclim/Drei

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim/Drei
In directory clnet:/tmp/cvs-serv4077/Drei

Modified Files:
	lisp-syntax.lisp 
Log Message:
Fixed some problems with retrieving forms in Lisp syntax.


--- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp	2007/12/19 17:17:37	1.37
+++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp	2007/12/20 10:33:36	1.38
@@ -2103,11 +2103,14 @@
 
 (defun up-list (mark syntax fn)
   (let ((form (form-around syntax (offset mark))))
-    (when form
-      (let ((new-offset (find-list-parent-offset form fn)))
-        (when new-offset
-          (setf (offset mark) new-offset)
-          t)))))
+    (when (if (and (form-list-p form)
+                   (/= (start-offset form) (offset mark))
+                   (/= (end-offset form) (offset mark)))
+              (setf (offset mark) (funcall fn form))
+              (let ((new-offset (find-list-parent-offset form fn)))
+                (when new-offset
+                  (setf (offset mark) new-offset))))
+      t)))
 
 (defmethod backward-one-up (mark (syntax lisp-syntax))
   (up-list mark syntax #'start-offset))