summaryrefslogtreecommitdiff
path: root/Functions/Misc
diff options
context:
space:
mode:
authorFrank Terbeck <ft@bewatermyfriend.org>2011-06-02 10:50:35 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2011-06-02 10:50:35 +0200
commit2438a0e95aa448f0aeda468752444306b44fe7d0 (patch)
tree8477e9c6af360f6a89af13e8cb5f2a4f9c1cff2c /Functions/Misc
parentb495ba1e5a3ab1396844490ad8cad17dec23d6c1 (diff)
parent21266db1d9ae433bf1dcb196a4e258c00541b599 (diff)
downloadzsh-2438a0e95aa448f0aeda468752444306b44fe7d0.tar.gz
zsh-2438a0e95aa448f0aeda468752444306b44fe7d0.zip
Merge commit 'zsh-4.3.12' into debian
Diffstat (limited to 'Functions/Misc')
-rw-r--r--Functions/Misc/add-zsh-hook7
-rw-r--r--Functions/Misc/colors2
-rw-r--r--Functions/Misc/sticky-note2
3 files changed, 8 insertions, 3 deletions
diff --git a/Functions/Misc/add-zsh-hook b/Functions/Misc/add-zsh-hook
index aedc1e754..c49688643 100644
--- a/Functions/Misc/add-zsh-hook
+++ b/Functions/Misc/add-zsh-hook
@@ -1,6 +1,6 @@
# Add to HOOK the given FUNCTION.
# HOOK is one of chpwd, precmd, preexec, periodic, zshaddhistory,
-# zshexit (the _functions subscript is not required).
+# zshexit, zsh_directory_name (the _functions subscript is not required).
#
# With -d, remove the function from the hook instead; delete the hook
# variable if it is empty.
@@ -15,7 +15,10 @@
emulate -L zsh
local -a hooktypes
-hooktypes=(chpwd precmd preexec periodic zshaddhistory zshexit)
+hooktypes=(
+ chpwd precmd preexec periodic zshaddhistory zshexit
+ zsh_directory_name
+)
local opt
local -a autoopts
diff --git a/Functions/Misc/colors b/Functions/Misc/colors
index bef93c8c3..027ca9a14 100644
--- a/Functions/Misc/colors
+++ b/Functions/Misc/colors
@@ -1,6 +1,8 @@
# Put standard ANSI color codes in shell parameters for easy use.
# Note that some terminals do not support all combinations.
+emulate -L zsh
+
typeset -Ag color colour
color=(
diff --git a/Functions/Misc/sticky-note b/Functions/Misc/sticky-note
index cfe9ea684..efe5ec1eb 100644
--- a/Functions/Misc/sticky-note
+++ b/Functions/Misc/sticky-note
@@ -19,7 +19,7 @@
#
# Otherwise, invoke the line editor with the previous notes available
# as an editor history. Two quick taps on the return/enter key finish
-# the note, or you can use use ^X^W as usual (ZZ in vicmd mode).
+# the note, or you can use ^X^W as usual (ZZ in vicmd mode).
# The application is configured by three zstyles, all using the context
# ":sticky-note". The first two styles are "notefile" and "maxnotes"