Sync to HEAD

[bpt/emacs.git] / lisp / calc / calc-forms.el

diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 1791f03..31f9e77 100644 (file)
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1,6 +1,6 @@
 ;;; calc-forms.el --- data format conversion functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainers: D. Goel <deego@gnufans.org>
@@ -212,11 +212,11 @@
                                        ", to zone: "))))
      (if (stringp old) (setq old (math-read-expr old)))
      (if (eq (car-safe old) 'error)
-        (error "Error in expression: " (nth 1 old)))
+        (error "Error in expression: %S" (nth 1 old)))
      (if (equal new "") (setq new "local"))
      (if (stringp new) (setq new (math-read-expr new)))
      (if (eq (car-safe new) 'error)
-        (error "Error in expression: " (nth 1 new)))
+        (error "Error in expression: %S" (nth 1 new)))
      (calc-enter-result 1 "tzcv" (list 'calcFunc-tzconv
                                       (calc-top-n 1) old new)))))
 
@@ -1822,4 +1822,5 @@ and ends on the last Sunday of October at 2 a.m."
     (math-read-token)
     res))
 
+;;; arch-tag: a3d8f33b-9508-4043-8060-d02b8c9c750c
 ;;; calc-forms.el ends here