* doc/dde.n: Committed TIP #135 which changes the

	* win/tclWinDde.c:           -exact option to -force. Also cleaned
	* tests/winDde.test:         a bug in the tests.
	* library/dde/pkgIndex.tcl:  Incremented version to 1.2.5

5 files changed, 39 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 9110c81..0586df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-06-23  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
+	* doc/dde.n:                 Committed TIP #135 which changes the
+	* win/tclWinDde.c:           -exact option to -force. Also cleaned
+	* tests/winDde.test:         a bug in the tests.
+	* library/dde/pkgIndex.tcl:  Incremented version to 1.2.5	
+
 	* doc/dde.n:                 Committed TIP #120 which provides the
 	* win/tclWinDde.c:           dde package for safe interpreters.
 	* tests/winDde.test:         Incremented package version to 1.2.4
diff --git a/doc/dde.n b/doc/dde.n
index b826732..70f1db7 100644
--- a/doc/dde.n
+++ b/doc/dde.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: dde.n,v 1.10 2003/06/23 21:27:56 patthoyts Exp $
+'\" RCS: @(#) $Id: dde.n,v 1.11 2003/06/23 22:05:11 patthoyts Exp $
 '\" 
 .so man.macros
 .TH dde n 1.2 dde "Tcl Bundled Packages"
@@ -17,7 +17,7 @@ dde \- Execute a Dynamic Data Exchange command
 .sp
 \fBpackage require dde 1.2\fR
 .sp
-\fBdde \fIservername\fR ?\fI-exact\fR? ?\fI-handler proc\fR? ?\fI--\fR? ?\fItopic\fR?
+\fBdde \fIservername\fR ?\fI-force\fR? ?\fI-handler proc\fR? ?\fI--\fR? ?\fItopic\fR?
 .sp
 \fBdde \fIexecute\fR ?\fI\-async\fR? \fIservice topic \fR?\fIdata\fR?
 .sp
@@ -50,7 +50,7 @@ The \fBeval\fR and \fBexecute\fR commands accept the option \fB\-async\fR:
 The following commands are a subset of the full Dynamic Data Exchange
 set of commands.
 .TP
-\fBdde servername \fR?\fI-exact\fR? ?\fI-handler proc\fR? ?\fI--\fR? ?\fItopic\fR?
+\fBdde servername \fR?\fI-force\fR? ?\fI-handler proc\fR? ?\fI--\fR? ?\fItopic\fR?
 \fBdde servername\fR registers the interpreter as a DDE server with
 the service name \fBTclEval\fR and the topic name specified by \fItopic\fR.
 If no \fItopic\fR is given, \fBdde servername\fR returns the name
@@ -58,7 +58,7 @@ of the current topic or the empty string if it is not registered as a
 service. If the given \fItopic\fR name is already in use, then a
 suffix of the form ' #2' or ' #3' is appended to the name to make it
 unique. The command's result will be the name actually used. The
-\fI-exact\fR option is used to force registration of precisely the
+\fI-force\fR option is used to force registration of precisely the
 given \fItopic\fR name.
 .IP
 The \fI-handler\fR option specifies a tcl procedure that will be called to
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index b5d65a5..7974e3e 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,6 +1,6 @@
 if {![package vsatisfies [package provide Tcl] 8]} {return}
 if {[info exists ::tcl_platform(debug)]} {
-    package ifneeded dde 1.2.4 [list load [file join $dir tcldde12g.dll] dde]
+    package ifneeded dde 1.2.5 [list load [file join $dir tcldde12g.dll] dde]
 } else {
-    package ifneeded dde 1.2.4 [list load [file join $dir tcldde12.dll] dde]
+    package ifneeded dde 1.2.5 [list load [file join $dir tcldde12.dll] dde]
 }
diff --git a/tests/winDde.test b/tests/winDde.test
index a23650d..de8dd4f 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winDde.test,v 1.17 2003/06/23 21:27:56 patthoyts Exp $
+# RCS: @(#) $Id: winDde.test,v 1.18 2003/06/23 22:05:11 patthoyts Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -236,7 +236,7 @@ test winDde-5.4 {DDE eval bad arguments} {pcOnly} {
 test winDde-6.1 {DDE servername bad arguments} \
     -constraints pcOnly \
     -body {list [catch {dde servername -z -z -z} msg] $msg} \
-    -result {1 {wrong # args: should be "dde servername ?-exact? ?-handler proc? ?--? ?serverName?"}}
+    -result {1 {wrong # args: should be "dde servername ?-force? ?-handler proc? ?--? ?serverName?"}}
 
 test winDde-6.2 {DDE servername set name} \
     -constraints pcOnly \
@@ -245,12 +245,12 @@ test winDde-6.2 {DDE servername set name} \
 
 test winDde-6.3 {DDE servername set exact name} \
     -constraints pcOnly \
-    -body {dde servername -exact winDde-6.3} \
+    -body {dde servername -force winDde-6.3} \
     -result {winDde-6.3}
 
 test winDde-6.4 {DDE servername set exact name} \
     -constraints pcOnly \
-    -body {dde servername -exact -- winDde-6.4} \
+    -body {dde servername -force -- winDde-6.4} \
     -result {winDde-6.4}
 
 test winDde-6.5 {DDE remote servername collision} \
@@ -275,7 +275,7 @@ test winDde-6.6 {DDE remote servername collision force} \
         set child [createChildProcess $name]
     } \
     -body {
-        dde servername -exact -- $name
+        dde servername -force -- $name
     } \
     -cleanup {
         dde execute TclEval $name {set done 1}
@@ -332,7 +332,7 @@ test winDde-7.3 {DDE present in slave interp} \
     } \
     -result {{TclEval dde-interp-7.3}}
 
-test winDde-7.4 {interp name collision with -exact} \
+test winDde-7.4 {interp name collision with -force} \
     -constraints pcOnly \
     -setup {
 	interp create slave
@@ -340,14 +340,14 @@ test winDde-7.4 {interp name collision with -exact} \
 	slave eval [list dde servername -- dde-interp-7.4]
     } \
     -body {
-        dde servername -exact -- dde-interp-7.4
+        dde servername -force -- dde-interp-7.4
     } \
     -cleanup {
 	interp delete slave
     } \
     -result {dde-interp-7.4}
 
-test winDde-7.5 {interp name collision without -exact} \
+test winDde-7.5 {interp name collision without -force} \
     -constraints pcOnly \
     -setup {
 	interp create slave
@@ -546,7 +546,11 @@ test winDde-9.1 {External safe DDE check string passing} \
             set line
         } msg] $msg
     } \
-    -cleanup {dde execute TclEval $name stop ; update} \
+    -cleanup {
+        dde execute TclEval $name stop
+        update
+        file delete -force -- dde-script.tcl
+    } \
     -result {0 {set x 1}}
 
 test winDde-9.2 {External safe DDE check command evaluation} \
@@ -563,7 +567,11 @@ test winDde-9.2 {External safe DDE check command evaluation} \
             set line
         } msg] $msg
     } \
-    -cleanup {dde execute TclEval $name stop ; update} \
+    -cleanup {
+        dde execute TclEval $name stop
+        update
+        file delete -force -- dde-script.tcl
+    } \
     -result {0 1}
 
 test winDde-9.3 {External safe DDE check prefixed arguments} \
@@ -580,7 +588,11 @@ test winDde-9.3 {External safe DDE check prefixed arguments} \
             set line
         } msg] $msg
     } \
-    -cleanup {dde execute TclEval $name stop ; update} \
+    -cleanup {
+        dde execute TclEval $name stop
+        update
+        file delete -force -- dde-script.tcl
+    } \
     -result {0 {ARG {set x 1}}}
 
 # -------------------------------------------------------------------------
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index d6d36cf..9729a5f 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinDde.c,v 1.16 2003/06/23 21:27:56 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.17 2003/06/23 22:05:11 patthoyts Exp $
  */
 
 #include "tclPort.h"
@@ -71,7 +71,7 @@ static DWORD ddeInstance;       /* The application instance handle given
 				 * to us by DdeInitialize. */
 static int ddeIsServer = 0;
 
-#define TCL_DDE_VERSION "1.2.4"
+#define TCL_DDE_VERSION "1.2.5"
 #define TCL_DDE_PACKAGE_NAME "dde"
 #define TCL_DDE_SERVICE_NAME "TclEval"
 
@@ -1147,7 +1147,7 @@ Tcl_DdeObjCmd(
 	  (char *) NULL};
     static CONST char *ddeOptions[] = {"-async", (char *) NULL};
     static CONST char *ddeReqOptions[] = {"-binary", (char *) NULL};
-    static CONST char *ddeSrvOptions[] = {"-exact", "-handler", "--", (char *) NULL};
+    static CONST char *ddeSrvOptions[] = {"-force", "-handler", "--", (char *) NULL};
     int index, argIndex, i;
     int async = 0, binary = 0, exact = 0;
     int result = TCL_OK;
@@ -1209,7 +1209,7 @@ Tcl_DdeObjCmd(
 		    Tcl_ResetResult(interp);
 		    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
 			    "bad option \"", Tcl_GetString(objv[i]),
-			    "\": must be -exact, -handler or --",
+			    "\": must be -force, -handler or --",
 			    (char*)NULL);
 		    return TCL_ERROR;
 		}
@@ -1218,7 +1218,7 @@ Tcl_DdeObjCmd(
 	    if ((objc - i) > 1) {
 		Tcl_ResetResult(interp);
 		Tcl_WrongNumArgs(interp, 1, objv,
-			"servername ?-exact? ?-handler proc? ?--?"
+			"servername ?-force? ?-handler proc? ?--?"
 			" ?serverName?");
 		return TCL_ERROR;
 	    }