TempleOSCDV4.10.ISO

Adam/DolDoc/DocPlain.CPP

@@ -10,10 +10,10 @@ I64 PrsDocFlagSingle(CCmpCtrl *cc,I64 *_de_flags,U32 *_type,Bool turn_on)
     if (res<64) {
       BEqu(_de_flags,res,turn_on);
       switch (res) {
-	case DOCEf_SEL:
-	case DOCEf_UNDERLINE:
-	case DOCEf_INVERT:
 	case DOCEf_BLINK:
+	case DOCEf_INVERT:
+	case DOCEf_UNDERLINE:
+	case DOCEf_SEL:
 	  BEqu(_type,res,turn_on);
 	  break;
       }
@@ -105,9 +105,9 @@ U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e)
       case DOCT_INDENT:
       case DOCT_WORD_WRAP:
       case DOCT_HIGHLIGHT:
-      case DOCT_UNDERLINE:
-      case DOCT_INVERT:
       case DOCT_BLINK:
+      case DOCT_INVERT:
+      case DOCT_UNDERLINE:
       case DOCT_SHIFTED_X:
       case DOCT_SHIFTED_Y:
 	if (attr!=DOC_DFT) {
@@ -273,9 +273,9 @@ CDocEntry *PrsDollarCmd(CDoc *doc,U8 *st)
 	case DOCT_DFT_BACKGROUND:
 	case DOCT_WORD_WRAP:
 	case DOCT_HIGHLIGHT:
-	case DOCT_UNDERLINE:
-	case DOCT_INVERT:
 	case DOCT_BLINK:
+	case DOCT_INVERT:
+	case DOCT_UNDERLINE:
 	case DOCT_SHIFTED_X:
 	case DOCT_SHIFTED_Y:
 	  while (cc->token==',')
@@ -575,7 +575,7 @@ U0 DocEntryToggle(CDoc *doc)
       st=Doc2PlainText(doc,doc_ce);
       LBEqu(&doc->flags,DOCf_COLOR_NAMES,old_color_names);
       DocEntryDel(doc,doc_ce);
-      DocPrint(doc,"$$$$%Q$$$$",st);
+      DocPrint(doc,"$$$$%$$Q$$$$",st);
     }
     DocRecalc(doc);
   }
@@ -593,13 +593,13 @@ U0 DocFlagsToggle(CDoc *doc,I64 tog_flags)
   doc->flags=doc->flags&~DOCF_NO_CURSOR|DOCF_COLOR_NAMES;
   st=DocSave(doc,&size);
 
-  u_next=doc->undo_root.next;
-  u_last=doc->undo_root.last;
-  doc->undo_root.next=doc->undo_root.last=&doc->undo_root;
+  u_next=doc->undo_head.next;
+  u_last=doc->undo_head.last;
+  doc->undo_head.next=doc->undo_head.last=&doc->undo_head;
 
   DocRst(doc,TRUE);
-  doc->undo_root.next=u_next;
-  doc->undo_root.last=u_last;
+  doc->undo_head.next=u_next;
+  doc->undo_head.last=u_last;
   DocUndoCntSet(doc);
   doc->flags=flags&~(DOCF_NO_CURSOR|DOCG_BL_IV_UL|DOCF_WORD_WRAP);
   DocLoad(doc,st,size);