summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Completion/Zsh/Context/_subscript5
-rw-r--r--Src/Modules/db_gdbm.c2
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ea1e497c0..bfb0ff986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-30 Peter Stephenson <pws@csr.com>
+
+ * unposted: Completion/Zsh/Context/_subscript: recognise ~[...]
+ after = and :, too.
+
+ * 25777: Src/Modules/db_gdbm.c: argument to gdbmsetfn.
+
2008-09-29 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 25775: Src/exec.c, Src/prompt.c, Src/signals.c, Src/zsh.h:
@@ -844,7 +851,7 @@
2008-06-30 Peter Stephenson <p.w.stephenson@ntlworld.com>
- * 25258: Completion/Unix/Type/_path_files: donʼt
+ * 25258: Completion/Unix/Type/_path_files: don't
use -M option with -U.
2008-06-30 Peter Stephenson <pws@csr.com>
diff --git a/Completion/Zsh/Context/_subscript b/Completion/Zsh/Context/_subscript
index cef0a46e5..899845036 100644
--- a/Completion/Zsh/Context/_subscript
+++ b/Completion/Zsh/Context/_subscript
@@ -14,10 +14,11 @@ compset -P '\(([^\(\)]|\(*\))##\)' # remove subscript flags
# the stuff inside the square brackets; we need to find out what's
# outside. We ought to check for quoting, really, but given we've
# got to the subscript code " ~[" is pretty likely to be a dynamic
-# name expansion.
+# name expansion. Also expand in anything that looks like an assignment
+# or colon list.
integer pos=$((CURSOR+1))
while [[ pos > 1 && $BUFFER[pos-1] != '[' ]]; do (( pos-- )); done
-if [[ $BUFFER[1,pos] = *[[:space:]]##\~\[ ]]; then
+if [[ $BUFFER[1,pos] = *[[:space:]:=]##\~\[ ]]; then
_dynamic_directory_name
elif [[ "$PREFIX" = :* ]]; then
_wanted characters expl 'character class' \
diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c
index 2b06719c6..bdbbe19d8 100644
--- a/Src/Modules/db_gdbm.c
+++ b/Src/Modules/db_gdbm.c
@@ -135,7 +135,7 @@ gdbmgetfn(Param pm)
/**/
static void
-gdbmsetfn(Param pm, char **val)
+gdbmsetfn(Param pm, char *val)
{
datum key, content;
int ret;