Merge pull request #1904 from livecode/merge-develop-8.2-31.01.2018

Merge develop 8.2 31.01.2018

Author: livecodepanos

Toolset/libraries/revidedeveloperextensionlibrary.livecodescript

@@ -652,28 +652,35 @@ end revIDEDeveloperExtensionEditScript
 
 private command __revIDEDeveloperExtensionEditLCBScript pFile
    # AL-2015-04-01: [[ Bug 15130 ]] First check to see if there is an existing association
+   local tResult
    launch document pFile
-   if the result is not empty then
+   put the result into tResult
+   if tResult is not empty then
       # AL-2015-04-01: [[ Bug 15130 ]] Check to see if the text editor preference is set
       local tEditor
       put revIDEGetPreference("LCB_textEditor") into tEditor
       if tEditor is not empty then
          launch pFile with tEditor
+         put the result into tResult
       end if
    end if
 
-   if the result is "no association" or the result is "request failed" then
+   if tResult is "no association" or tResult is "request failed" \
+         or tResult is "no such program" then
       answer file "Select text editor..."
-      if it is not empty then
-         launch pFile with it
+      put it into tEditor
+      if tEditor is not empty then
+         launch pFile with tEditor
+         put the result into tResult
+         if tResult is empty then
+            # AL-2015-04-01: [[ Bug 15130 ]] If the new text editor launch was successful, set the preference
+            revIDESetPreference "LCB_textEditor", tEditor
+         end if
       end if
    end if
 
-   if the result is not empty then
-      __revIDEDeveloperExtensionSendError "Could not open" && pFile & ":" && the result
-   else if it is not empty then
-      # AL-2015-04-01: [[ Bug 15130 ]] If the new text editor launch was successful, set the preference
-      revIDESetPreference "LCB_textEditor", it
+   if tResult is not empty and tResult is not tEditor then
+      __revIDEDeveloperExtensionSendError "Could not open" && pFile & ":" && tResult
    end if
 end __revIDEDeveloperExtensionEditLCBScript
 

Toolset/libraries/revidelibrary.8.livecodescript

@@ -5040,9 +5040,9 @@ end arrayRecurse
 private function __escapeStringAndConvertLineEndings pString
    replace "\" with "\\" in pString
    replace quote with ("\" & quote) in pString
-   replace (numToChar(13) & CR) with (CR & numToChar(13)) in pString
-   replace (CR & numToChar(13)) with CR in pString
-   replace CR with "\n" in pString
+   replace CRLF with "\n" in pString
+   replace numToCodepoint(13) with "\n" in pString
+   replace LF with "\n" in pString
    return (quote & pString & quote)
 end __escapeStringAndConvertLineEndings
 
@@ -10837,10 +10837,11 @@ private function escape pString, pConvertLineEndings
    replace quote with ("\" & quote) in pString
 
    if pConvertLineEndings is true then
-      replace (numToChar(13) & CR) with (CR & numToChar(13)) in pString
-      replace (CR & numToChar(13)) with CR in pString
+      replace CRLF with "\n" in pString
+      replace numToCodepoint(13) with "\n" in pString
    end if
-   replace CR with "\n" in pString
+   replace LF with "\n" in pString
+   replace numToCodepoint(13) with "\r" in pString
    //replace "<" with "&lt;" in pString
    //replace ">" with "&gt;" in pString
    replace tab with "\t" in pString

Toolset/palettes/standalone settings/revstandalonesettings.8.rev

@@ -330,7 +330,7 @@ function tilesArray pState
          put "lc-ipad-portrait-filled" into tArray[3]["hoverIcon"]
 
          put "Tablet Landscape" into tArray[4]["label"]
-         put "newTabletPortrait" into tArray[4]["tag"]
+         put "newTabletLandscape" into tArray[4]["tag"]
          put "lc-ipad-landscape" into tArray[4]["icon"]
          put "lc-ipad-landscape-filled" into tArray[4]["hoverIcon"]
 

Toolset/palettes/start center/revStartCenterBehavior.livecodescript

@@ -0,0 +1 @@
+# [Start Center] Ensure creating new stack with tablet Landscape button works as expected