diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | doc/Cancel.3 | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 8 |
3 files changed, 24 insertions, 5 deletions
@@ -1,3 +1,20 @@ +2009-11-01 Joe Mistachkin <joe@mistachkin.com> + + * doc/Cancel.3: Minor cosmetic fixes. + * win/makefile.vc: Make htmlhelp target work again. An extra set of + double quotes around the definition of the HTML help compiler tool + appears to be required. Previously, there was one set of double + quotes around the definition of the tool and one around the actual + invocation. This led to confusion because it was the only such tool + path to include double quotes around its invocation. Also, it was + somewhat inflexible in the event that somebody needed to override the + tool command to include arguments. Therefore, even though it may + look "wrong", there are now two double quotes on either side of the + tool path definition. This fixes the problem that currently prevents + the htmlhelp target from building and maintains flexibility in case + somebody needs to override it via the command line or an environment + variable. + 2009-11-01 Joe English <jenglish@users.sourceforge.net> * doc/Eval.3, doc/Cancel.3: Move TIP#285 routines out of diff --git a/doc/Cancel.3 b/doc/Cancel.3 index 8c95e07..506b0fe 100644 --- a/doc/Cancel.3 +++ b/doc/Cancel.3 @@ -1,9 +1,10 @@ +'\" '\" Copyright (c) 2006-2008 Joe Mistachkin. '\" '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: Cancel.3,v 1.1 2009/11/01 18:15:40 jenglish Exp $ +'\" RCS: @(#) $Id: Cancel.3,v 1.2 2009/11/02 00:04:48 mistachkin Exp $ '\" .so man.macros .TH Tcl_Cancel 3 8.6 Tcl "Tcl Library Procedures" @@ -31,6 +32,7 @@ Currently, reserved for future use. It should be set to NULL. .BE .SH DESCRIPTION +.PP \fBTcl_CancelEval\fR cancels or unwinds the script in progress soon after the next invocation of asynchronous handlers, causing \fBTCL_ERROR\fR to be the return code for that script. This function is thread-safe and may be diff --git a/win/makefile.vc b/win/makefile.vc index 6b525021..3bcbbd1 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -13,7 +13,7 @@ # Copyright (c) 2003-2008 Pat Thoyts. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.201 2009/09/26 21:42:05 dkf Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.202 2009/11/02 00:04:48 mistachkin Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -719,7 +719,7 @@ gentommath_h: # NOTE: you can define HHC on the command-line to override this !ifndef HHC -HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe" +HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe"" !endif HTMLDIR=$(ROOT)\html HTMLBASE=TclTk$(VERSION) @@ -730,7 +730,7 @@ htmlhelp: chmsetup $(CHMFILE) $(CHMFILE): $(DOCDIR)\* @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl - @echo Compiling html help project + @echo Compiling HTML help project @$(HHC) <<$(HHPFILE) >NUL [OPTIONS] Compatibility=1.1 or later @@ -815,7 +815,7 @@ $(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\* install-docs: !if exist("$(CHMFILE)") - @echo Installing compiled html help + @echo Installing compiled HTML help @$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\" !endif !if exist("$(HELPFILE)") |