From 2cb0038e08a7868391ef8e1662f8604ea5dc2098 Mon Sep 17 00:00:00 2001
From: donho <donho@f5eea248-9336-0410-98b8-ebc06183d4e3>
Date: Mon, 14 Jul 2008 23:37:37 +0000
Subject: [PATCH] [RELEASE] OR v5.0.1. Fix bug : Syntax highlighting is not
 applied after "Save as".

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@289 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/bin/change.log                   | 5 +++--
 PowerEditor/installer/nppSetup.nsi           | 4 ++++
 PowerEditor/src/Notepad_plus.cpp             | 1 +
 PowerEditor/src/ScitillaComponent/Buffer.cpp | 7 -------
 PowerEditor/src/ScitillaComponent/Buffer.h   | 5 ++++-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 6f83ac2d2..1c20b16bb 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -8,6 +8,7 @@ Notepad++ v5.0.1 fixed bugs and added features (from v5) :
 6.  Fix bug : Files not in recent list on exit and no session saved.
 7.  Fix bug : hide lines not working right when closing.
 8.  Re-enable gcc compiler environment (minGW).
+9.  Fix bug : Syntax highlighting is not applied after "Save as".
 
 
 
@@ -30,9 +31,9 @@ Notepad++ v5 fixed bugs and added features (from v4.9.2) :
 15. Add "Select all" and "copy" context menu items in Find in files results window.
 16. Fix goto line with command line bug.
 17. Improve smart highlight / mark all / incremental search highlight all visibility
-18. Tabbar's coulours is configurable via Stylers Configurator(Active tab Text, Inactive tab text, Inactive tab background, Active tab focused indicator and Active tab unfocused indicator).
+18. Tabbar's colours is configurable via Stylers Configurator(Active tab Text, Inactive tab text, Inactive tab background, Active tab focused indicator and Active tab unfocused indicator).
 19. Add the smart highlight file size limit - 1.5 MB in order to improve the performance.
-20. Add exception handling (dumping filedata).
+20. Add exception handling (dumping file data).
 21. Fix go to line command line bug.
 22. Enhance Find in files and Find in all opened files features' performance.
 23. Fix dialog off screen problem under multi-monitor environment.
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 3cb60c934..76ba5cf02 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -510,6 +510,10 @@ GLOBAL_INST:
 	IfFileExists "$INSTDIR\plugins\FunctionList.dll" 0 +3
 		MessageBox MB_OK "Due to the problem of compability with this version,$\nFunctionList.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
 		Delete "$INSTDIR\plugins\FunctionList.dll"
+	
+	IfFileExists "$INSTDIR\plugins\NPPTextFX.ini" 0 +3
+		Delete "$INSTDIR\plugins\NPPTextFX.ini"
+		
 	; detect the right of 
 	UserInfo::GetAccountType
 	Pop $1
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 6eb92f3ea..e23ae890f 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -1102,6 +1102,7 @@ bool Notepad_plus::fileSaveAs(BufferID id, bool isSaveCopy)
 		if (other == BUFFER_INVALID)	//can save, other view doesnt contain buffer
 		{
 			doSave(bufferID, pfn, isSaveCopy);
+			buf->setNeedsLexing(true);
 			return true;
 		}
 		else		//cannot save, other view has buffer already open, activate it
diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp
index a4476d74c..1eaac3f8a 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.cpp
+++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp
@@ -346,7 +346,6 @@ FileManager::~FileManager() {
 void FileManager::checkFilesystemChanges() {
 	for(size_t i = 0; i < _nrBufs; i++) {
 		if (_buffers[i]->checkFileState()){}	//something has changed. Triggers update automatically
-				//_pNotepadPlus->notifyBufferChanged(_buffers[i]._id, _buffers[i]);
 	}
 }
 
@@ -362,12 +361,6 @@ Buffer * FileManager::getBufferByIndex(int index) {
 	return _buffers.at(index);
 }
 
-/*
-Buffer * FileManager::getBufferByID(BufferID id) {
-	return (Buffer*)id;
-	//return _buffers.at(getBufferIndexByID(id));
-}
-*/
 
 void FileManager::beNotifiedOfBufferChange(Buffer * theBuf, int mask) {
 	_pNotepadPlus->notifyBufferChanged(theBuf, mask);
diff --git a/PowerEditor/src/ScitillaComponent/Buffer.h b/PowerEditor/src/ScitillaComponent/Buffer.h
index 8e2eaa16f..4fa7854db 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.h
+++ b/PowerEditor/src/ScitillaComponent/Buffer.h
@@ -366,7 +366,10 @@ private :
 		doNotify(BufferChangeStatus);
 	}
 
-	void doNotify(int mask) { if (_canNotify) _pManager->beNotifiedOfBufferChange(this, mask); };
+	void doNotify(int mask) {
+		if (_canNotify)
+			_pManager->beNotifiedOfBufferChange(this, mask); 
+	};
 };
 
 #endif //BUFFER_H