diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Modules/attr.c | 6 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Src/Modules/attr.c b/Src/Modules/attr.c index 78c1104a9..f4bd04982 100644 --- a/Src/Modules/attr.c +++ b/Src/Modules/attr.c @@ -27,12 +27,12 @@ * */ -#include "attr.mdh" -#include "attr.pro" - #include <sys/types.h> #include <sys/xattr.h> +#include "attr.mdh" +#include "attr.pro" + static ssize_t xgetxattr(const char *path, const char *name, void *value, size_t size, int symlink) { diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index b87b99b00..97bdcc020 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1184,11 +1184,12 @@ get_comp_string(void) * considering a new command. Consequently, although this looks * relatively harmless by itself, it's probably incomplete. */ - lincmd = (incmdpos && !ins && !incond) || - (oins == 2 && wordpos == 2) || - (ins == 3 && wordpos == 1) || - (cmdtok == NULLTOK && !incond); linredir = (inredir && !ins); + lincmd = !inredir && + ((incmdpos && !ins && !incond) || + (oins == 2 && wordpos == 2) || + (ins == 3 && wordpos == 1) || + (cmdtok == NULLTOK && !incond)); oins = ins; /* Get the next token. */ if (linarr) |