html/template: make Must work

Fixes #2545.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5475054

diff --git a/src/pkg/html/template/template.go b/src/pkg/html/template/template.go
index 02e33e125ab336cf8a77b60f20aab7b3a0dee929..4657f6ec5236ab4a3a6fb4d0f609c611cd7bd430 100644 (file)
--- a/src/pkg/html/template/template.go
+++ b/src/pkg/html/template/template.go
@@ -183,7 +183,9 @@ func (t *Template) Lookup(name string) *Template {
 
 // Must panics if err is non-nil in the same way as template.Must.
 func Must(t *Template, err error) *Template {
-       t.text = template.Must(t.text, err)
+       if err != nil {
+               panic(err)
+       }
        return t
 }