View difference between Paste ID: svCrq6h2 and qGde60U1

 # HG changeset patch
 # User Jérôme LAFORGE <[email protected]>
-# Date 1319538202 -7200
+# Date 1319607326 -7200
-# Node ID dc56e8c124f437c7dd460bbdac413c559cb80f29
+# Node ID 230b7804ddb44f11c84229ce1a8a7a6c9605b0a9
 # Parent  ba1d7ac2e4015d5152859d81b88f145c9681e9be
 Draft for ChangeLine.
 
-diff -r ba1d7ac2e401 -r dc56e8c124f4 include/Scintilla.h
+diff -r ba1d7ac2e401 -r 230b7804ddb4 include/Scintilla.h
 --- a/include/Scintilla.h	mer. oct. 19 14:30:44 2011 +1100
-+++ b/include/Scintilla.h	mar. oct. 25 12:23:22 2011 +0200
++++ b/include/Scintilla.h	mer. oct. 26 07:35:26 2011 +0200
 @@ -831,6 +831,7 @@
  #define SC_TECHNOLOGY_DIRECTWRITE 1
  #define SCI_SETTECHNOLOGY 2630
  #define SCI_GETTECHNOLOGY 2631
 +#define SCI_CLEARCHANGELINE 2632
  #define SCI_STARTRECORD 3001
  #define SCI_STOPRECORD 3002
  #define SCI_SETLEXER 4001
-diff -r ba1d7ac2e401 -r dc56e8c124f4 include/Scintilla.iface
+diff -r ba1d7ac2e401 -r 230b7804ddb4 include/Scintilla.iface
 --- a/include/Scintilla.iface	mer. oct. 19 14:30:44 2011 +1100
-+++ b/include/Scintilla.iface	mar. oct. 25 12:23:22 2011 +0200
++++ b/include/Scintilla.iface	mer. oct. 26 07:35:26 2011 +0200
 @@ -2202,6 +2202,8 @@
  # Get the tech.
  get int GetTechnology=2631(,)
 
 +fun void ClearChangeLine=2632(,)
 +
  # Start notifying the container of all key presses and commands.
  fun void StartRecord=3001(,)
 
-diff -r ba1d7ac2e401 -r dc56e8c124f4 src/Document.cxx
+diff -r ba1d7ac2e401 -r 230b7804ddb4 src/CellBuffer.cxx
 --- a/src/CellBuffer.cxx	mer. oct. 19 14:30:44 2011 +1100
-+++ b/src/Document.cxx	mar. oct. 25 12:23:22 2011 +0200
++++ b/src/CellBuffer.cxx	mer. oct. 26 07:35:26 2011 +0200
 @@ -9,6 +9,7 @@
  #include <string.h>
  #include <stdlib.h>
  #include <stdarg.h>
 +#include <deque>
 
  #include "Platform.h"
 
-@@ -179,6 +180,7 @@
+@@ -74,24 +75,40 @@
- void Document::SetSavePoint() {
+ 	data = 0;
- 	cb.SetSavePoint();
+ 	lenData = 0;
- 	NotifySavePoint(true);
+ 	mayCoalesce = false;
-+	static_cast<LineChange *>(perLineData[ldChange])->PerformSave();
++	lineChangeRemoved = NULL;
  }
 
- int Document::GetMark(int line) {
+ Action::~Action() {
-@@ -432,6 +434,26 @@
+ 	Destroy();
  }
 
 -void Action::Create(actionType at_, int position_, char *data_, int lenData_, bool mayCoalesce_) {
 +void Action::Create(actionType at_, int position_, char *data_, int lenData_, bool mayCoalesce_, std::deque<unsigned char> *lineChangeRemoved_) {
  	delete []data;
  	position = position_;
  	at = at_;
  	data = data_;
  	lenData = lenData_;
  	mayCoalesce = mayCoalesce_;
 +
 +	if (lineChangeRemoved_ != NULL) {
 +		if (lineChangeRemoved == NULL)
 +			lineChangeRemoved = new std::deque<unsigned char>();
 +		*lineChangeRemoved = *lineChangeRemoved_;
 +	} else {
 +		if (lineChangeRemoved != NULL) {
 +			delete lineChangeRemoved;
 +			lineChangeRemoved = NULL;
 +		}
 +	}
  }
 
  void Action::Destroy() {
  	delete []data;
  	data = 0;
-@@ -772,6 +794,8 @@
++	if (lineChangeRemoved != NULL) {
 +		delete lineChangeRemoved;
 +		lineChangeRemoved = NULL;
- 			const char *text = cb.DeleteChars(pos, len, startSequence);
+
  }
 
  void Action::Grab(Action *source) {
 @@ -102,6 +119,16 @@
  	data = source->data;
-@@ -811,6 +835,12 @@
+ 	lenData = source->lenData;
  	mayCoalesce = source->mayCoalesce;
 +	if (source->lineChangeRemoved != NULL) {
 +		if (lineChangeRemoved == NULL)
 +			lineChangeRemoved = new std::deque<unsigned char>();
 +		*lineChangeRemoved = *source->lineChangeRemoved;
 +	} else {
 +		if (lineChangeRemoved != NULL) {
 +			delete lineChangeRemoved;
 +			lineChangeRemoved = NULL;
 +		}
 +	}
 
-@@ -873,6 +903,7 @@
+ 	// Ownership of source data transferred to this
  	source->position = 0;
 @@ -109,6 +136,10 @@
  	source->data = 0;
-+					static_cast<LineChange *>(perLineData[ldChange])->PerformUndo(LineFromPosition(action.position));
+ 	source->lenData = 0;
  	source->mayCoalesce = true;
 +	if (source->lineChangeRemoved != NULL) {
 +		delete source->lineChangeRemoved;
-@@ -896,6 +927,11 @@
++		source->lineChangeRemoved = NULL;
 +	}
  }
 
  // The undo history stores a sequence of user operations that represent the user's view of the
 @@ -162,7 +193,7 @@
  }
 
  void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData,
 -	bool &startSequence, bool mayCoalesce) {
 +	bool &startSequence, bool mayCoalesce, std::deque<unsigned char> *lineChangeRemoved) {
  	EnsureUndoRoom();
-diff -r ba1d7ac2e401 -r dc56e8c124f4 src/Document.h
+ 	//Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction);
  	//Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at,
-+++ b/src/Document.h	mar. oct. 25 12:23:22 2011 +0200
+@@ -225,7 +256,7 @@
  		currentAction++;
  	}
  	startSequence = oldCurrentAction != currentAction;
 -	actions[currentAction].Create(at, position, data, lengthData, mayCoalesce);
 +	actions[currentAction].Create(at, position, data, lengthData, mayCoalesce, lineChangeRemoved);
  	currentAction++;
  	actions[currentAction].Create(startAction);
  	maxAction = currentAction;
 @@ -422,7 +453,7 @@
  }
 
  // The char* returned is to an allocation owned by the undo history
 -const char *CellBuffer::DeleteChars(int position, int deleteLength, bool &startSequence) {
 +const char *CellBuffer::DeleteChars(int position, int deleteLength, bool &startSequence, SplitVector<unsigned char> &lineChange) {
  	// InsertString and DeleteChars are the bottleneck though which all changes occur
  	PLATFORM_ASSERT(deleteLength > 0);
  	char *data = 0;
 @@ -430,10 +461,43 @@
  		if (collectingUndo) {
  			// Save into the undo/redo stack, but only the characters - not the formatting
  			data = new char[deleteLength];
 +			int nbLine = 0;
-diff -r ba1d7ac2e401 -r dc56e8c124f4 src/Editor.cxx
++			bool ignoreNextCR = false;
  			for (int i = 0; i < deleteLength; i++) {
-+++ b/src/Editor.cxx	mar. oct. 25 12:23:22 2011 +0200
+ 				data[i] = substance.ValueAt(position + i);
-@@ -1936,8 +1936,30 @@
++
 +				switch (data[i]) {
 +				case '\n':
 +					nbLine++;
 +					ignoreNextCR = true;
 +					break;
-+					ViewStyle::LineChange tLineChange;
++				case '\r':
 +					if (!ignoreNextCR)
-+						if (pdoc->IsChangeLineModified(lineDoc)) {
++						nbLine++;
-+							tLineChange = ViewStyle::lineChangeModified;
++					ignoreNextCR = false;
 +					break;
-+							if (pdoc->HasChangeLineBeenSaved(lineDoc))
++				default:
-+								tLineChange = ViewStyle::lineChangeSaved;
++					ignoreNextCR = false;
-+							else
++					break;
-+								tLineChange = ViewStyle::lineChangeUnmodified;
++				}
  			}
 -			uh.AppendAction(removeAction, position, data, deleteLength, startSequence);
 +
 +			std::deque<unsigned char> *plineChangeRemoved = NULL;
 +			std::deque<unsigned char> lineChangeRemoved;
 +			if (nbLine > 0) {
 +				plineChangeRemoved = &lineChangeRemoved;
 +				nbLine += 1; // Get last line too.
 +				int line = LineFromPosition(position);
-+								sprintf(number, "%d", lineDoc + 1);
++				unsigned char curLineChangeRemoved;
 +				for (; nbLine > 0; nbLine--, line++) {
 +					if (line < lineChange.Length())
 +						curLineChangeRemoved = lineChange[line];
 +					else
 +						curLineChangeRemoved = 0;
 +					lineChangeRemoved.push_back(curLineChangeRemoved);
 +				}
 +			}
-@@ -1952,9 +1974,22 @@
++			uh.AppendAction(removeAction, position, data, deleteLength, startSequence, true, plineChangeRemoved);
  		}
 
  		BasicDeleteChars(position, deleteLength);
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/CellBuffer.h
 --- a/src/CellBuffer.h	mer. oct. 19 14:30:44 2011 +1100
 +++ b/src/CellBuffer.h	mer. oct. 26 07:35:26 2011 +0200
 @@ -12,6 +12,10 @@
  namespace Scintilla {
  #endif
 
 +#include <deque>
 +
 +#include "SplitVector.h"
 +
  // Interface to per-line data that wants to see each line insertion and deletion
  class PerLine {
  public:
 @@ -77,10 +81,11 @@
  	char *data;
  	int lenData;
  	bool mayCoalesce;
 +	std::deque<unsigned char> *lineChangeRemoved;
 
-@@ -4031,6 +4066,8 @@
+ 	Action();
  	~Action();
 -	void Create(actionType at_, int position_=0, char *data_=0, int lenData_=0, bool mayCoalesce_=true);
 +	void Create(actionType at_, int position_=0, char *data_=0, int lenData_=0, bool mayCoalesce_=true, std::deque<unsigned char> *lineChangeRemoved_=NULL);
  	void Destroy();
  	void Grab(Action *source);
  };
 @@ -102,7 +107,7 @@
  	UndoHistory();
-@@ -4280,6 +4317,8 @@
+ 	~UndoHistory();
 
 -	void AppendAction(actionType at, int position, char *data, int length, bool &startSequence, bool mayCoalesce=true);
 +	void AppendAction(actionType at, int position, char *data, int length, bool &startSequence, bool mayCoalesce=true, std::deque<unsigned char> *lineChangeRemoved=NULL);
 
  	void BeginUndoAction();
  	void EndUndoAction();
 @@ -173,7 +178,7 @@
  	bool SetStyleAt(int position, char styleValue, char mask='\377');
-@@ -4289,6 +4328,8 @@
+ 	bool SetStyleFor(int position, int length, char styleValue, char mask);
 
 -	const char *DeleteChars(int position, int deleteLength, bool &startSequence);
 +	const char *DeleteChars(int position, int deleteLength, bool &startSequence, SplitVector<unsigned char> &changeLine);
 
  	bool IsReadOnly() const;
  	void SetReadOnly(bool set);
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/Document.cxx
 --- a/src/Document.cxx	mer. oct. 19 14:30:44 2011 +1100
-@@ -4343,6 +4384,8 @@
++++ b/src/Document.cxx	mer. oct. 26 07:35:26 2011 +0200
 @@ -118,6 +118,7 @@
  	perLineData[ldState] = new LineState();
  	perLineData[ldMargin] = new LineAnnotation();
  	perLineData[ldAnnotation] = new LineAnnotation();
 +	perLineData[ldChange] = new LineChange();
 
  	cb.SetPerLine(this);
 
-@@ -7609,6 +7652,7 @@
+@@ -432,6 +433,26 @@
  	highlightDelimiter.firstChangeableLineAfter = firstChangeableLineAfter;
  }
 
 +void Document::ClearChangeLine() {
 +	static_cast<LineChange *>(perLineData[ldChange])->ClearAll();
 +}
 +
-@@ -9247,6 +9291,10 @@
+
 +	return static_cast<LineChange *>(perLineData[ldChange])->GetLineChange(line);
 +}
 +
 +bool Document::HasChangeLineBeenSaved(int line) {
 +	return static_cast<LineChange *>(perLineData[ldChange])->HasBeenSaved(line);
 +}
 +
 +bool Document::IsChangeLineModified(int line) {
 +	return static_cast<LineChange *>(perLineData[ldChange])->IsModified(line);
 +}
-diff -r ba1d7ac2e401 -r dc56e8c124f4 src/PerLine.cxx
+
 +bool Document::HasChangeLineOccured() {
-+++ b/src/PerLine.cxx	mar. oct. 25 12:23:22 2011 +0200
+
-@@ -500,3 +500,78 @@
+
 +
  int Document::ClampPositionIntoDocument(int pos) {
  	return Platform::Clamp(pos, 0, Length());
  }
 @@ -771,7 +792,9 @@
  			int prevLinesTotal = LinesTotal();
  			bool startSavePoint = cb.IsSavePoint();
  			bool startSequence = false;
 -			const char *text = cb.DeleteChars(pos, len, startSequence);
 +			const char *text = cb.DeleteChars(pos, len, startSequence, static_cast<LineChange *>(perLineData[ldChange])->lineChange);
 +			if (startSequence)
 +				static_cast<LineChange *>(perLineData[ldChange])->ModifyLines(LineFromPosition(pos));
  			if (startSavePoint && cb.IsCollectingUndo())
  				NotifySavePoint(!startSavePoint);
  			if ((pos < Length()) || (pos == 0))
 @@ -811,6 +834,12 @@
  			bool startSavePoint = cb.IsSavePoint();
  			bool startSequence = false;
  			const char *text = cb.InsertString(position, s, insertLength, startSequence);
 +			int line = LineFromPosition(position);
 +			bool isEmptyLine = text && *text && (*text == '\n' || *text == '\r') && LineStart(line) == position;
 +			if (startSequence &&
 +			        // If empty line is inserted, then the next line is shift by one line (no modification).
 +			        !isEmptyLine)
 +				static_cast<LineChange *>(perLineData[ldChange])->ModifyLines(line);
  			if (startSavePoint && cb.IsCollectingUndo())
-+	if ((lineChange[line] & maskNumber) < maskNumber) {
+
  			ModifiedAt(position);
-+		hasChangeOccured = true;
+@@ -850,6 +879,15 @@
  									SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action));
  				}
  				cb.PerformUndoStep();
 +
 +				if (action.lineChangeRemoved != NULL) {
 +					std::deque<unsigned char>::iterator it = action.lineChangeRemoved->begin();
-+	if ((lineChange[line] & maskNumber) > 1) {// 0 is equivalent at noChange.
++					int line = LineFromPosition(action.position);
 +					for (; it != action.lineChangeRemoved->end(); it++, line++) {
-+		hasChangeOccured = true;
++						static_cast<LineChange *>(perLineData[ldChange])->SetChangeLine(line, *it);
 +					}
 +				}
 +
  				int cellPosition = action.position;
-+	ModifyLines(line);
+ 				if (action.at != containerAction) {
  					ModifiedAt(cellPosition);
 @@ -873,6 +911,8 @@
  					modFlags |= SC_LASTSTEPINUNDOREDO;
  					if (multiLine)
  						modFlags |= SC_MULTILINEUNDOREDO;
 +					if (action.at != removeAction || !multiLine)
 +						static_cast<LineChange *>(perLineData[ldChange])->PerformUndo(LineFromPosition(action.position));
  				}
  				NotifyModified(DocModification(modFlags, cellPosition, action.lenData,
-+void LineChange::PerformSave() {
+
 @@ -896,6 +936,11 @@
-+		if (lineChange[i])
+
  			bool multiLine = false;
  			int steps = cb.StartRedo();
 +			int line = LineFromPosition(cb.GetRedoStep().position);
 +			const char *data = cb.GetRedoStep().data;
 +			bool isEmptyLine = data && *data && (*data == '\n' || *data == '\r') && LineStart(line) == cb.GetRedoStep().position;
-+	lineChange.DeleteAll();
+
 +				static_cast<LineChange *>(perLineData[ldChange])->PerformRedo(LineFromPosition(cb.GetRedoStep().position));
  			for (int step = 0; step < steps; step++) {
  				const int prevLinesTotal = LinesTotal();
  				const Action &action = cb.GetRedoStep();
 @@ -1834,6 +1879,9 @@
  	for (int i = 0; i < lenWatchers; i++) {
  		watchers[i].watcher->NotifySavePoint(this, watchers[i].userData, atSavePoint);
  	}
 +	if (atSavePoint)
 +		// Here, we are sure that document is clean. So we force to clean all lines that stay dirty.
 +		static_cast<LineChange *>(perLineData[ldChange])->ReachSavePoint();
  }
 
  void Document::NotifyModified(DocModification mh) {
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/Document.h
 --- a/src/Document.h	mer. oct. 19 14:30:44 2011 +1100
 +++ b/src/Document.h	mer. oct. 26 07:35:26 2011 +0200
-diff -r ba1d7ac2e401 -r dc56e8c124f4 src/PerLine.h
+
  	int lenWatchers;
-+++ b/src/PerLine.h	mar. oct. 25 12:23:22 2011 +0200
+
-@@ -114,6 +114,36 @@
+
 -	enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize };
 +	enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldChange, ldSize };
  	PerLine *perLineData[ldSize];
 
  	bool matchesValid;
 @@ -342,6 +342,12 @@
  	int GetLastChild(int lineParent, int level=-1, int lastLine=-1);
  	int GetFoldParent(int line);
-+		noChange = 0x40
+
 +
 +	void ClearChangeLine();
 +	unsigned char GetChangeLine(int line);
 +	bool HasChangeLineBeenSaved(int line);
 +	bool IsChangeLineModified(int line);
 +	bool HasChangeLineOccured();
 
  	void Indent(bool forwards);
  	int ExtendWordSelect(int pos, int delta, bool onlyWordCharacters=false);
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/Editor.cxx
 --- a/src/Editor.cxx	mer. oct. 19 14:30:44 2011 +1100
 +++ b/src/Editor.cxx	mer. oct. 26 07:35:26 2011 +0200
 @@ -1825,6 +1825,7 @@
  			int folderEnd = SubstituteMarkerIfEmpty(SC_MARKNUM_FOLDEREND,
  			        SC_MARKNUM_FOLDER);
-+	void PerformSave();
+
 +			ViewStyle::LineChange tLineChange;
  			while ((visibleLine < cs.LinesDisplayed()) && yposScreen < rcMargin.bottom) {
 
  				PLATFORM_ASSERT(visibleLine < cs.LinesDisplayed());
 @@ -1839,6 +1840,15 @@
 
  				bool headWithTail = false;
 
 +				if (pdoc->IsChangeLineModified(lineDoc)) {
 +					tLineChange = ViewStyle::lineChangeModified;
 +				} else {
-diff -r ba1d7ac2e401 -r dc56e8c124f4 src/ViewStyle.h
++					if (pdoc->HasChangeLineBeenSaved(lineDoc))
 +						tLineChange = ViewStyle::lineChangeSaved;
-+++ b/src/ViewStyle.h	mar. oct. 25 12:23:22 2011 +0200
++					else
 +						tLineChange = ViewStyle::lineChangeUnmodified;
 +				}
 +
  				if (vs.ms[margin].mask & SC_MASK_FOLDERS) {
  					// Decide which fold indicator should be displayed
  					int level = pdoc->GetLevel(lineDoc);
 @@ -1936,8 +1946,24 @@
  				if (vs.ms[margin].style == SC_MARGIN_NUMBER) {
  					char number[100];
  					number[0] = '\0';
 -					if (firstSubLine)
 -						sprintf(number, "%d", lineDoc + 1);
 +					if (firstSubLine) {
 +						if (false) { // for testing and helping during the developpment process. Have to be removed after.
 +							unsigned char lineChange = pdoc->GetChangeLine(lineDoc);
 +							if (pdoc->IsChangeLineModified(lineDoc)) {
 +								if (pdoc->HasChangeLineBeenSaved(lineDoc))
 +									sprintf(number, "%2X#%d", lineChange, lineDoc + 1);
 +								else
 +									sprintf(number, "%2X*%d", lineChange, lineDoc + 1);
 +							} else {
 +								if (pdoc->HasChangeLineBeenSaved(lineDoc))
 +									sprintf(number, "%2X#%d", lineChange, lineDoc + 1);
 +								else
 +									sprintf(number, "%2X-%d", lineChange, lineDoc + 1);
 +							}
 +						} else {
 +							sprintf(number, "%d", lineDoc + 1);
 +						}
 +					}
  					if (foldFlags & SC_FOLDFLAG_LEVELNUMBERS) {
  						int lev = pdoc->GetLevel(lineDoc);
  						sprintf(number, "%c%c %03X %03X",
 @@ -1952,9 +1978,22 @@
  					int width = surface->WidthText(vs.styles[STYLE_LINENUMBER].font, number, istrlen(number));
  					int xpos = rcNumber.right - width - 3;
  					rcNumber.left = xpos;
 +					ColourDesired fore = vs.styles[STYLE_LINENUMBER].fore;
 +					switch (tLineChange) {
 +					case ViewStyle::lineChangeSaved:
 +						fore = ColourDesired(0, 255, 0);
 +						break;
 +					case ViewStyle::lineChangeModified:
 +						fore = ColourDesired(255, 0, 0);
 +						break;
 +					case ViewStyle::lineChangeUnmodified:
 +						//do nothing
 +						break;
 +					}
  					surface->DrawTextNoClip(rcNumber, vs.styles[STYLE_LINENUMBER].font,
  					        rcNumber.top + vs.maxAscent, number, istrlen(number),
 -					        vs.styles[STYLE_LINENUMBER].fore,
 +					        fore,
 +					        //vs.styles[STYLE_LINENUMBER].fore,
  					        vs.styles[STYLE_LINENUMBER].back);
  				} else if (vs.ms[margin].style == SC_MARGIN_TEXT || vs.ms[margin].style == SC_MARGIN_RTEXT) {
  					if (firstSubLine) {
 @@ -4031,6 +4070,8 @@
  						}
  					}
  				}
 +				if (pdoc->HasChangeLineOccured())
 +					RedrawSelMargin();
  			}
  		}
  	}
 @@ -4280,6 +4321,8 @@
  		if (newPos >= 0)
  			SetEmptySelection(newPos);
  		EnsureCaretVisible();
 +		if (pdoc->HasChangeLineOccured())
 +			RedrawSelMargin();
  	}
  }
 
 @@ -4289,6 +4332,8 @@
  		if (newPos >= 0)
  			SetEmptySelection(newPos);
  		EnsureCaretVisible();
 +		if (pdoc->HasChangeLineOccured())
 +			RedrawSelMargin();
  	}
  }
 
 @@ -4343,6 +4388,8 @@
  	sel.RemoveDuplicates();
  	// Avoid blinking during rapid typing:
  	ShowCaretAtCurrentPosition();
 +	if (pdoc->HasChangeLineOccured())
 +		RedrawSelMargin();
  }
 
  void Editor::NotifyFocus(bool) {}
 @@ -7609,6 +7656,8 @@
 
  	case SCI_SETSAVEPOINT:
  		pdoc->SetSavePoint();
 +		if (pdoc->HasChangeLineOccured())
 +			RedrawSelMargin();
  		break;
 
  	case SCI_GETSTYLEDTEXT: {
 @@ -9247,6 +9296,12 @@
 
  	case SCI_GETTECHNOLOGY:
  		return technology;
 +
 +	case SCI_CLEARCHANGELINE:
 +		pdoc->ClearChangeLine();
 +		if (pdoc->HasChangeLineOccured())
 +			RedrawSelMargin();
 +		break;
 
  	default:
  		return DefWndProc(iMessage, wParam, lParam);
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/PerLine.cxx
 --- a/src/PerLine.cxx	mer. oct. 19 14:30:44 2011 +1100
 +++ b/src/PerLine.cxx	mer. oct. 26 07:35:26 2011 +0200
 @@ -500,3 +500,104 @@
  	else
  		return 0;
  }
 +
 +LineChange::~LineChange(){
 +}
 +
 +void LineChange::Init(){
 +}
 +
 +void LineChange::InsertLine(int line){
 +	if (lineChange.Length() < line)
 +		lineChange.EnsureLength(line);
 +	lineChange.Insert(line, noChange + 1);
 +}
 +
 +void LineChange::RemoveLine(int line){
 +	if (lineChange.Length() && (line < lineChange.Length()))
 +		lineChange.Delete(line);
 +}
 +
 +void LineChange::ModifyLines(int line) {
 +	if (lineChange.Length() <= line)
 +		lineChange.EnsureLength(line + 1);
 +	if (lineChange[line] == 0)
 +		lineChange[line] = noChange;
 +	if ((lineChange[line] & maskNumber) < noChange){
 +		lineChange[line] = maskSticky; // Impossible to come back to no change, so we stick the status at maskSticky.
 +		//hasChangeOccured = true;
 +	} else if (lineChange[line] != maskSticky && (lineChange[line] & maskNumber) < maskNumber) {
 +		lineChange[line] += 1;
 +		hasChangeOccured = lineChange[line] == noChange || lineChange[line] == noChange + 1; // perform redraw only if needed.
 +		//hasChangeOccured = true;
 +	}
 +}
 +
 +void LineChange::PerformUndo(int line) {
 +	if (lineChange.Length() <= line)
 +		lineChange.EnsureLength(line + 1);
 +	if (lineChange[line] != maskSticky && (lineChange[line] & maskNumber) > 1) {
 +		lineChange[line] -= 1;
 +		hasChangeOccured = lineChange[line] == noChange || lineChange[line] == noChange - 1; // perform redraw only if needed.
 +		//hasChangeOccured = true;
 +	}
 +}
 +
 +void LineChange::PerformRedo(int line) {
 +	if (lineChange.Length() <= line)
 +		lineChange.EnsureLength(line + 1);
 +	if (lineChange[line] == 0)
 +		lineChange[line] = noChange;
 +	if (lineChange[line] != maskSticky && (lineChange[line] & maskNumber) < maskNumber) {
 +		lineChange[line] += 1;
 +		hasChangeOccured = lineChange[line] == noChange || lineChange[line] == noChange + 1; // perform redraw only if needed.
 +		//hasChangeOccured = true;
 +	}
 +}
 +
 +unsigned char LineChange::GetLineChange(int line) {
 +	if (lineChange.Length() &&  (line >= 0) && (line < lineChange.Length()))
 +		return lineChange[line];
 +	else
 +		return noChange;
 +}
 +
 +void LineChange::ReachSavePoint() {
 +	for (int i = 0; i < lineChange.Length(); i++) {
 +		if ((lineChange[i] & maskNumber) != noChange) {
 +			lineChange[i] = maskHasBeenSaved | noChange;
 +			hasChangeOccured = true;
 +		}
 +	}
 +}
 +
 +void LineChange::SetChangeLine(int line, unsigned char status) {
 +	if (lineChange.Length() <= line)
 +		lineChange.EnsureLength(line + 1);
 +	lineChange[line] = status;
 +}
 +
 +void LineChange::ClearAll() {
 +	for (int i = 0; i < lineChange.Length(); i++) {
 +		if (lineChange[i] != noChange) {
 +			lineChange[i] = noChange;
 +			hasChangeOccured = true;
 +		}
 +	}
 +}
 +
 +bool LineChange::HasBeenSaved(int line) {
 +	unsigned char status = GetLineChange(line);
 +	return (status & maskHasBeenSaved) != 0;
 +}
 +
 +bool LineChange::IsModified(int line) {
 +	unsigned char status = GetLineChange(line);
 +	return (status & maskNumber) != noChange && (status & maskNumber) != 0;
 +}
 +
 +bool LineChange::HasChangeOccuredAndClear() {
 +	bool b = hasChangeOccured;
 +	hasChangeOccured = false;
 +	return b;
 +}
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/PerLine.h
 --- a/src/PerLine.h	mer. oct. 19 14:30:44 2011 +1100
 +++ b/src/PerLine.h	mer. oct. 26 07:35:26 2011 +0200
 @@ -114,6 +114,38 @@
  	int Lines(int line) const;
  };
 
 +class LineChange : public PerLine {
 +private:
 +	bool hasChangeOccured;
 +public:
 +	enum {
 +		maskHasBeenSaved = 0x80,
 +		maskNumber = 0x7F,
 +		noChange = 0x40,
 +		maskSticky = 0xFF
 +	};
 +	SplitVector<unsigned char> lineChange;
 +	LineChange() {
 +		hasChangeOccured = false;
 +	}
 +	virtual ~LineChange();
 +	virtual void Init();
 +	virtual void InsertLine(int line);
 +	virtual void RemoveLine(int line);
 +
 +	void ModifyLines(int line);
 +	void PerformUndo(int line);
 +	void PerformRedo(int line);
 +	void ReachSavePoint();
 +	void SetChangeLine(int line, unsigned char status);
 +	void ClearAll();
 +
 +	unsigned char GetLineChange (int line);
 +	bool HasBeenSaved(int line);
 +	bool IsModified(int line);
 +	bool HasChangeOccuredAndClear();
 +};
 +
  #ifdef SCI_NAMESPACE
  }
  #endif
 diff -r ba1d7ac2e401 -r 230b7804ddb4 src/ViewStyle.h
 --- a/src/ViewStyle.h	mer. oct. 19 14:30:44 2011 +1100
 +++ b/src/ViewStyle.h	mer. oct. 26 07:35:26 2011 +0200
 @@ -61,6 +61,7 @@
   */
  class ViewStyle {
  public:
 +	enum LineChange {lineChangeUnmodified, lineChangeModified, lineChangeSaved};
  	FontNames fontNames;
  	FontRealised *frFirst;
  	size_t stylesSize;