From 12086593a432d754d9c28bf6a66a1196e79877a3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 29 Jun 2018 20:20:26 +0200
Subject: open_command: simplify code

---
 lib/functions.zsh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 7410ae645..f448dbce8 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -16,9 +16,6 @@ function take() {
 }
 
 function open_command() {
-  emulate -L zsh
-  setopt shwordsplit
-
   local open_cmd
 
   # define the open command
@@ -36,9 +33,9 @@ function open_command() {
 
   # don't use nohup on OSX
   if [[ "$OSTYPE" == darwin* ]]; then
-    $open_cmd "$@" &>/dev/null
+    ${=open_cmd} "$@" &>/dev/null
   else
-    nohup $open_cmd "$@" &>/dev/null
+    nohup ${=open_cmd} "$@" &>/dev/null
   fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From f898ada8e3d25c7d1ea309b487711a4e0a2c07b6 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 29 Jun 2018 20:20:56 +0200
Subject: open_command: fix and improve command for WSL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add double quotes to command so that the next argument isn't
  interpreted as the title for the start command.

- If the first argument is a valid path, convert it to Windows path
  notation. If `wslpath` fails—because it's a path from inside WSL,
  which cannot be converted to Windows path notation— fail with an
  error code.

  This last circumstance will show an error like so:

    wslpath: path: Result not representable
---
 lib/functions.zsh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/functions.zsh b/lib/functions.zsh
index f448dbce8..dd8311611 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -22,9 +22,10 @@ function open_command() {
   case "$OSTYPE" in
     darwin*)  open_cmd='open' ;;
     cygwin*)  open_cmd='cygstart' ;;
-    linux*)   [[ $(uname -a) =~ "Microsoft" ]] && \
-                open_cmd='cmd.exe /c start' || \
-                open_cmd='xdg-open' ;;
+    linux*)   ! [[ $(uname -a) =~ "Microsoft" ]] && open_cmd='xdg-open' || {
+                open_cmd='cmd.exe /c start ""'
+                [[ -e "$1" ]] && { 1="$(wslpath -w "${1:a}")" || return 1 }
+              } ;;
     msys*)    open_cmd='start ""' ;;
     *)        echo "Platform $OSTYPE not supported"
               return 1
-- 
cgit v1.2.3-70-g09d2


From 55ab532e506521069afba327432132c096885c29 Mon Sep 17 00:00:00 2001
From: Yuri Parsons <yuri@ninjakitty.net>
Date: Sun, 1 Jul 2018 22:43:45 +0200
Subject: Don't correct cp commands (#4636)

---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 3e1415a0b..c635236b5 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,4 +1,5 @@
 if [[ "$ENABLE_CORRECTION" == "true" ]]; then
+  alias cp='nocorrect cp'
   alias ebuild='nocorrect ebuild'
   alias gist='nocorrect gist'
   alias heroku='nocorrect heroku'
-- 
cgit v1.2.3-70-g09d2


From 7cba6bb038fb699c44532992ee75e836b6576ac7 Mon Sep 17 00:00:00 2001
From: sam-lunt <samuel.j.lunt@gmail.com>
Date: Mon, 2 Jul 2018 10:05:24 -0500
Subject: Enable passing multiple directories to take (#6900)

* enable passing multiple directories to take

* Update take function

Do not call cd if mkdir fails
---
 lib/functions.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/functions.zsh b/lib/functions.zsh
index dd8311611..1066fed57 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -11,8 +11,7 @@ function upgrade_oh_my_zsh() {
 }
 
 function take() {
-  mkdir -p $1
-  cd $1
+  mkdir -p $@ && cd ${@:$#}
 }
 
 function open_command() {
-- 
cgit v1.2.3-70-g09d2