projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zshrc: do not fall back to LANG en_US.iso885915 if it is unset
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
4734ecb
..
7773ed9
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-448,6
+448,7
@@
xunfunction() {
# this allows us to stay in sync with grml's zshrc and put own
# modifications in ~/.zshrc.local
zrclocal() {
# this allows us to stay in sync with grml's zshrc and put own
# modifications in ~/.zshrc.local
zrclocal() {
+ xsource "/etc/zsh/zshrc.local"
xsource "${HOME}/.zshrc.local"
return 0
}
xsource "${HOME}/.zshrc.local"
return 0
}
@@
-457,8
+458,7
@@
zrclocal() {
# locale setup {{{
xsource "/etc/default/locale"
# locale setup {{{
xsource "/etc/default/locale"
-export LANG=${LANG:-en_US.iso885915}
-for var in LC_ALL LC_MESSAGES ; do
+for var in LANG LC_ALL LC_MESSAGES ; do
[[ -n ${(P)var} ]] && export $var
done
[[ -n ${(P)var} ]] && export $var
done
@@
-1999,7
+1999,7
@@
preexec () {
# adjust title of xterm
[[ ${NOTITLE} -gt 0 ]] && return 0
case $TERM in
# adjust title of xterm
[[ ${NOTITLE} -gt 0 ]] && return 0
case $TERM in
- (xterm*|rxvt)
+ (xterm*|rxvt
*
)
print -Pn "\e]0;%n@%m: $1\a"
;;
esac
print -Pn "\e]0;%n@%m: $1\a"
;;
esac
@@
-2960,10
+2960,6
@@
exit 0;
for color in BLUE RED GREEN CYAN YELLOW MAGENTA WHITE ; unset $color
# }}}
for color in BLUE RED GREEN CYAN YELLOW MAGENTA WHITE ; unset $color
# }}}
-# source another config file if present {{{
-xsource "/etc/zsh/zshrc.local"
-# }}}
-
# "persistent history" {{{
# just write important commands you always need to ~/.important_commands
if [[ -r ~/.important_commands ]] ; then
# "persistent history" {{{
# just write important commands you always need to ~/.important_commands
if [[ -r ~/.important_commands ]] ; then
@@
-3032,11
+3028,6
@@
alias CO="./configure"
#a2# Execute \kbd{./configure --help}
alias CH="./configure --help"
#a2# Execute \kbd{./configure --help}
alias CH="./configure --help"
-# http://conkeror.mozdev.org/
-# TODO: I think this should be removed, as conkeror is not a simple extension anymore
-#a2# Run a keyboard driven firefox
-alias conkeror='firefox -chrome chrome://conkeror/content'
-
# arch/tla stuff
if check_com -c tla ; then
#a2# Execute \kbd{tla what-changed --diffs | less}
# arch/tla stuff
if check_com -c tla ; then
#a2# Execute \kbd{tla what-changed --diffs | less}