aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/go1.12.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/go1.12.html b/doc/go1.12.html
index fd1f1a1f4c..2591218eda 100644
--- a/doc/go1.12.html
+++ b/doc/go1.12.html
@@ -882,6 +882,12 @@ for {
<code>executing "tmpl" at <.very.deep.context.value.notpresent>: map has no entry for key "notpresent"</code>
</p>
+ <dd>
+ <p><!-- CL 143097 -->
+ If a user-defined function called by a template panics, the
+ panic is now caught and returned as an error by
+ the <code>Execute</code> or <code>ExecuteTemplate</code> method.
+ </p>
</dl><!-- text/template -->
<dl id="unsafe"><dt><a href="/pkg/unsafe/">unsafe</a></dt>