Added Mark's change to support changing the document from within the

read-only notification.

2 files changed, 12 insertions, 4 deletions

diff --git a/src/Document.cxx b/src/Document.cxx
index 95107eb08..fb2650425 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -32,6 +32,7 @@ Document::Document() {
 	}
 	endStyled = 0;
 	enteredCount = 0;
+	enteredReadOnlyCount = 0;
 	tabInChars = 8;
 	watchers = 0;
 	lenWatchers = 0;
@@ -292,10 +293,13 @@ void Document::ModifiedAt(int pos) {
 
 // Unlike Undo, Redo, and InsertStyledString, the pos argument is a cell number not a char number
 void Document::DeleteChars(int pos, int len) {
+	if (cb.IsReadOnly() && enteredReadOnlyCount==0) {
+		enteredReadOnlyCount++;
+		NotifyModifyAttempt();
+		enteredReadOnlyCount--;
+	}
 	if (enteredCount == 0) {
 		enteredCount++;
-		if (cb.IsReadOnly())
-			NotifyModifyAttempt();
 		if (!cb.IsReadOnly()) {
 			int prevLinesTotal = LinesTotal();
 			bool startSavePoint = cb.IsSavePoint();
@@ -312,10 +316,13 @@ void Document::DeleteChars(int pos, int len) {
 }
 
 void Document::InsertStyledString(int position, char *s, int insertLength) {
+	if (cb.IsReadOnly() && enteredReadOnlyCount==0) {
+		enteredReadOnlyCount++;
+		NotifyModifyAttempt();
+		enteredReadOnlyCount--;
+	}
 	if (enteredCount == 0) {
 		enteredCount++;
-		if (cb.IsReadOnly())
-			NotifyModifyAttempt();
 		if (!cb.IsReadOnly()) {
 			int prevLinesTotal = LinesTotal();
 			bool startSavePoint = cb.IsSavePoint();
diff --git a/src/Document.h b/src/Document.h
index 4c212b7bd..7ab187573 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -77,6 +77,7 @@ private:
 	int stylingMask;
 	int endStyled;
 	int enteredCount;
+	int enteredReadOnlyCount;
 	
 	WatcherWithUserData *watchers;
 	int lenWatchers;