From cea941ce42b5d550489367608dd1ac4401151c97 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Tue, 23 Jun 2015 17:07:21 -0400
Subject: sublime plugin: make "local" work by wrapping in anon function

---
 plugins/sublime/sublime.plugin.zsh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'plugins/sublime')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 22cf98227..8934783c9 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,5 +1,9 @@
+# Sublime Text Aliases
+
+() {
+
 if [[ "$OSTYPE" == linux* ]]; then
-    local _sublime_linux_paths > /dev/null 2>&1
+    local _sublime_linux_paths _sublime_path
     _sublime_linux_paths=(
         "$HOME/bin/sublime_text"
         "/opt/sublime_text/sublime_text"
@@ -19,9 +23,8 @@ if [[ "$OSTYPE" == linux* ]]; then
             break
         fi
     done
-
 elif  [[ "$OSTYPE" = darwin* ]]; then
-    local _sublime_darwin_paths > /dev/null 2>&1
+    local _sublime_darwin_paths _sublime_path
     _sublime_darwin_paths=(
         "/usr/local/bin/subl"
         "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
@@ -38,10 +41,9 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
             break
         fi
     done
-
 elif [[ "$OSTYPE" = 'cygwin' ]]; then
-    local _sublime_cygwin_paths > /dev/null 2>&1
-    _sublime_cygwin_paths=(
+    local sublime_cygwin_paths _sublime_path
+    sublime_cygwin_paths=(
         "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
         "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
     )
@@ -52,9 +54,10 @@ elif [[ "$OSTYPE" = 'cygwin' ]]; then
             break
         fi
     done
-
 fi
 
+}
+
 alias stt='st .'
 
 find_project()
-- 
cgit v1.2.3-70-g09d2


From cf5ccf06a0ac5a00addc23ecfcc3dd2b2f93ea2d Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 23 Apr 2018 13:06:49 +0200
Subject: [subl] Fix local variable definition

Fixes #6757
---
 plugins/sublime/sublime.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/sublime')

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 8934783c9..f5bb070ab 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -3,7 +3,7 @@
 () {
 
 if [[ "$OSTYPE" == linux* ]]; then
-    local _sublime_linux_paths _sublime_path
+    local _sublime_linux_paths
     _sublime_linux_paths=(
         "$HOME/bin/sublime_text"
         "/opt/sublime_text/sublime_text"
@@ -24,7 +24,7 @@ if [[ "$OSTYPE" == linux* ]]; then
         fi
     done
 elif  [[ "$OSTYPE" = darwin* ]]; then
-    local _sublime_darwin_paths _sublime_path
+    local _sublime_darwin_paths
     _sublime_darwin_paths=(
         "/usr/local/bin/subl"
         "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
@@ -42,7 +42,7 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
         fi
     done
 elif [[ "$OSTYPE" = 'cygwin' ]]; then
-    local sublime_cygwin_paths _sublime_path
+    local sublime_cygwin_paths
     sublime_cygwin_paths=(
         "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
         "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
-- 
cgit v1.2.3-70-g09d2