Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
fe094712
Commit
fe094712
authored
Dec 20, 2011
by
Trae Robrock
Committed by
Robby Russell
Dec 02, 2012
Browse files
resolving conflict in termsupport plugin
parent
b2b77be5
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/termsupport.zsh
View file @
fe094712
...
@@ -26,7 +26,7 @@ function omz_termsupport_precmd {
...
@@ -26,7 +26,7 @@ function omz_termsupport_precmd {
function
omz_termsupport_preexec
{
function
omz_termsupport_preexec
{
emulate
-L
zsh
emulate
-L
zsh
setopt extended_glob
setopt extended_glob
local
CMD
=
${
1
[(wr)^(*=*|sudo|ssh|-*)]
}
#cmd name only, or if this is sudo or ssh, the next cmd
local
CMD
=
${
1
[(wr)^(*=*|sudo|ssh|
rake|
-*)]
}
#cmd name only, or if this is sudo or ssh, the next cmd
title
"
$CMD
"
"%100>...>
${
2
:gs/%/%%
}
%<<"
title
"
$CMD
"
"%100>...>
${
2
:gs/%/%%
}
%<<"
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment