summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/functions.zsh3
-rw-r--r--lib/git.zsh2
-rw-r--r--lib/history.zsh3
-rw-r--r--lib/misc.zsh5
-rw-r--r--lib/prompt_info_functions.zsh2
-rw-r--r--lib/spectrum.zsh2
-rw-r--r--lib/termsupport.zsh2
7 files changed, 9 insertions, 10 deletions
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 1066fed57..4ef8920f6 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -51,8 +51,7 @@ function open_command() {
# 1 if it does not exist
#
function alias_value() {
- alias "$1" | sed "s/^$1='\(.*\)'$/\1/"
- test $(alias "$1")
+ (( $+aliases[$1] )) && echo $aliases[$1]
}
#
diff --git a/lib/git.zsh b/lib/git.zsh
index b55b762d7..b92373153 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -185,7 +185,7 @@ function git_prompt_status() {
# Outputs -1, 0, or 1 if the installed version is less than, equal to, or
# greater than the input version, respectively.
function git_compare_version() {
- local INPUT_GIT_VERSION INSTALLED_GIT_VERSION
+ local INPUT_GIT_VERSION INSTALLED_GIT_VERSION i
INPUT_GIT_VERSION=(${(s/./)1})
INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null))
INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]})
diff --git a/lib/history.zsh b/lib/history.zsh
index 7d4e59d00..62e02648b 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -23,7 +23,8 @@ case $HIST_STAMPS in
"mm/dd/yyyy") alias history='omz_history -f' ;;
"dd.mm.yyyy") alias history='omz_history -E' ;;
"yyyy-mm-dd") alias history='omz_history -i' ;;
- *) alias history='omz_history' ;;
+ "") alias history='omz_history' ;;
+ *) alias history="omz_history -t '$HIST_STAMPS'" ;;
esac
## History file configuration
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 3052b7710..f45c10757 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -18,9 +18,8 @@ fi
## jobs
setopt long_list_jobs
-## pager
-env_default PAGER 'less'
-env_default LESS '-R'
+env_default 'PAGER' 'less'
+env_default 'LESS' '-R'
## super user alias
alias _='sudo'
diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 335c02a3d..1d5c23e41 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -12,7 +12,7 @@
# Real implementations will be used when the respective plugins are loaded
function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
- virtualenv_prompt_info {
+ virtualenv_prompt_info jenv_prompt_info {
return 1
}
diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 87092d8ae..312ab2248 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -1,7 +1,7 @@
#! /bin/zsh
# A script to make using 256 colors in zsh less painful.
# P.C. Shyamshankar <sykora@lucentbeing.com>
-# Copied from http://github.com/sykora/etc/blob/master/zsh/functions/spectrum/
+# Copied from https://github.com/sykora/etc/blob/master/zsh/functions/spectrum/
typeset -AHg FX FG BG
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 871ab28df..87d55ee89 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -80,7 +80,7 @@ preexec_functions+=(omz_termsupport_preexec)
# Keep Apple Terminal.app's current working directory updated
-# Based on this answer: http://superuser.com/a/315029
+# Based on this answer: https://superuser.com/a/315029
# With extra fixes to handle multibyte chars and non-UTF-8 locales
if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then