Permalink
Browse files

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

  • Loading branch information...
2 parents d12e73f + 99c6eea commit 91abdc79ff0487babeff5f2c8d26fd783dbd37d0 @Twisol Twisol committed Aug 29, 2010
Showing with 3 additions and 1 deletion.
  1. +1 −1 ProcessPreviousLine.cpp
  2. +2 −0 install/mushclient.nsi
View
2 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
View
2 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"

0 comments on commit 91abdc7

Please sign in to comment.