[q-lang-cvs] qcalc qcalc.q,1.214,1.215

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

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

Modified Files:
	qcalc.q 
Log Message:
bugfixes

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -d -r1.214 -r1.215
*** qcalc.q	4 Dec 2007 09:24:13 -0000	1.214
--- qcalc.q	4 Dec 2007 13:01:45 -0000	1.215
***************
*** 3290,3295 ****
  		    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.
--- 3290,3295 ----
  		    where [L0:List|UL] = get UNDO_LIST;
  		= //printf "*** merge undo: %s ++ %s\n" (str (I,J,L0),str L) ||
! 		  UNDO_LIST := [(DI,DJ,merge_lists L0 L)|UL]
! 		    where [(DI,DJ,L0:List)|UL] = get UNDO_LIST;
  
  // XXXFIXME: We should remove duplicates here.
***************
*** 3358,3367 ****
  		  UNDO_LIST := UL || REDO_LIST := [(I,J;N,M)|get REDO_LIST] ||
  		  EDITED := (#UL<>get LAST_SAVE) || update_title ||
! 		  if is_qt_object X then post CBQ '(check_last_gui (I1,J1,X))
  		    where [(I,J;N,M)|UL] = get UNDO_LIST,
  		      SP = foldl insert (get SPANS) $
  		      filter istuple $ reverse UL,
  		      (N1,M1) = undo_span SP (I,J),
! 		      (I1,J1) = real_index (I,J), X = gui_elem (I1,J1);
  
  redo		= //printf "*** redo: %s\n" (str W) ||
--- 3358,3367 ----
  		  UNDO_LIST := UL || REDO_LIST := [(I,J;N,M)|get REDO_LIST] ||
  		  EDITED := (#UL<>get LAST_SAVE) || update_title ||
! 		  if B then (doprocess (I1,J1) || digest_loop)
  		    where [(I,J;N,M)|UL] = get UNDO_LIST,
  		      SP = foldl insert (get SPANS) $
  		      filter istuple $ reverse UL,
  		      (N1,M1) = undo_span SP (I,J),
! 		      (I1,J1) = real_index (I,J), B = is_gui_elem (I1,J1);
  
  redo		= //printf "*** redo: %s\n" (str W) ||
***************
*** 3401,3407 ****
  		  UNDO_LIST := [(I,J;N,M)|UL] || REDO_LIST := RL ||
  		  EDITED := (#UL+1<>get LAST_SAVE) || update_title ||
! 		  if is_qt_object X then post CBQ '(check_last_gui (I1,J1,X))
  		    where [(I,J;N,M)|RL] = get REDO_LIST, UL = get UNDO_LIST,
! 		      (I1,J1) = real_index (I,J), X = gui_elem (I1,J1);
  
  /* Syntax highlighting. ****************************************************/
--- 3401,3407 ----
  		  UNDO_LIST := [(I,J;N,M)|UL] || REDO_LIST := RL ||
  		  EDITED := (#UL+1<>get LAST_SAVE) || update_title ||
! 		  if B then (doprocess (I1,J1) || digest_loop)
  		    where [(I,J;N,M)|RL] = get REDO_LIST, UL = get UNDO_LIST,
! 		      (I1,J1) = real_index (I,J), B = is_gui_elem (I1,J1);
  
  /* Syntax highlighting. ****************************************************/