summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-12 08:01:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-12 08:01:53 (GMT)
commit31d3de9d3e64ea54a0af4ab3ff9a23c6b42b033a (patch)
treeac6c3ee23582c34724c833265d42b1064fe867c7
parentb869ccc2028bba15e252f9f8dafcd15c105a2da9 (diff)
parentd9d6ec203d956036ba912a1fdf6fbba4ae449871 (diff)
downloadtcl-31d3de9d3e64ea54a0af4ab3ff9a23c6b42b033a.zip
tcl-31d3de9d3e64ea54a0af4ab3ff9a23c6b42b033a.tar.gz
tcl-31d3de9d3e64ea54a0af4ab3ff9a23c6b42b033a.tar.bz2
merge trunk.
<p>doc fix
-rw-r--r--doc/load.n4
-rw-r--r--unix/tclLoadNext.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/load.n b/doc/load.n
index 7c2687e..350a2ae 100644
--- a/doc/load.n
+++ b/doc/load.n
@@ -13,9 +13,9 @@ load \- Load machine code and initialize new commands
.SH SYNOPSIS
\fBload\fR ?\fB\-global\fR? ?\fB\-lazy\fR? ?\fB\-\-\fR? \fIfileName\fR
.br
-\fBload ?\fB\-global\fR? ?\fB\-lazy\fR? ?\fB\-\-\fR? \fIfileName packageName\fR
+\fBload\fR ?\fB\-global\fR? ?\fB\-lazy\fR? ?\fB\-\-\fR? \fIfileName packageName\fR
.br
-\fBload ?\fB\-global\fR? ?\fB\-lazy\fR? ?\fB\-\-\fR? \fIfileName packageName interp\fR
+\fBload\fR ?\fB\-global\fR? ?\fB\-lazy\fR? ?\fB\-\-\fR? \fIfileName packageName interp\fR
.BE
.SH DESCRIPTION
.PP
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 484b1d6..eb0affa 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -135,7 +135,7 @@ FindSymbol(
{
Tcl_PackageInitProc *proc = NULL;
- if (symbol) {
+ if (symbol) {
char sym[strlen(symbol) + 2];
sym[0] = '_';