diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 09:33:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 09:33:28 (GMT) |
| commit | 0d544fe392e3677b4d0b6f9d6a49576ab1d4c720 (patch) | |
| tree | 0cab68ff4f115f1be5154fee4ae490dd01959dcc /generic/tclFileName.c | |
| parent | 2e2c5b8626dca5378762bca79aac5ae465cbd759 (diff) | |
| parent | d46075ddff2a64199c2d655057a5706e28b7632e (diff) | |
| download | tcl-0d544fe392e3677b4d0b6f9d6a49576ab1d4c720.zip tcl-0d544fe392e3677b4d0b6f9d6a49576ab1d4c720.tar.gz tcl-0d544fe392e3677b4d0b6f9d6a49576ab1d4c720.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 4c0125f..ca4dc5b 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -1283,7 +1283,10 @@ Tcl_GlobObjCmd( } if (dir != PATH_NONE) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-directory\" cannot be used with \"-path\"", -1)); + dir == PATH_DIR + ? "\"-directory\" may only be used once" + : "\"-directory\" cannot be used with \"-path\"", + -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BADOPTIONCOMBINATION", NULL); return TCL_ERROR; @@ -1308,7 +1311,10 @@ Tcl_GlobObjCmd( } if (dir != PATH_NONE) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-path\" cannot be used with \"-directory\"", -1)); + dir == PATH_GENERAL + ? "\"-path\" may only be used once" + : "\"-path\" cannot be used with \"-dictionary\"", + -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BADOPTIONCOMBINATION", NULL); return TCL_ERROR; |