update to v4.2.25-rc9

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@485 28bd50df-7adb-d945-0439-6e466c6a13cc

10 files changed, 134 insertions, 85 deletions

diff --git a/Notepad2.txt b/Notepad2.txt
index 53b81ef..d331056 100644
--- a/Notepad2.txt
+++ b/Notepad2.txt
@@ -37,12 +37,13 @@ Features
   - Mostly adjustable

 

 

-New in Version 4.2.25-rc8 (released April 19, 2011)

+New in Version 4.2.25-rc9 (released May 05, 2011)

 

   - "Align Lines" with several options (Alt+J)

   - "Modify Lines" supports several variables to insert numbers (Alt+M)

   - "Sort Lines" (Alt+O) handles column sort (rectangular selection)

-  - "Sort Lines" als handles shuffle, remove duplicate and unique lines

+  - "Sort Lines" also handles shuffle, remove duplicates and uniques

+  - "Merge Blank Lines" (Alt+Y)

   - Use built-in Windows functionality for "Title Case" on Windows 7

   - Convert between characters and hex codes (Ctrl+Alt+X, Ctrl+Alt+C)

   - "Recode file as default encoding" (Ctrl+Shift+F)

@@ -75,6 +76,8 @@ New in Version 4.2.25-rc8 (released April 19, 2011)
   - Ini-options to block suppression of notification messages

   - Simplified appearance of word wrap settings dialog

   - Remapped "Unescape C Special Chars" to Ctrl+Alt+R (fix duplicate)

+  - Reloading keeps scrolling position more unerringly with word wrap

+  - Jumps with /g switch locate position more accurately with word wrap

   - Various internal optimizations and fixes

   - Improved look of disabled toolbar buttons on Windows XP and above

   - Improved overall look of toolbar buttons on Windows 2k

@@ -610,6 +613,7 @@ Keyboard Shortcuts for Notepad2
     Alt+U                 Strip last character.

     Alt+W                 Strip trailing blanks.

     Alt+P                 Compress whitespace.

+    Alt+Y                 Merge blank lines.

     Alt+R                 Remove blank lines.

     Alt+M                 Modify lines.

     Alt+J                 Align lines.

diff --git a/Readme.txt b/Readme.txt
index 7c37663..372efca 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -23,7 +23,7 @@ The Notepad2 Source Code
 

 Rebuilding from the Source Code

 

-  Notepad2 4.2.25-rc8 is based on Scintilla 2.24 [1].

+  Notepad2 4.2.25-rc9 is based on Scintilla 2.24 [1].

 

   [1] http://www.scintilla.org

 

diff --git a/src/Edit.c b/src/Edit.c
index 8872c5d..298e165 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -3922,7 +3922,7 @@ void EditCompressSpaces(HWND hwnd)
 //

 //  EditRemoveBlankLines()

 //

-void EditRemoveBlankLines(HWND hwnd)

+void EditRemoveBlankLines(HWND hwnd,BOOL bMerge)

 {

   int iSelStart = (int)SendMessage(hwnd,SCI_GETSELECTIONSTART,0,0);

   int iSelEnd   = (int)SendMessage(hwnd,SCI_GETSELECTIONEND,0,0);

@@ -3942,24 +3942,38 @@ void EditRemoveBlankLines(HWND hwnd)
     if (iSelStart > SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLineStart,0))

       iLineStart++;

 

-    if (iSelEnd <= SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLineEnd,0))

+    if (iSelEnd <= SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLineEnd,0) &&

+        iLineEnd != SendMessage(hwnd,SCI_GETLINECOUNT,0,0)-1)

       iLineEnd--;

 

     SendMessage(hwnd,SCI_BEGINUNDOACTION,0,0);

 

     for (iLine = iLineStart; iLine <= iLineEnd; )

     {

-      int iPos = (int)SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLine,0);

-      if (SendMessage(hwnd,SCI_GETLINEENDPOSITION,(WPARAM)iLine,0) == iPos)

-      {

-        int iPos2 = (int)SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLine+1,0);

-        SendMessage(hwnd,SCI_SETTARGETSTART,(WPARAM)iPos,0);

-        SendMessage(hwnd,SCI_SETTARGETEND,(WPARAM)iPos2,0);

+      int nBlanks = 0;

+      while (iLine + nBlanks <= iLineEnd &&

+              SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLine + nBlanks,0) ==

+              SendMessage(hwnd,SCI_GETLINEENDPOSITION,(WPARAM)iLine + nBlanks,0))

+        nBlanks++;

+

+      if (nBlanks == 0 || (nBlanks == 1 && bMerge))

+        iLine += nBlanks + 1;

+

+      else {

+        int iTargetStart;

+        int iTargetEnd;

+

+        if (bMerge)

+          nBlanks--;

+        iTargetStart = (int)SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLine,0);

+        iTargetEnd   = (int)SendMessage(hwnd,SCI_POSITIONFROMLINE,(WPARAM)iLine + nBlanks,0);

+        SendMessage(hwnd,SCI_SETTARGETSTART,(WPARAM)iTargetStart,0);

+        SendMessage(hwnd,SCI_SETTARGETEND,(WPARAM)iTargetEnd,0);

         SendMessage(hwnd,SCI_REPLACETARGET,0,(LPARAM)"");

-        iLineEnd--;

+        if (bMerge)

+          iLine++;

+        iLineEnd -= nBlanks;

       }

-      else

-        iLine++;

     }

     SendMessage(hwnd,SCI_ENDUNDOACTION,0,0);

   }

@@ -4622,8 +4636,6 @@ void EditSortLines(HWND hwnd,int iSortFlags)
 //

 void EditJumpTo(HWND hwnd,int iNewLine,int iNewCol)

 {

-  //int iScrLines;

-  //int iTopLine;

   int iMaxLine = (int)SendMessage(hwnd,SCI_GETLINECOUNT,0,0);

 

   // Jumpt to end with line set to -1

@@ -4658,15 +4670,6 @@ void EditJumpTo(HWND hwnd,int iNewLine,int iNewCol)
     SendMessage(hwnd,SCI_GOTOPOS,(WPARAM)iNewPos,0);

     SendMessage(hwnd,SCI_CHOOSECARETX,0,0);

 

-    //iScrLines = SendMessage(hwnd,SCI_LINESONSCREEN,0,0);

-    //iTopLine = SendMessage(hwnd,SCI_GETFIRSTVISIBLELINE,0,0);

-    //if (iScrLines > 20) {

-    //  if (iNewLine - iTopLine < 5)

-    //    SendMessage(hwnd,SCI_LINESCROLL,0,(LPARAM)max(iNewLine-5,0)-iTopLine);

-    //  else if (iNewLine - (iTopLine + iScrLines) > -5)

-    //    SendMessage(hwnd,SCI_LINESCROLL,0,(LPARAM)max(iNewLine-iScrLines+5,0)-iTopLine);

-    //}

-

     SendMessage(hwnd,SCI_SETXCARETPOLICY,CARET_SLOP|CARET_EVEN,50);

     SendMessage(hwnd,SCI_SETYCARETPOLICY,CARET_EVEN,0);

   }

@@ -4717,6 +4720,24 @@ void EditFixPositions(HWND hwnd)
 

 //=============================================================================

 //

+//  EditEnsureSelectionVisible()

+//

+void EditEnsureSelectionVisible(HWND hwnd)

+{

+  int iAnchorPos = (int)SendMessage(hwnd,SCI_GETANCHOR,0,0);

+  int iCurrentPos = (int)SendMessage(hwnd,SCI_GETCURRENTPOS,0,0);

+  SendMessage(hwnd,SCI_ENSUREVISIBLE,

+    (WPARAM)SendMessage(hwnd,SCI_LINEFROMPOSITION,(WPARAM)iAnchorPos,0),0);

+  if (iAnchorPos != iCurrentPos) {

+    SendMessage(hwnd,SCI_ENSUREVISIBLE,

+      (WPARAM)SendMessage(hwnd,SCI_LINEFROMPOSITION,(WPARAM)iCurrentPos,0),0);

+  }

+  EditSelectEx(hwnd,iAnchorPos,iCurrentPos);

+}

+

+

+//=============================================================================

+//

 //  EditGetExcerpt()

 //

 void EditGetExcerpt(HWND hwnd,LPWSTR lpszExcerpt,DWORD cchExcerpt)

diff --git a/src/Edit.h b/src/Edit.h
index cdadfd6..f1249d8 100644
--- a/src/Edit.h
+++ b/src/Edit.h
@@ -105,7 +105,7 @@ void  EditStripFirstCharacter(HWND);
 void  EditStripLastCharacter(HWND);

 void  EditStripTrailingBlanks(HWND,BOOL);

 void  EditCompressSpaces(HWND);

-void  EditRemoveBlankLines(HWND);

+void  EditRemoveBlankLines(HWND,BOOL);

 void  EditWrapToColumn(HWND,int);

 void  EditJoinLinesEx(HWND);

 void  EditSortLines(HWND,int);

@@ -113,6 +113,7 @@ void  EditSortLines(HWND,int);
 void  EditJumpTo(HWND,int,int);

 void  EditSelectEx(HWND,int,int);

 void  EditFixPositions(HWND);

+void  EditEnsureSelectionVisible(HWND);

 void  EditGetExcerpt(HWND,LPWSTR,DWORD);

 

 HWND  EditFindReplaceDlg(HWND,LPCEDITFINDREPLACE,BOOL);

diff --git a/src/Helpers.c b/src/Helpers.c
index 02553a3..772e664 100644
--- a/src/Helpers.c
+++ b/src/Helpers.c
@@ -34,7 +34,6 @@
 #include "resource.h"

 

 

-

 //=============================================================================

 //

 //  Manipulation of (cached) ini file sections

@@ -1497,14 +1496,14 @@ DWORD_PTR SHGetFileInfo2(LPCWSTR pszPath,DWORD dwFileAttributes,
 

     DWORD_PTR dw = SHGetFileInfo(pszPath,dwFileAttributes,psfi,cbFileInfo,uFlags);

     if (lstrlen(psfi->szDisplayName) < lstrlen(PathFindFileName(pszPath)))

-      PathAddExtension(psfi->szDisplayName,PathFindExtension(pszPath));

+      StrCatBuff(psfi->szDisplayName,PathFindExtension(pszPath),COUNTOF(psfi->szDisplayName));

     return(dw);

   }

 

   else {

     DWORD_PTR dw = SHGetFileInfo(pszPath,FILE_ATTRIBUTE_NORMAL,psfi,cbFileInfo,uFlags|SHGFI_USEFILEATTRIBUTES);

     if (lstrlen(psfi->szDisplayName) < lstrlen(PathFindFileName(pszPath)))

-      PathAddExtension(psfi->szDisplayName,PathFindExtension(pszPath));

+      StrCatBuff(psfi->szDisplayName,PathFindExtension(pszPath),COUNTOF(psfi->szDisplayName));

     return(dw);

   }

 

@@ -2081,7 +2080,6 @@ static int GetHexDigit(char ch) {
 /**

  * Convert C style \a, \b, \f, \n, \r, \t, \v, \xhh and \uhhhh into their indicated characters.

  */

-extern HWND hwndEdit;

 unsigned int UnSlash(char *s,UINT cpEdit) {

   char *sStart = s;

   char *o = s;

diff --git a/src/Notepad2.c b/src/Notepad2.c
index ecdbf75..bbd28ea 100644
--- a/src/Notepad2.c
+++ b/src/Notepad2.c
@@ -873,8 +873,10 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
     }

     else {

       if (bOpened = FileLoad(FALSE,FALSE,FALSE,FALSE,lpFileArg)) {

-        if (flagJumpTo) // Jump to position

+        if (flagJumpTo) { // Jump to position

           EditJumpTo(hwndEdit,iInitialLine,iInitialColumn);

+          EditEnsureSelectionVisible(hwndEdit);

+        }

       }

     }

     GlobalFree(lpFileArg);

@@ -921,6 +923,7 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
       bAutoIndent = bAutoIndent2;

       if (flagJumpTo)

         EditJumpTo(hwndEdit,iInitialLine,iInitialColumn);

+      EditEnsureSelectionVisible(hwndEdit);

     }

   }

 

@@ -962,11 +965,13 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
         if (!flagJumpTo)

           EditJumpTo(hwndEdit,-1,0);

         EditFindPrev(hwndEdit,&efrData,FALSE);

+        EditEnsureSelectionVisible(hwndEdit);

       }

       else {

         if (!flagJumpTo)

           SendMessage(hwndEdit,SCI_DOCUMENTSTART,0,0);

         EditFindNext(hwndEdit,&efrData,FALSE);

+        EditEnsureSelectionVisible(hwndEdit);

       }

     }

     GlobalFree(lpMatchArg);

@@ -1282,6 +1287,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
             if (params->iInitialLine == 0)

               params->iInitialLine = 1;

             EditJumpTo(hwndEdit,params->iInitialLine,params->iInitialColumn);

+            EditEnsureSelectionVisible(hwndEdit);

           }

 

           flagLexerSpecified = 0;

@@ -1403,24 +1409,28 @@ LRESULT CALLBACK MainWndProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
 

               int iCurPos     = (int)SendMessage(hwndEdit,SCI_GETCURRENTPOS,0,0);

               int iAnchorPos  = (int)SendMessage(hwndEdit,SCI_GETANCHOR,0,0);

-              int iCurTopLine = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

+              int iVisTopLine = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

+              int iDocTopLine = (int)SendMessage(hwndEdit,SCI_DOCLINEFROMVISIBLE,(WPARAM)iVisTopLine,0);

               int iXOffset    = (int)SendMessage(hwndEdit,SCI_GETXOFFSET,0,0);

               BOOL bIsTail    = (iCurPos == iAnchorPos) && (iCurPos == SendMessage(hwndEdit,SCI_GETLENGTH,0,0));

 

               iWeakSrcEncoding = iEncoding;

               if (FileLoad(TRUE,FALSE,TRUE,FALSE,szCurFile)) {

 

-                if (bIsTail && iFileWatchingMode == 2)

+                if (bIsTail && iFileWatchingMode == 2) {

                   EditJumpTo(hwndEdit,-1,0);

+                  EditEnsureSelectionVisible(hwndEdit);

+                }

 

                 else if (SendMessage(hwndEdit,SCI_GETLENGTH,0,0) >= 4) {

                   char tch[5] = "";

                   SendMessage(hwndEdit,SCI_GETTEXT,5,(LPARAM)tch);

                   if (lstrcmpiA(tch,".LOG") != 0) {

-                    int iTopLineAfterLoad;

-                    SendMessage(hwndEdit,SCI_SETSEL,(WPARAM)iAnchorPos,(LPARAM)iCurPos);

-                    iTopLineAfterLoad = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

-                    SendMessage(hwndEdit,SCI_LINESCROLL,0,(LPARAM)(iCurTopLine - iTopLineAfterLoad));

+                    int iNewTopLine;

+                    SendMessage(hwndEdit,SCI_SETSEL,iAnchorPos,iCurPos);

+                    SendMessage(hwndEdit,SCI_ENSUREVISIBLE,(WPARAM)iDocTopLine,0);

+                    iNewTopLine = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

+                    SendMessage(hwndEdit,SCI_LINESCROLL,0,(LPARAM)iVisTopLine - iNewTopLine);

                     SendMessage(hwndEdit,SCI_SETXOFFSET,(WPARAM)iXOffset,0);

                   }

                 }

@@ -2115,6 +2125,7 @@ void MsgInitMenu(HWND hwnd,WPARAM wParam,LPARAM lParam)
   //EnableCmd(hmenu,IDM_EDIT_STRIP1STCHAR,!bReadOnly);

   //EnableCmd(hmenu,IDM_EDIT_STRIPLASTCHAR,!bReadOnly);

   //EnableCmd(hmenu,IDM_EDIT_TRIMLINES,!bReadOnly);

+  //EnableCmd(hmenu,IDM_EDIT_MERGEBLANKLINES,!bReadOnly);

   //EnableCmd(hmenu,IDM_EDIT_REMOVEBLANKLINES,!bReadOnly);

 

   EnableCmd(hmenu,IDM_EDIT_SORTLINES,

@@ -2293,7 +2304,8 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
 

           int iCurPos     = (int)SendMessage(hwndEdit,SCI_GETCURRENTPOS,0,0);

           int iAnchorPos  = (int)SendMessage(hwndEdit,SCI_GETANCHOR,0,0);

-          int iCurTopLine = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

+          int iVisTopLine = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

+          int iDocTopLine = (int)SendMessage(hwndEdit,SCI_DOCLINEFROMVISIBLE,(WPARAM)iVisTopLine,0);

           int iXOffset    = (int)SendMessage(hwndEdit,SCI_GETXOFFSET,0,0);

 

           if ((bModified || iEncoding != iOriginalEncoding) && MsgBox(MBOKCANCEL,IDS_ASK_REVERT) != IDOK)

@@ -2308,10 +2320,11 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
               char tch[5] = "";

               SendMessage(hwndEdit,SCI_GETTEXT,5,(LPARAM)tch);

               if (lstrcmpiA(tch,".LOG") != 0) {

-                int iTopLineAfterLoad;

-                SendMessage(hwndEdit,SCI_SETSEL,(WPARAM)iAnchorPos,(LPARAM)iCurPos);

-                iTopLineAfterLoad = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

-                SendMessage(hwndEdit,SCI_LINESCROLL,0,(LPARAM)(iCurTopLine - iTopLineAfterLoad));

+                int iNewTopLine;

+                SendMessage(hwndEdit,SCI_SETSEL,iAnchorPos,iCurPos);

+                SendMessage(hwndEdit,SCI_ENSUREVISIBLE,(WPARAM)iDocTopLine,0);

+                iNewTopLine = (int)SendMessage(hwndEdit,SCI_GETFIRSTVISIBLELINE,0,0);

+                SendMessage(hwndEdit,SCI_LINESCROLL,0,(LPARAM)iVisTopLine - iNewTopLine);

                 SendMessage(hwndEdit,SCI_SETXOFFSET,(WPARAM)iXOffset,0);

               }

             }

@@ -3090,9 +3103,16 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
       break;

 

 

+    case IDM_EDIT_MERGEBLANKLINES:

+      BeginWaitCursor();

+      EditRemoveBlankLines(hwndEdit,TRUE);

+      EndWaitCursor();

+      break;

+

+

     case IDM_EDIT_REMOVEBLANKLINES:

       BeginWaitCursor();

-      EditRemoveBlankLines(hwndEdit);

+      EditRemoveBlankLines(hwndEdit,FALSE);

       EndWaitCursor();

       break;

 

@@ -6875,6 +6895,7 @@ BOOL FileLoad(BOOL bDontSave,BOOL bNew,BOOL bReload,BOOL bNoEncDetect,LPCWSTR lp
         SendMessage(hwndEdit,SCI_NEWLINE,0,0);

         SendMessage(hwndEdit,SCI_ENDUNDOACTION,0,0);

         EditJumpTo(hwndEdit,-1,0);

+        EditEnsureSelectionVisible(hwndEdit);

       }

     }

 

@@ -7788,6 +7809,7 @@ void CALLBACK PasteBoardTimer(HWND hwnd,UINT uMsg,UINT_PTR idEvent,DWORD dwTime)
       SendMessage(hwndEdit,SCI_PASTE,0,0);

       SendMessage(hwndEdit,SCI_NEWLINE,0,0);

       SendMessage(hwndEdit,SCI_ENDUNDOACTION,0,0);

+      EditEnsureSelectionVisible(hwndEdit);

       bAutoIndent = bAutoIndent2;

     }

 

diff --git a/src/Notepad2.rc b/src/Notepad2.rc
index 0758219..dc9f084 100644
--- a/src/Notepad2.rc
+++ b/src/Notepad2.rc
@@ -170,6 +170,7 @@ BEGIN
             MENUITEM "Strip &Last Character\tAlt+U", IDM_EDIT_STRIPLASTCHAR

             MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES

             MENUITEM "Compress &Whitespace\tAlt+P", IDM_EDIT_COMPRESSWS

+            MENUITEM "Merge &Blank Lines\tAlt+Y",   IDM_EDIT_MERGEBLANKLINES

             MENUITEM "&Remove Blank Lines\tAlt+R",  IDM_EDIT_REMOVEBLANKLINES

 

             MENUITEM SEPARATOR

@@ -587,6 +588,7 @@ BEGIN
     "X",            IDM_EDIT_CUTLINE,       VIRTKEY, SHIFT, CONTROL,

                                                     NOINVERT

     "Y",            IDM_EDIT_REDO,          VIRTKEY, CONTROL, NOINVERT

+    "Y",            IDM_EDIT_MERGEBLANKLINES, VIRTKEY, ALT, NOINVERT

     "Y",            IDM_EDIT_UNDO,          VIRTKEY, SHIFT, CONTROL,

                                                     NOINVERT

     "Z",            IDM_EDIT_UNDO,          VIRTKEY, CONTROL, NOINVERT

diff --git a/src/Version_in.h b/src/Version_in.h
index 37369db..9e8f47a 100644
--- a/src/Version_in.h
+++ b/src/Version_in.h
@@ -1,6 +1,6 @@
 #define VERSION_REV                  $WCREV$

 #if defined(_WIN64)

-  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod x64 4.2.25-rc8 rev. $WCREV$"

+  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod x64 4.2.25-rc9 rev. $WCREV$"

 #else

-  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod 4.2.25-rc8 rev. $WCREV$"

+  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod 4.2.25-rc9 rev. $WCREV$"

 #endif

diff --git a/src/Version_rev.h.template b/src/Version_rev.h.template
index cbcfc3a..55d0de4 100644
--- a/src/Version_rev.h.template
+++ b/src/Version_rev.h.template
@@ -1,6 +1,6 @@
 #define VERSION_REV                  0

 #if defined(_WIN64)

-  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod x64 4.2.25-rc8 rev. 0"

+  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod x64 4.2.25-rc9 rev. 0"

 #else

-  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod 4.2.25-rc8 rev. 0"

+  #define VERSION_FILEVERSION_LONG   L"Notepad2-mod 4.2.25-rc9 rev. 0"

 #endif

diff --git a/src/resource.h b/src/resource.h
index 6b68349..ccac52a 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -257,44 +257,45 @@
 #define IDM_EDIT_STRIPLASTCHAR          40331

 #define IDM_EDIT_TRIMLINES              40332

 #define IDM_EDIT_COMPRESSWS             40333

-#define IDM_EDIT_REMOVEBLANKLINES       40334

-#define IDM_EDIT_MODIFYLINES            40335

-#define IDM_EDIT_SORTLINES              40336

-#define IDM_EDIT_ALIGN                  40337

-#define IDM_EDIT_CONVERTUPPERCASE       40338

-#define IDM_EDIT_CONVERTLOWERCASE       40339

-#define IDM_EDIT_INVERTCASE             40340

-#define IDM_EDIT_TITLECASE              40341

-#define IDM_EDIT_SENTENCECASE           40342

-#define IDM_EDIT_CONVERTTABS            40343

-#define IDM_EDIT_CONVERTSPACES          40344

-#define IDM_EDIT_CONVERTTABS2           40345

-#define IDM_EDIT_CONVERTSPACES2         40346

-#define IDM_EDIT_INSERT_TAG             40347

-#define IDM_EDIT_INSERT_ENCODING        40348

-#define IDM_EDIT_INSERT_SHORTDATE       40349

-#define IDM_EDIT_INSERT_LONGDATE        40350

-#define IDM_EDIT_INSERT_FILENAME        40351

-#define IDM_EDIT_INSERT_PATHNAME        40352

-#define IDM_EDIT_LINECOMMENT            40353

-#define IDM_EDIT_STREAMCOMMENT          40354

-#define IDM_EDIT_URLENCODE              40355

-#define IDM_EDIT_URLDECODE              40356

-#define IDM_EDIT_ESCAPECCHARS           40357

-#define IDM_EDIT_UNESCAPECCHARS         40358

-#define IDM_EDIT_CHAR2HEX               40359

-#define IDM_EDIT_HEX2CHAR               40360

-#define IDM_EDIT_FINDMATCHINGBRACE      40361

-#define IDM_EDIT_SELTOMATCHINGBRACE     40362

-#define IDM_EDIT_FIND                   40363

-#define IDM_EDIT_SAVEFIND               40364

-#define IDM_EDIT_FINDNEXT               40365

-#define IDM_EDIT_FINDPREV               40366

-#define IDM_EDIT_REPLACE                40367

-#define IDM_EDIT_REPLACENEXT            40368

-#define IDM_EDIT_GOTOLINE               40369

-#define IDM_EDIT_SELTONEXT              40370

-#define IDM_EDIT_SELTOPREV              40371

+#define IDM_EDIT_MERGEBLANKLINES        40334

+#define IDM_EDIT_REMOVEBLANKLINES       40335

+#define IDM_EDIT_MODIFYLINES            40336

+#define IDM_EDIT_SORTLINES              40337

+#define IDM_EDIT_ALIGN                  40338

+#define IDM_EDIT_CONVERTUPPERCASE       40339

+#define IDM_EDIT_CONVERTLOWERCASE       40340

+#define IDM_EDIT_INVERTCASE             40341

+#define IDM_EDIT_TITLECASE              40342

+#define IDM_EDIT_SENTENCECASE           40343

+#define IDM_EDIT_CONVERTTABS            40344

+#define IDM_EDIT_CONVERTSPACES          40345

+#define IDM_EDIT_CONVERTTABS2           40346

+#define IDM_EDIT_CONVERTSPACES2         40347

+#define IDM_EDIT_INSERT_TAG             40348

+#define IDM_EDIT_INSERT_ENCODING        40349

+#define IDM_EDIT_INSERT_SHORTDATE       40350

+#define IDM_EDIT_INSERT_LONGDATE        40351

+#define IDM_EDIT_INSERT_FILENAME        40352

+#define IDM_EDIT_INSERT_PATHNAME        40353

+#define IDM_EDIT_LINECOMMENT            40354

+#define IDM_EDIT_STREAMCOMMENT          40355

+#define IDM_EDIT_URLENCODE              40356

+#define IDM_EDIT_URLDECODE              40357

+#define IDM_EDIT_ESCAPECCHARS           40358

+#define IDM_EDIT_UNESCAPECCHARS         40359

+#define IDM_EDIT_CHAR2HEX               40360

+#define IDM_EDIT_HEX2CHAR               40361

+#define IDM_EDIT_FINDMATCHINGBRACE      40362

+#define IDM_EDIT_SELTOMATCHINGBRACE     40363

+#define IDM_EDIT_FIND                   40364

+#define IDM_EDIT_SAVEFIND               40365

+#define IDM_EDIT_FINDNEXT               40366

+#define IDM_EDIT_FINDPREV               40367

+#define IDM_EDIT_REPLACE                40368

+#define IDM_EDIT_REPLACENEXT            40369

+#define IDM_EDIT_GOTOLINE               40370

+#define IDM_EDIT_SELTONEXT              40371

+#define IDM_EDIT_SELTOPREV              40372

 #define IDM_VIEW_SCHEME                 40400

 #define IDM_VIEW_USE2NDDEFAULT          40401

 #define IDM_VIEW_SCHEMECONFIG           40402