diff options
author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
---|---|---|
committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/coffee/coffee.plugin.zsh | |
parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/coffee/coffee.plugin.zsh')
-rw-r--r-- | plugins/coffee/coffee.plugin.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh index 1a7bedd87..4e98e0228 100644 --- a/plugins/coffee/coffee.plugin.zsh +++ b/plugins/coffee/coffee.plugin.zsh @@ -2,11 +2,11 @@ # compile a string of coffeescript and print to output cf () { - coffee -peb $1 + coffee -peb "$1" } # compile & copy to clipboard cfc () { - cf $1 | pbcopy + cf "$1" | pbcopy } # compile from pasteboard & print |