3e30b4d2d1c7753b12316d5dec70448277978e8a

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #2922 from ncanceill/easymerge

Easy-to-Merge via @ncanceill... our hero!

Diff

 1diff --git a/cache/.easter-egg b/cache/.easter-egg
 2new file mode 100644
 3index 0000000000000000000000000000000000000000..4b6164edb73afb30641afba795954a22564a299a
 4--- /dev/null
 5+++ b/cache/.easter-egg
 6@@ -0,0 +1,4 @@
 7+This file is only here so that Git will keep a cache directory as .gitignore is ignoring all the files within it.
 8+
 9+Feel free to add love notes for people here.
10+
11diff --git a/plugins/gem/_gem b/plugins/gem/_gem
12index 25967f1e7a8e9aacd1e6c08844830a916e2b2fbe..92feebe953d08fb42b9c4c7677b709f3da761e02 100644
13--- a/plugins/gem/_gem
14+++ b/plugins/gem/_gem
15@@ -59,6 +59,8 @@ case "$words[1]" in
16   build)
17     _files -g "*.gemspec"
18     ;;
19+  install)
20+    _files ;;
21   list)
22       if [[ "$state" == forms ]]; then
23         _gem_installed
24diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
25index c665a9ee1b0d39282952468b2e993b3557c39018..2568414320a79140ab387ad4fe788d8cd78367fd 100644
26--- a/plugins/git-prompt/gitstatus.py
27+++ b/plugins/git-prompt/gitstatus.py
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env python2
30+#!/usr/bin/env python
31 # -*- coding: UTF-8 -*-
32 from subprocess import Popen, PIPE
33 import re
34diff --git a/plugins/wd/LICENSE b/plugins/wd/LICENSE
35new file mode 100644
36index 0000000000000000000000000000000000000000..8caa6c6ce5fdcd447eb3efbb2449114911bbcab3
37--- /dev/null
38+++ b/plugins/wd/LICENSE
39@@ -0,0 +1,21 @@
40+The MIT License (MIT)
41+
42+Copyright (c) 2014 Markus Færevaag
43+
44+Permission is hereby granted, free of charge, to any person obtaining a copy
45+of this software and associated documentation files (the "Software"), to deal
46+in the Software without restriction, including without limitation the rights
47+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
48+copies of the Software, and to permit persons to whom the Software is
49+furnished to do so, subject to the following conditions:
50+
51+The above copyright notice and this permission notice shall be included in all
52+copies or substantial portions of the Software.
53+
54+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
55+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
56+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
57+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
58+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
59+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
60+SOFTWARE.
61diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
62index 94945bd48d0caea8fcd56ac57493cf2e66f50634..3f44b99c637d5bd25f3e7d19e73952f9c1e84551 100644
63--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
64+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
65@@ -1,10 +1,11 @@
66 # reload zshrc
67 function src()
68 {
69+  local cache="$ZSH/cache"
70   autoload -U compinit zrecompile
71-  compinit -d "$ZSH/cache/zcomp-$HOST"
72+  compinit -d "$cache/zcomp-$HOST"
73 
74-  for f in ~/.zshrc "$ZSH/cache/zcomp-$HOST"; do
75+  for f in ~/.zshrc "$cache/zcomp-$HOST"; do
76     zrecompile -p $f && command rm -f $f.zwc.old
77   done
78