Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

# Conflicts:
#	lib/aliases.zsh
#	lib/misc.zsh
#	lib/theme-and-appearance.zsh
#	templates/zshrc.zsh-template
#	themes/agnoster.zsh-theme
#	tools/install.sh

lib/misc.zsh

@@ -1,15 +1,42 @@
-## smart urls
-autoload -U url-quote-magic
-zle -N self-insert url-quote-magic
-
-## file rename magick
-bindkey "^[m" copy-prev-shell-word
+## Load smart urls if available
+# 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
+  for d in $fpath; do
+  	if [[ -e "$d/url-quote-magic" ]]; then
+  		if is-at-least 5.1; then
+  			autoload -Uz bracketed-paste-magic
+  			zle -N bracketed-paste bracketed-paste-magic
+  		fi
+  		autoload -Uz url-quote-magic
+  		zle -N self-insert url-quote-magic
+      break
+  	fi
+  done
+fi
 
 ## jobs
 setopt long_list_jobs
 
 ## pager. Interferes with Capistrano display.
-# export PAGER="less"
-# export LESS="-R"
+env_default PAGER 'less'
+env_default LESS '-R'
 
-export LC_CTYPE=$LANG
+# export PAGER="less"
+alias _='sudo'
+alias please='sudo'
+
+# export LESS="-R"
+if which ack-grep &> /dev/null; then
+  alias afind='ack-grep -il'
+else
+  alias afind='ack -il'
+fi
+
+# only define LC_CTYPE if undefined
+if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then
+	export LC_CTYPE=${LANG%%:*} # pick the first entry from LANG
+fi
+
+# recognize comments
+setopt interactivecomments