Applied Matt's patches for the addition of four new client

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index 78fd4f5c6168549903da096e375c1c68ae3212a6..a575103175fcf83def5a683f961da232199b7195 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -985,8 +985,11 @@ char *cmd_expand(char *strbuf, int mode)
        for (a = 0; a < strlen(exp); ++a) {
                if (strbuf[a] == '&') {
 
+                       /* dont echo these non mnemonic command keys */
+                       int noecho = strbuf[a+1] == '<' || strbuf[a+1] == '>' || strbuf[a+1] == '+' || strbuf[a+1] == '-';
+
                        if (mode == 0) {
-                               strcpy(&exp[a], &exp[a + 1]);
+                               strcpy(&exp[a], &exp[a + 1 + noecho]);
                        }
                        if (mode == 1) {
                                exp[a] = '<';