From 771381c2ce0587d825528d49244006edf770fd47 Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Sat, 25 Jul 2015 20:22:23 +0100
Subject: 35908: fix $((...)) completion in expand-or-complete widget
---
Src/Zle/zle_tricky.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'Src/Zle')
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 2104ca198..3bf8d4572 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -721,11 +721,12 @@ docomplete(int lst)
}
}
}
- if (lst == COMP_EXPAND_COMPLETE)
+ if (lst == COMP_EXPAND_COMPLETE) {
do {
/* Check if there is a parameter expression. */
for (; *q && *q != String; q++);
- if (*q == String && q[1] != Inpar && q[1] != Inbrack) {
+ if (*q == String && q[1] != Inpar && q[1] != Inparmath &&
+ q[1] != Inbrack) {
if (*++q == Inbrace) {
if (! skipparens(Inbrace, Outbrace, &q) &&
q == s + zlemetacs - wb)
@@ -769,6 +770,7 @@ docomplete(int lst)
} else
break;
} while (q < s + zlemetacs - wb);
+ }
if (lst == COMP_EXPAND_COMPLETE) {
/* If it is still not clear if we should use expansion or *
* completion and there is a `$' or a backtick in the word, *
--
cgit 1.4.1