[q-lang-cvs] qcalc qcalc.q,1.211,1.212

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21634

Modified Files:
	qcalc.q 
Log Message:
bugfix: merge_undo

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.211
retrieving revision 1.212
diff -C2 -d -r1.211 -r1.212
*** qcalc.q	2 Dec 2007 01:55:08 -0000	1.211
--- qcalc.q	2 Dec 2007 20:33:47 -0000	1.212
***************
*** 3247,3262 ****
  
  merge_undo L:List
  		= //printf "*** merge undo: %s ++ %s\n" (str L0,str L) ||
  		  UNDO_LIST := [merge_lists L0 L|UL]
! 		    where [L0|UL] = get UNDO_LIST
! 		    if not null L
! 		    where L = filter (neg is_gui_elem.fst) $ undo_cellvals L;
! 
! merge_undo L:List
! 		= //printf "*** merge undo: %s ++ %s\n" (str (DI,DJ,L0),str L) ||
  		  UNDO_LIST := [(I,J,merge_lists L0 L)|UL]
! 		    where [(I,J,L0:List)|UL] = get UNDO_LIST
! 		    if not null L
! 		    where L = filter (neg is_gui_elem.fst) $ undo_cellvals L;
  
  // XXXFIXME: We should remove duplicates here.
--- 3247,3258 ----
  
  merge_undo L:List
+ if not null L
+ where L = filter (neg is_gui_elem.fst) $ undo_cellvals L:
  		= //printf "*** merge undo: %s ++ %s\n" (str L0,str L) ||
  		  UNDO_LIST := [merge_lists L0 L|UL]
! 		    where [L0:List|UL] = get UNDO_LIST;
! 		= //printf "*** merge undo: %s ++ %s\n" (str (I,J,L0),str L) ||
  		  UNDO_LIST := [(I,J,merge_lists L0 L)|UL]
! 		    where [(I,J,L0:List)|UL] = get UNDO_LIST;
  
  // XXXFIXME: We should remove duplicates here.