Merge branch 'development'

MUSHclient/AardwolfPackageChanges.txt

@@ -1,5 +1,12 @@
 Aardwolf Client Package Major Changes List
 
+r1900 snapshot:
+- bug fix: Copying selected text in the communication log was not truncating the text properly.
+- bug fix: The group window was erroring on send to back, and other related functions.
+- bug fix: The communication log window was not capturing unechoed infos.
+- bug fix: Multiline triggers will now work in conjunction with the text substitution plugin.
+- bug fix: The GMCP mapper backups were not staying disabled if you disabled them.
+
 r1899 snapshot
 - new feature: The GMCP mapper has an option now to toggle off/on underlining of the hyperlinks.
 - bug fix: Beep on pages when chat echo is off.

MUSHclient/worlds/plugins/aard_GMCP_mapper.xml

@@ -32,7 +32,7 @@ AUTOMATIC MAPPER by Fiendish
 ** This is a very improved GMCP version of the original ATCP mapper by Nick Gammon.
 ** Some GMCP specific code added by Lasher.
 ** A few features contributed by Spartacus.
-** Many major improvements made to Nick's original design by Fiendish.
+** Many major improvements made to the original design by Fiendish.
 
 The window can be dragged to a new location by dragging the room name.
 LH-click on a room to speedwalk to it. RH-click on a room for options.
@@ -2863,6 +2863,10 @@ end
 
 function OnPluginInstall ()
    SetVariable("backup_timer_enabled", GetVariable("backup_timer_enabled") or "1")
+   if GetVariable("backup_timer_enabled") ~= "1" then
+      toggleBackups(false, true)
+   end
+
    last_auto_backup = tonumber(GetVariable("last_auto_backup")) or 0
 
    SetOption ("tool_tip_visible_time", 10000) -- prolong the tooltip display

MUSHclient/worlds/plugins/aard_channels_fiendish.xml

@@ -15,9 +15,9 @@
    requires="4.73"
    version="2.0"
    save_state="y"
-   sequence="-5000"
+   sequence="-9000"
 >
-
+<!-- sequence must be before echo plugin to capture unechoed info -->
 <description trim="y">
 USAGE:
 
@@ -1024,7 +1024,7 @@ function TextareaMoveCallback(flags, hotspot_id)
             end -- if should show highlight
 
             -- store selected area for later
-            copied_part = StylesToColours(lines[copy_line][1], startpos, endpos)
+            copied_part = StylesToColours(TruncateStyles(lines[copy_line][1], startpos, endpos))
             if copy_line ~= copy_end_line and copy_line ~= #lines and lines[copy_line+1][2] == true then
                -- only put a line break if the next line is from a different message
                copied_part = copied_part.."@w\n"

MUSHclient/worlds/plugins/aard_chat_echo.xml

@@ -12,9 +12,10 @@
    requires="4.75"
    version="1.0"
    save_state="y"
-   sequence="-9000"
+   sequence="-8999"
 >
-
+<!-- sequence must be before 0 to not double trigger world triggers -->
+<!-- sequence must be after channels plugin to capture unechoed info -->
 <description trim="y">
 USAGE:
 

MUSHclient/worlds/plugins/aard_group_monitor_gmcp.xml

@@ -736,8 +736,7 @@ end
 function leaveGroup ()
    invitations = {}
    group_built = false
-   full_group_data = {}
-   group_data = {}
+   full_group_data = nil
    SetUpHotspotsAndDraw(true)
 end
 

MUSHclient/worlds/plugins/aard_text_substitution.xml

@@ -8,8 +8,8 @@
    id="48f867c18f6ff1d6d3b52918"
    language="Lua"
    purpose="Replace text with other text"
-   date_written="2011-07-27 01:00:00"
-   requires="4.75"
+   date_written="2016-12-27 01:00:00"
+   requires="5.05"
    version="1.0"
    save_state="y"
    sequence="-10000"