diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 20 |
2 files changed, 9 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index e4a34b2a8..1d5c11828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Andrey Borzenkov <bor@zsh.org> + + * 21642: Src/Zle/compcore.c: cleanup for 21627, remove redundant + checks + 2005-08-16 Clint Adams <clint@zsh.org> * 21631: Src/Zle/compcore.c: make sure an unmetafied string is diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index f2e055493..0ae5fd3c5 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -355,15 +355,9 @@ do_completion(UNUSED(Hookdef dummy), Compldat dat) minfo.cur = NULL; if (useline < 0) { /* unmetafy line before calling ZLE */ - int remetafy = 0; - - if (zlemetaline != NULL) { - unmetafy_line(); - remetafy = 1; - } + unmetafy_line(); ret = selfinsert(zlenoargs); - if (remetafy) - metafy_line(); + metafy_line(); } goto compend; } @@ -379,15 +373,9 @@ do_completion(UNUSED(Hookdef dummy), Compldat dat) ret = !nmatches; } else if (useline < 0) { /* unmetafy line before calling ZLE */ - int remetafy = 0; - - if (zlemetaline != NULL) { - unmetafy_line(); - remetafy = 1; - } + unmetafy_line(); ret = selfinsert(zlenoargs); - if (remetafy) - metafy_line(); + metafy_line(); } else if (!useline && uselist) { /* All this and the guy only wants to see the list, sigh. */ zlemetacs = 0; |