linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-03 04:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/misc.zsh
View file

@ -1,4 +1,5 @@
## Load smart urls if available
<<<<<<< HEAD
# bracketed-paste-magic is known buggy in zsh 5.1.1 (only), so skip it there; see #4434
autoload -Uz is-at-least
if [[ $ZSH_VERSION != 5.1.1 ]]; then
@ -14,6 +15,18 @@ if [[ $ZSH_VERSION != 5.1.1 ]]; then
fi
done
fi
=======
for d in $fpath; do
if [[ -e "$d/url-quote-magic" ]]; then
if [[ -e "$d/bracketed-paste-magic" ]]; then
autoload -Uz bracketed-paste-magic
zle -N bracketed-paste bracketed-paste-magic
fi
autoload -U url-quote-magic
zle -N self-insert url-quote-magic
fi
done
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
## jobs
setopt long_list_jobs
@ -27,7 +40,12 @@ alias _='sudo'
alias please='sudo'
## more intelligent acking for ubuntu users
<<<<<<< HEAD
if which ack-grep &> /dev/null; then
=======
if which ack-grep &> /dev/null;
then
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
alias afind='ack-grep -il'
else
alias afind='ack -il'