Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[RELEASE_471] 4.7.1 release - Fix the crash bug due to subview session saving problem.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@96 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-01-02 22:22:03 +00:00
parent 8904821390
commit fae88016e9
6 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/bin/change.log
View File

@ -1,4 +1,4 @@
Notepad++ v4.7 fixed bugs and added features (from v4.6) :
Notepad++ v4.7.1 fixed bugs and added features (from v4.6) :
1. Make the "recovery system" for 3 mandatory xml files (config.xml, langs.xml and stylers.xml) to prevent the fail loading due to the corrupted files.
2. Extend plugin capacity - add the Scintilla external lexer capacity.
@ -15,6 +15,7 @@ Notepad++ v4.7 fixed bugs and added features (from v4.6) :
13. Add build date-time in about box.
14. Fix a bug where a file with 2 or more consecutive spaces gives problems with sessions and history.
15. Fixe the problem where opening a file when in save as dialog saves the wrong file.
16. Add "Clean Recent File List" menu command.
Included plugins :
@ -25,5 +26,5 @@ Included plugins :
5. Explorer plugin v1.6.1
6. Hex editor v0.84
7. Base64 encoder/decoder v1.2
8. FTP_synchronize v0.9.5.0
8. FTP_synchronize v0.9.5.1
9. NppExport v0.2.5.0

14
PowerEditor/installer/nppSetup.nsi
View File

@ -17,16 +17,16 @@
; Define the application name
!define APPNAME "Notepad++"
!define APPNAMEANDVERSION "Notepad++ v4.7"
!define APPNAMEANDVERSION "Notepad++ v4.7.1"
!define VERSION_MAJOR 4
!define VERSION_MINOR 7
!define VERSION_MINOR 71
; Main Install settings
Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" ""
OutFile "..\bin\npp.4.7.Installer.exe"
OutFile "..\bin\npp.4.7.1.Installer.exe"
@ -464,14 +464,6 @@ GLOBAL_INST:
Delete "$SMPROGRAMS\Notepad++\readme.lnk"
Delete "$SMPROGRAMS\Notepad++\Uninstall.lnk"
Delete "$INSTDIR\plugins\Explorer.dll"
Delete "$INSTDIR\plugins\HexEditor.dll"
Delete "$INSTDIR\plugins\HexEditorPlugin.dll"
Delete "$INSTDIR\plugins\NppSearchInFiles.dll"
Delete "$INSTDIR\plugins\ConvertExt.dll"
Delete "$INSTDIR\plugins\FunctionList.dll"
Delete "$INSTDIR\plugins\SpellChecker.dll"
CreateDirectory "$SMPROGRAMS\Notepad++"
CreateShortCut "$SMPROGRAMS\Notepad++\Uninstall.lnk" "$INSTDIR\uninstall.exe"

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -4665,7 +4665,6 @@ void Notepad_plus::showAutoComp()
if (pKeywords)
{
_pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' '));
//_pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('('));
_pEditView->execute(SCI_AUTOCSETIGNORECASE, 3);
_pEditView->execute(SCI_AUTOCSHOW, curPos-debutMotPos, WPARAM(pKeywords));
}
@ -4695,7 +4694,6 @@ void Notepad_plus::showAutoComp()
fclose( f );
_pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM('\n'));
//_pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('('));
_pEditView->execute(SCI_AUTOCSETIGNORECASE, 3);
_pEditView->execute(SCI_AUTOCSHOW, curPos-debutMotPos, WPARAM(pData));
delete[] pData;

4
PowerEditor/src/Parameters.cpp
View File

@ -1140,8 +1140,8 @@ void NppParameters::writeSession(const Session & session, const char *fileName)
(fileNameNode->ToElement())->SetAttribute("endPos", session._mainViewFiles[i]._endPos);
(fileNameNode->ToElement())->SetAttribute("selMode", session._mainViewFiles[i]._selMode);
(fileNameNode->ToElement())->SetAttribute("lang", session._mainViewFiles[i]._langName.c_str());
(fileNameNode->ToElement())->SetAttribute("filename", session._mainViewFiles[i]._fileName.c_str());
for (size_t j = 0 ; j < session._mainViewFiles[i].marks.size() ; j++)
{
size_t markLine = session._mainViewFiles[i].marks[j];
@ -1162,8 +1162,8 @@ void NppParameters::writeSession(const Session & session, const char *fileName)
(fileNameNode->ToElement())->SetAttribute("endPos", session._subViewFiles[i]._endPos);
(fileNameNode->ToElement())->SetAttribute("selMode", session._subViewFiles[i]._selMode);
(fileNameNode->ToElement())->SetAttribute("lang", session._subViewFiles[i]._langName.c_str());
(fileNameNode->ToElement())->SetAttribute("filename", session._subViewFiles[i]._fileName.c_str());
(fileNameNode->ToElement())->SetAttribute("filename", session._mainViewFiles[i]._fileName.c_str());
for (size_t j = 0 ; j < session._subViewFiles[i].marks.size() ; j++)
{
size_t markLine = session._subViewFiles[i].marks[j];

6
PowerEditor/src/resource.h
View File

@ -18,9 +18,9 @@
#ifndef RESOURCE_H
#define RESOURCE_H
#define NOTEPAD_PLUS_VERSION "Notepad++ v4.7"
#define VERSION_VALUE "4.7\0"
#define VERSION_DIGITALVALUE 4, 7, 0, 0
#define NOTEPAD_PLUS_VERSION "Notepad++ v4.7.1"
#define VERSION_VALUE "4.71\0" // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
#define VERSION_DIGITALVALUE 4, 7, 1, 0
#ifndef IDC_STATIC
#define IDC_STATIC -1

4
PowerEditor/visual.net/notepadPlus.vcproj
View File

@ -573,11 +573,11 @@
>
</File>
<File
RelativePath="..\src\WinControls\Preference\resource.h"
RelativePath="..\src\resource.h"
>
</File>
<File
RelativePath="..\src\resource.h"
RelativePath="..\src\WinControls\Preference\resource.h"
>
</File>
<File