From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maciek Starzyk <mstarzyk@gmail.com>
Subject: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
Date: Mon, 4 Jul 2011 01:14:51 +0200
Message-ID: <CAE9aC8Ubn7ehus0_z86JpT8f+AOLWPwC2x5tzCrQCpz6o1XXzA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/alternative; boundary=90e6ba1efd2cf886a904a7326ae7
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:56911)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mstarzyk@gmail.com>) id 1QdVsL-0003c3-Q7
	for emacs-orgmode@gnu.org; Sun, 03 Jul 2011 19:14:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mstarzyk@gmail.com>) id 1QdVsK-0006Bv-Uz
	for emacs-orgmode@gnu.org; Sun, 03 Jul 2011 19:14:53 -0400
Received: from mail-iw0-f169.google.com ([209.85.214.169]:41503)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mstarzyk@gmail.com>) id 1QdVsK-0006Br-Rs
	for emacs-orgmode@gnu.org; Sun, 03 Jul 2011 19:14:52 -0400
Received: by iwn8 with SMTP id 8so5100182iwn.0
	for <emacs-orgmode@gnu.org>; Sun, 03 Jul 2011 16:14:51 -0700 (PDT)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

--90e6ba1efd2cf886a904a7326ae7
Content-Type: text/plain; charset=ISO-8859-1

This fixes regression bug introduced in
2e20cf9358deb9579ae6a22bc0deb2a772387194

diff --git a/lisp/org-table.el b/lisp/org-table.el
index a7fc863..9724dc2 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2513,13 +2513,13 @@ not overwrite the stored one."
                (error "#ERROR"))
           ev (if (numberp ev) (number-to-string ev) ev)
           ev (if duration (org-table-time-seconds-to-string
-                   (string-to-number ev))))
+                   (string-to-number ev)) ev))
       (or (fboundp 'calc-eval)
           (error "Calc does not seem to be installed, and is needed to
evaluate the formula"))
       (setq ev (calc-eval (cons form modes)
                   (if numbers 'num))
         ev (if duration (org-table-time-seconds-to-string
-                 (string-to-number ev)))))
+                 (string-to-number ev)) ev)))

     (when org-table-formula-debug
       (with-output-to-temp-buffer "*Substitution History*"


-- 
Maciek Starzyk

--90e6ba1efd2cf886a904a7326ae7
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

This fixes regression bug introduced in 2e20cf9358deb9579ae6a22bc0deb2a7723=
87194<br><br>diff --git a/lisp/org-table.el b/lisp/org-table.el<br>index a7=
fc863..9724dc2 100644<br>--- a/lisp/org-table.el<br>+++ b/lisp/org-table.el=
<br>

@@ -2513,13 +2513,13 @@ not overwrite the stored one.&quot;<br>


=A0=A0=A0=A0 =A0=A0=A0 =A0=A0=A0=A0=A0=A0 (error &quot;#ERROR&quot;))<br>
=A0=A0=A0=A0 =A0=A0=A0 =A0 ev (if (numberp ev) (number-to-string ev) ev)<br=
>=A0=A0=A0=A0 =A0=A0=A0 =A0 ev (if duration (org-table-time-seconds-to-stri=
ng <br>-=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0 (string-to-number ev=
))))<br>+=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0 (string-to-number e=
v)) ev))<br>





=A0=A0=A0=A0 =A0 (or (fboundp &#39;calc-eval)<br>=A0=A0=A0=A0 =A0=A0=A0=A0=
=A0 (error &quot;Calc does not seem to be installed, and is needed to evalu=
ate the formula&quot;))<br>=A0=A0=A0=A0 =A0 (setq ev (calc-eval (cons form =
modes)<br>=A0=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0=A0=A0 (if numbers &#39=
;num))<br>





=A0=A0=A0=A0 =A0=A0=A0 ev (if duration (org-table-time-seconds-to-string <b=
r>-=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0(string-to-number ev)))))<br>=
+=A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0(string-to-number ev)) ev)))<br=
>=A0<br>=A0=A0=A0=A0 (when org-table-formula-debug<br>=A0=A0=A0=A0 =A0 (wit=
h-output-to-temp-buffer &quot;*Substitution History*&quot;<br>





<br clear=3D"all"><br>-- <br>Maciek Starzyk<br>

--90e6ba1efd2cf886a904a7326ae7--