aboutsummaryrefslogtreecommitdiff
path: root/jim.c
diff options
context:
space:
mode:
authorantirez <antirez>2006-11-05 00:26:57 +0000
committerantirez <antirez>2006-11-05 00:26:57 +0000
commit1866fd21dc3dde22ea0d787ef486bbcb99e1dcb3 (patch)
tree3419bf57cf9c49617884b3c7c04d48c308d50df7 /jim.c
parent4b6d3fdfdf99a326433896d818abce2c7e6a0110 (diff)
downloadjimtcl-1866fd21dc3dde22ea0d787ef486bbcb99e1dcb3.zip
jimtcl-1866fd21dc3dde22ea0d787ef486bbcb99e1dcb3.tar.gz
jimtcl-1866fd21dc3dde22ea0d787ef486bbcb99e1dcb3.tar.bz2
{*} as alias for {expand} like in recent Tcl 8.5 versions
Diffstat (limited to 'jim.c')
-rw-r--r--jim.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/jim.c b/jim.c
index 0fdc1a5..894251d 100644
--- a/jim.c
+++ b/jim.c
@@ -2,7 +2,7 @@
* Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
* Copyright 2005 Clemens Hintze <c.hintze@gmx.net>
*
- * $Id: jim.c,v 1.167 2006/11/02 22:38:56 antirez Exp $
+ * $Id: jim.c,v 1.168 2006/11/05 00:26:57 antirez Exp $
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -2700,7 +2700,8 @@ int SetScriptFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
if (token[end].type == JIM_TT_STR &&
token[end+1].type != JIM_TT_SEP &&
token[end+1].type != JIM_TT_EOL &&
- !strcmp(token[end].objPtr->bytes, "expand"))
+ (!strcmp(token[end].objPtr->bytes, "expand") ||
+ !strcmp(token[end].objPtr->bytes, "*")))
expand++;
}
if (token[end].type == JIM_TT_SEP)
@@ -2729,7 +2730,8 @@ int SetScriptFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
tokens = 0;
continue;
} else if (tokens == 0 && token[i].type == JIM_TT_STR &&
- !strcmp(token[i].objPtr->bytes, "expand"))
+ (!strcmp(token[i].objPtr->bytes, "expand") ||
+ !strcmp(token[i].objPtr->bytes, "*")))
{
expand++;
}
@@ -11730,7 +11732,7 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
"Copyright (c) 2005 Salvatore Sanfilippo\n",
JIM_VERSION / 100, JIM_VERSION % 100);
fprintf(interp->stdout,
- "CVS ID: $Id: jim.c,v 1.167 2006/11/02 22:38:56 antirez Exp $\n");
+ "CVS ID: $Id: jim.c,v 1.168 2006/11/05 00:26:57 antirez Exp $\n");
Jim_SetVariableStrWithStr(interp, "jim_interactive", "1");
while (1) {
char buf[1024];