[q-lang-cvs] qcalc qcalc.q,1.146,1.147

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

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

Modified Files:
	qcalc.q 
Log Message:
bugfixes

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** qcalc.q	15 Nov 2007 10:15:48 -0000	1.146
--- qcalc.q	15 Nov 2007 10:22:52 -0000	1.147
***************
*** 1385,1389 ****
  
  merge_cells _ _ _ if is_global:
! 		= save_undo (I,J;N,M)
  		    where (I,J) = real_index (I,J), (N,M) = cell_span (I,J)
  		    where IT:QtObject = set_current_cell (I,J) ||
--- 1385,1389 ----
  
  merge_cells _ _ _ if is_global:
! 		= EDITED := true || update_title || save_undo (I,J;N,M)
  		    where (I,J) = real_index (I,J), (N,M) = cell_span (I,J)
  		    where IT:QtObject = set_current_cell (I,J) ||
***************
*** 1402,1406 ****
  dissociate_cell (I,J)
  		= set_current_cell (I,J) || qt IT "setSpan" (1,1) ||
! 		  save_undo (I,J;1,1)
  		    where IT = get_table_item (I,J);
  
--- 1402,1406 ----
  dissociate_cell (I,J)
  		= set_current_cell (I,J) || qt IT "setSpan" (1,1) ||
! 		  EDITED := true || update_title || save_undo (I,J;1,1)
  		    where IT = get_table_item (I,J);