[Aptitude-svn-commit] r3385 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 19:10:13 2005
New Revision: 3385

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
   branches/aptitude-0.3/aptitude/src/vscreen/fragment.h
Log:
Oops, include a ChangeLog update.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 19:10:13 2005
@@ -1,5 +1,9 @@
 2005-06-07  Daniel Burrows  <dburrows@debian.org>
 
+	* src/ui.cc:
+
+	Remove several uses of %C or replace them with %S.
+
 	* src/load_config.h, src/ui.cc:
 
 	Call load_styles from ui.cc, not load_colors.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/fragment.cc	Tue Jun  7 19:10:13 2005
@@ -908,6 +908,7 @@
 	case 'D':
 	case 'd':
 	case 'n':
+	case 'N':
 	case '%':
 	  start=nextpercent+2;
 	  break;
@@ -972,6 +973,7 @@
 	case 'D':
 	case 'd':
 	case 'n':
+	case 'N':
 	case '%':
 	  start=nextpercent+2;
 	  break;
@@ -1089,6 +1091,14 @@
 
 	  rval.push_back(newline_fragment());
 	  break;
+	case 'N':
+	  if(!curstr.empty())
+	    {
+	      rval.push_back(text_fragment(curstr, st));
+	      curstr="";
+	    }
+	  st=style();
+	  break;
 	case 'F':
 	  // should have been verified above.
 	  assert(arguments[argcount].format=='F');

Modified: branches/aptitude-0.3/aptitude/src/vscreen/fragment.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/fragment.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/fragment.h	Tue Jun  7 19:10:13 2005
@@ -244,6 +244,7 @@
  *  - %D/%d: toggle the dim character attribute
  *  - %S: Apply the style corresponding to a
  *        string (looked up via get_style) to the attributes.
+ *  - %N: Reset the text style to the empty ("null") style.
  *
  *  For instance,
  *