[Cvs-cvs] Changes to ccvs/src/difflib.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/difflib.c
diff -u ccvs/src/difflib.c:1.1.2.2 ccvs/src/difflib.c:1.1.2.3
--- ccvs/src/difflib.c:1.1.2.2  Wed Nov 30 05:04:14 2005
+++ ccvs/src/difflib.c  Thu Dec  1 01:48:59 2005
@@ -189,6 +189,7 @@
 {
     char *diffout;
     int retval;
+    bool save_noexec;
 
     /* Remember that the first word in the `call_diff_setup' string is used
        now only for diagnostic messages -- CVS no longer forks to run
@@ -217,7 +218,10 @@
     else if (retval == 2)
        error (1, 0, "diff3 failed.");
 
+    save_noexec = noexec;
+    noexec = false;
     copy_file (diffout, dest);
+    noexec = save_noexec;
 
     /* Clean up. */
     {