diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 09:49:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 09:49:41 (GMT) |
| commit | a6528d2ac354f750c06a598998de1565171c67e3 (patch) | |
| tree | 716bc43d061fee522e1fbd5775d12e0d9e52af9c /generic/tclFileName.c | |
| parent | 7b6d53fa3bc9dbcc23c4b6cad4bf7e9d30a61eaa (diff) | |
| parent | 92bd8b3a3f380903aa8f6e7221c2d4aba012a88a (diff) | |
| download | tcl-a6528d2ac354f750c06a598998de1565171c67e3.zip tcl-a6528d2ac354f750c06a598998de1565171c67e3.tar.gz tcl-a6528d2ac354f750c06a598998de1565171c67e3.tar.bz2 | |
Merge 8.7
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 eb110e0..5e3e44a 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -1285,7 +1285,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; @@ -1310,7 +1313,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; |