[PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Maciek Starzyk]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

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

[-- Attachment #2: Type: text/html, Size: 1175 bytes --]

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Eric S Fraga]

Maciek Starzyk <mstarzyk@gmail.com> writes:

> This fixes regression bug introduced in
> 2e20cf9358deb9579ae6a22bc0deb2a772387194

Confirmed.  Table calculations do not work at all unless this patch is
applied.
-- 
: Eric S Fraga (GnuPG: 0xC89193D8FFFCF67D) in Emacs 24.0.50.1
: using Org-mode version 7.5 (release_7.5.564.g71eff.dirty)

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Bastien]

Hi Maciek,

Maciek Starzyk <mstarzyk@gmail.com> writes:

> This fixes regression bug introduced in
> 2e20cf9358deb9579ae6a22bc0deb2a772387194

Applied, thanks a lot.

-- 
 Bastien

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Eric S Fraga]

Bastien <bzg@altern.org> writes:

> Hi Maciek,
>
> Maciek Starzyk <mstarzyk@gmail.com> writes:
>
>> This fixes regression bug introduced in
>> 2e20cf9358deb9579ae6a22bc0deb2a772387194
>
> Applied, thanks a lot.

Bastien,

unfortunately, it does not seem to have been applied quite correctly.
The following should correct the latest version:

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 7f0f9bb..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) 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) ev))))
+				 (string-to-number ev)) ev)))
 
 	(when org-table-formula-debug
 	  (with-output-to-temp-buffer "*Substitution History*"
--8<---------------cut here---------------end--------------->8---

-- 
: Eric S Fraga (GnuPG: 0xC89193D8FFFCF67D) in Emacs 24.0.50.1
: using Org-mode version 7.5 (release_7.5.567.gb9af1.dirty)

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Bastien]

Hi Eric,

Eric S Fraga <e.fraga@ucl.ac.uk> writes:

> unfortunately, it does not seem to have been applied quite correctly.
> The following should correct the latest version:

Applied, thanks for your careful testing/checking.

I definitely need to release soon and to stop doing things
too fast...

-- 
 Bastien

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Eric S Fraga]

Bastien <bzg@altern.org> writes:

> Hi Eric,
>
> Eric S Fraga <e.fraga@ucl.ac.uk> writes:
>
>> unfortunately, it does not seem to have been applied quite correctly.
>> The following should correct the latest version:
>
> Applied, thanks for your careful testing/checking.

New version works fine.  Thanks!

> I definitely need to release soon and to stop doing things
> too fast...

That's the problem with deadlines... :(

Thanks again,
eric

-- 
: Eric S Fraga (GnuPG: 0xC89193D8FFFCF67D) in Emacs 24.0.50.1
: using Org-mode version 7.5 (release_7.5.568.g9f056)

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Achim Gratz]

Eric S Fraga <e.fraga@ucl.ac.uk> writes:
> That's the problem with deadlines... :(

"I love deadlines. I like the whooshing sound they make as they fly by."
(Douglas N. Adams)
 

Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables

Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.

[Eric S Fraga]

Achim Gratz <Stromeko@nexgo.de> writes:

> Eric S Fraga <e.fraga@ucl.ac.uk> writes:
>> That's the problem with deadlines... :(
>
> "I love deadlines. I like the whooshing sound they make as they fly by."
> (Douglas N. Adams)

;-)

for me, the problem is the *thud* they make when they hit the ground
behind me...
-- 
: Eric S Fraga (GnuPG: 0xC89193D8FFFCF67D) in Emacs 24.0.50.1
: using Org-mode version 7.5 (release_7.5.568.g9f056)