Merge branch 'master' of git://github.com/nickgammon/mushclient

nickgammon · Aug 29, 2010 · 91abdc7 · 91abdc7
2 parents d12e73f + 99c6eea
commit 91abdc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ProcessPreviousLine.cpp b/ProcessPreviousLine.cpp
@@ -724,7 +724,7 @@ assemble the full text of the original line.
          GetStyleRGB (pStyle, cText, cBack); 
 
          m_OutstandingLines.push_front (CPaneStyle ((const char *)
-                              strLine.Mid (iCol, pStyle->iLength), 
+                              strLine.Mid (pLine->len -  pStyle->iLength - iCol, pStyle->iLength), 
                               cText, cBack, pStyle->iFlags & 7));
          iCol += pStyle->iLength; // new column
          }     // end of each style

diff --git a/install/mushclient.nsi b/install/mushclient.nsi
@@ -249,6 +249,7 @@ Section "Documentation"
   File "..\docs\re.html"
   File "..\docs\Lua Colors LICENSE.txt"
   File "..\docs\JSON License.txt"
+  File "..\docs\LuaJSON.txt"
 
 SectionEnd
 
@@ -559,6 +560,7 @@ Section Uninstall
   Delete "$INSTDIR\docs\re.html"
   Delete "$INSTDIR\docs\Lua Colors LICENSE.txt"
   Delete "$INSTDIR\docs\JSON License.txt"
+  Delete "$INSTDIR\docs\LuaJSON.txt"
 
   RMDir  "$INSTDIR\docs"