Index: MDITabs.cpp
===================================================================
RCS file: /cvs/mushclient/MDITabs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** MDITabs.cpp	3 Apr 2007 23:10:18 -0000	1.4
--- MDITabs.cpp	3 Jun 2008 03:50:02 -0000	1.5
***************
*** 107,113 ****
      CChildFrame * pWorldFrame = (CChildFrame *) pWnd;
      CMUSHclientDoc * pDoc = pWorldFrame->m_pDoc;
      strName = pDoc->m_mush_name;
!     if (pDoc->m_new_lines)
        strName += CFormat (" (%i)", pDoc->m_new_lines);
  
      }
--- 107,113 ----
      CChildFrame * pWorldFrame = (CChildFrame *) pWnd;
      CMUSHclientDoc * pDoc = pWorldFrame->m_pDoc;
      strName = pDoc->m_mush_name;
!     if (pDoc->m_new_lines && !pDoc->m_bDoNotShowOutstandingLines)
        strName += CFormat (" (%i)", pDoc->m_new_lines);
  
      }
Index: MUSHclient.rc
===================================================================
RCS file: /cvs/mushclient/MUSHclient.rc,v
retrieving revision 1.216
retrieving revision 1.217
diff -c -r1.216 -r1.217
*** MUSHclient.rc	27 May 2008 01:51:32 -0000	1.216
--- MUSHclient.rc	3 Jun 2008 03:50:02 -0000	1.217
***************
*** 56,63 ****
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,25,0
!  PRODUCTVERSION 4,0,25,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
--- 56,63 ----
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,26,0
!  PRODUCTVERSION 4,0,26,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
***************
*** 75,88 ****
              VALUE "Comments", "MUSHclient - a client program for playing MUD games\0"
              VALUE "CompanyName", "Gammon Software Solutions\0"
              VALUE "FileDescription", "MUSHclient\0"
!             VALUE "FileVersion", "4.25\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2008 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.25\0"
              VALUE "SpecialBuild", "\0"
          END
      END
--- 75,88 ----
              VALUE "Comments", "MUSHclient - a client program for playing MUD games\0"
              VALUE "CompanyName", "Gammon Software Solutions\0"
              VALUE "FileDescription", "MUSHclient\0"
!             VALUE "FileVersion", "4.26\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2008 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.26\0"
              VALUE "SpecialBuild", "\0"
          END
      END
Index: MapDlg.cpp
===================================================================
RCS file: /cvs/mushclient/MapDlg.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** MapDlg.cpp	25 Jul 2007 05:02:19 -0000	1.19
--- MapDlg.cpp	3 Jun 2008 03:50:03 -0000	1.20
***************
*** 221,227 ****
  
    alias_item->regexp = regcomp (strRegexp,
                                    (alias_item->bIgnoreCase  ? PCRE_CASELESS : 0)
!                                   | (m_pDoc->m_bUTF_8 ? PCRE_UTF8 : 0));
  
  // add to map - generate a name if it doesn't have one
  
--- 221,230 ----
  
    alias_item->regexp = regcomp (strRegexp,
                                    (alias_item->bIgnoreCase  ? PCRE_CASELESS : 0)
! #if ALIASES_USE_UTF8
!                                   | (m_pDoc->m_bUTF_8 ? PCRE_UTF8 : 0)
! #endif // ALIASES_USE_UTF8
!                                   );
  
  // add to map - generate a name if it doesn't have one
  
Index: aliasdlg.cpp
===================================================================
RCS file: /cvs/mushclient/aliasdlg.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** aliasdlg.cpp	25 Jul 2007 05:02:19 -0000	1.42
--- aliasdlg.cpp	3 Jun 2008 03:50:03 -0000	1.43
***************
*** 143,149 ****
      // compile regular expression to check it
      if (m_bRegexp)
        {
!       if (!CheckRegularExpression (m_name, (m_bIgnoreCase ?  0 : PCRE_CASELESS) | (m_pDoc->m_bUTF_8 ? PCRE_UTF8 : 0)))
          {   // failed check
          DDX_Text(pDX, IDC_ALIAS_NAME, m_name);
          pDX->Fail();
--- 143,155 ----
      // compile regular expression to check it
      if (m_bRegexp)
        {
!       if (!CheckRegularExpression (m_name, (m_bIgnoreCase ?  0 : PCRE_CASELESS) 
!           | (m_pDoc->m_bUTF_8 ? PCRE_UTF8 : 0)
! #if ALIASES_USE_UTF8
!                                   | (m_pDoc->m_bUTF_8 ? PCRE_UTF8 : 0)
! #endif // ALIASES_USE_UTF8
!           
!           ))
          {   // failed check
          DDX_Text(pDX, IDC_ALIAS_NAME, m_name);
          pDX->Fail();
Index: doc.h
===================================================================
RCS file: /cvs/mushclient/doc.h,v
retrieving revision 1.235
retrieving revision 1.236
diff -c -r1.235 -r1.236
*** doc.h	27 May 2008 01:51:32 -0000	1.235
--- doc.h	3 Jun 2008 03:50:03 -0000	1.236
***************
*** 21,28 ****
  
  // New versions - things to change
  
! #define THISVERSION 425                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.25";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
--- 21,28 ----
  
  // New versions - things to change
  
! #define THISVERSION 426                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.26";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
***************
*** 788,793 ****
--- 788,794 ----
    unsigned short m_iSpamLineCount;              // send spam filler after this many lines the same
    CString        m_strSpamMessage;              // what spam filler to send
  
+   unsigned short m_bDoNotShowOutstandingLines;  // don't show outstanding lines in tabbed windows
  
    // new in 3.36
  
Index: doc_construct.cpp
===================================================================
RCS file: /cvs/mushclient/doc_construct.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** doc_construct.cpp	10 Jan 2008 01:24:53 -0000	1.24
--- doc_construct.cpp	3 Jun 2008 03:50:03 -0000	1.25
***************
*** 91,96 ****
--- 91,97 ----
    m_bSuppressNewline = false;
    m_echo_colour = 9;
    m_bAlwaysRecordCommandHistory = false;
+   m_bDoNotShowOutstandingLines = false;
    m_bCopySelectionToClipboard = false;
    m_bCarriageReturnClearsLine = false;
    m_bConvertGAtoNewline = false;
Index: methods.cpp
===================================================================
RCS file: /cvs/mushclient/methods.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -c -r1.206 -r1.207
*** methods.cpp	27 May 2008 01:51:32 -0000	1.206
--- methods.cpp	3 Jun 2008 03:50:03 -0000	1.207
***************
*** 1015,1021 ****
    // compile regular expression
    try 
      {
!     regexp = regcomp (strRegexp, (Flags & eIgnoreAliasCase ? PCRE_CASELESS : 0) | (m_bUTF_8 ? PCRE_UTF8 : 0));
      }   // end of try
    catch(CException* e)
      {
--- 1015,1025 ----
    // compile regular expression
    try 
      {
!     regexp = regcomp (strRegexp, (Flags & eIgnoreAliasCase ? PCRE_CASELESS : 0)
! #if ALIASES_USE_UTF8
!                                   | (m_bUTF_8 ? PCRE_UTF8 : 0)
! #endif // ALIASES_USE_UTF8
!         );
      }   // end of try
    catch(CException* e)
      {
***************
*** 6243,6249 ****
          // compile regular expression
          try 
            {
!           regexp = regcomp (strRegexp, (Alias_item->bIgnoreCase ? PCRE_CASELESS : 0) | (m_bUTF_8 ? PCRE_UTF8 : 0));
            }   // end of try
          catch(CException* e)
            {
--- 6247,6257 ----
          // compile regular expression
          try 
            {
!           regexp = regcomp (strRegexp, (Alias_item->bIgnoreCase ? PCRE_CASELESS : 0)
! #if ALIASES_USE_UTF8
!                              | (m_bUTF_8 ? PCRE_UTF8 : 0)
! #endif // ALIASES_USE_UTF8
!               );
            }   // end of try
          catch(CException* e)
            {
Index: prefspropertypages.cpp
===================================================================
RCS file: /cvs/mushclient/prefspropertypages.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** prefspropertypages.cpp	9 Aug 2007 01:21:04 -0000	1.105
--- prefspropertypages.cpp	3 Jun 2008 03:50:03 -0000	1.106
***************
*** 2706,2712 ****
      strRegexp = ConvertToRegularExpression (alias_item->name);
  
    alias_item->regexp = regcomp (strRegexp,
!                                   (alias_item->bIgnoreCase  ? PCRE_CASELESS : 0) | (m_doc->m_bUTF_8 ? PCRE_UTF8 : 0));
  
  // NB - also see MapDlg.cpp for alias processing
  
--- 2706,2716 ----
      strRegexp = ConvertToRegularExpression (alias_item->name);
  
    alias_item->regexp = regcomp (strRegexp,
!                                   (alias_item->bIgnoreCase  ? PCRE_CASELESS : 0)
! #if ALIASES_USE_UTF8
!                                   | (m_pDoc->m_bUTF_8 ? PCRE_UTF8 : 0)
! #endif // ALIASES_USE_UTF8
!                                   );
  
  // NB - also see MapDlg.cpp for alias processing
  
Index: scriptingoptions.cpp
===================================================================
RCS file: /cvs/mushclient/scriptingoptions.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** scriptingoptions.cpp	25 Jul 2007 05:02:27 -0000	1.51
--- scriptingoptions.cpp	3 Jun 2008 03:50:03 -0000	1.52
***************
*** 71,77 ****
  {"ctrl_p_goes_to_previous_command",     false, O(m_bCtrlPGoesToPreviousCommand)},       
  {"ctrl_z_goes_to_end_of_buffer",        false, O(m_bCtrlZGoesToEndOfBuffer)},
  {"custom_16_is_default_colour",         false, O(m_bCustom16isDefaultColour), 0, 0, OPT_UPDATE_VIEWS},           
! {"detect_pueblo",                       true,  O(m_bPueblo)},                           
  {"disable_compression",                 false, O(m_bDisableCompression)},               
  {"display_my_input",                    true,  O(m_display_my_input)},
  {"double_click_inserts",                false, O(m_bDoubleClickInserts)},               
--- 71,78 ----
  {"ctrl_p_goes_to_previous_command",     false, O(m_bCtrlPGoesToPreviousCommand)},       
  {"ctrl_z_goes_to_end_of_buffer",        false, O(m_bCtrlZGoesToEndOfBuffer)},
  {"custom_16_is_default_colour",         false, O(m_bCustom16isDefaultColour), 0, 0, OPT_UPDATE_VIEWS},           
! {"detect_pueblo",                       true,  O(m_bPueblo)},
! {"do_not_show_outstanding_lines",       false, O(m_bDoNotShowOutstandingLines)},                                      
  {"disable_compression",                 false, O(m_bDisableCompression)},               
  {"display_my_input",                    true,  O(m_display_my_input)},
  {"double_click_inserts",                false, O(m_bDoubleClickInserts)},               
Index: stdafx.h
===================================================================
RCS file: /cvs/mushclient/stdafx.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -c -r1.104 -r1.105
*** stdafx.h	9 Aug 2007 01:21:04 -0000	1.104
--- stdafx.h	3 Jun 2008 03:50:03 -0000	1.105
***************
*** 818,821 ****
  
  // strings marked with this macro are to be translated in the localization file
  // however not at runtime (ie. they are in a table, and the table lookup will be translated)
! #define Translate_NoOp(string) (string)
\ No newline at end of file
--- 818,824 ----
  
  // strings marked with this macro are to be translated in the localization file
  // however not at runtime (ie. they are in a table, and the table lookup will be translated)
! #define Translate_NoOp(string) (string)
! 
! #define ALIASES_USE_UTF8 0
! 
Index: xml_load_world.cpp
===================================================================
RCS file: /cvs/mushclient/xml_load_world.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** xml_load_world.cpp	12 Jun 2007 04:02:02 -0000	1.90
--- xml_load_world.cpp	3 Jun 2008 03:50:03 -0000	1.91
***************
*** 1451,1458 ****
  
      try
        {
!       a->regexp = regcomp (strRegexp, (a->bIgnoreCase ? PCRE_CASELESS : 0) |
!         (m_bUTF_8 ? PCRE_UTF8 : 0)
          );
        }
      // catch regexp error and rethrow with proper message
--- 1451,1460 ----
  
      try
        {
!       a->regexp = regcomp (strRegexp, (a->bIgnoreCase ? PCRE_CASELESS : 0)
! #if ALIASES_USE_UTF8
!                                   | (m_bUTF_8 ? PCRE_UTF8 : 0)
! #endif // ALIASES_USE_UTF8
          );
        }
      // catch regexp error and rethrow with proper message
Index: install/readme.txt
===================================================================
RCS file: /cvs/mushclient/install/readme.txt,v
retrieving revision 1.164
retrieving revision 1.165
diff -c -r1.164 -r1.165
*** install/readme.txt	27 May 2008 01:51:41 -0000	1.164
--- install/readme.txt	3 Jun 2008 03:50:03 -0000	1.165
***************
*** 1,7 ****
! MUSHclient version 4.25
  =======================
  
! Tuesday, 27th May 2008
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/
--- 1,7 ----
! MUSHclient version 4.26
  =======================
  
! Tuesday, 3rd June 2008
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/