emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
@ 2011-07-03 23:14 Maciek Starzyk
  2011-07-04  7:47 ` Eric S Fraga
  2011-07-04  8:52 ` Bastien
  0 siblings, 2 replies; 8+ messages in thread
From: Maciek Starzyk @ 2011-07-03 23:14 UTC (permalink / raw)
  To: emacs-orgmode

[-- 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 --]

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-03 23:14 [PATCH] org-table.el: Calc formulas evaluate to #ERROR Maciek Starzyk
@ 2011-07-04  7:47 ` Eric S Fraga
  2011-07-04  8:52 ` Bastien
  1 sibling, 0 replies; 8+ messages in thread
From: Eric S Fraga @ 2011-07-04  7:47 UTC (permalink / raw)
  To: Maciek Starzyk; +Cc: emacs-orgmode

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)

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-03 23:14 [PATCH] org-table.el: Calc formulas evaluate to #ERROR Maciek Starzyk
  2011-07-04  7:47 ` Eric S Fraga
@ 2011-07-04  8:52 ` Bastien
  2011-07-04  9:41   ` Eric S Fraga
  1 sibling, 1 reply; 8+ messages in thread
From: Bastien @ 2011-07-04  8:52 UTC (permalink / raw)
  To: Maciek Starzyk; +Cc: emacs-orgmode

Hi Maciek,

Maciek Starzyk <mstarzyk@gmail.com> writes:

> This fixes regression bug introduced in
> 2e20cf9358deb9579ae6a22bc0deb2a772387194

Applied, thanks a lot.

-- 
 Bastien

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-04  8:52 ` Bastien
@ 2011-07-04  9:41   ` Eric S Fraga
  2011-07-04 10:25     ` Bastien
  0 siblings, 1 reply; 8+ messages in thread
From: Eric S Fraga @ 2011-07-04  9:41 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode, Maciek Starzyk

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)

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-04  9:41   ` Eric S Fraga
@ 2011-07-04 10:25     ` Bastien
  2011-07-04 10:38       ` Eric S Fraga
  0 siblings, 1 reply; 8+ messages in thread
From: Bastien @ 2011-07-04 10:25 UTC (permalink / raw)
  To: Maciek Starzyk; +Cc: emacs-orgmode

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-04 10:25     ` Bastien
@ 2011-07-04 10:38       ` Eric S Fraga
  2011-07-04 16:26         ` Achim Gratz
  0 siblings, 1 reply; 8+ messages in thread
From: Eric S Fraga @ 2011-07-04 10:38 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode, Maciek Starzyk

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)

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-04 10:38       ` Eric S Fraga
@ 2011-07-04 16:26         ` Achim Gratz
  2011-07-04 17:21           ` Eric S Fraga
  0 siblings, 1 reply; 8+ messages in thread
From: Achim Gratz @ 2011-07-04 16:26 UTC (permalink / raw)
  To: emacs-orgmode

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] org-table.el: Calc formulas evaluate to #ERROR.
  2011-07-04 16:26         ` Achim Gratz
@ 2011-07-04 17:21           ` Eric S Fraga
  0 siblings, 0 replies; 8+ messages in thread
From: Eric S Fraga @ 2011-07-04 17:21 UTC (permalink / raw)
  To: Achim Gratz; +Cc: emacs-orgmode

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)

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2011-07-04 17:22 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-03 23:14 [PATCH] org-table.el: Calc formulas evaluate to #ERROR Maciek Starzyk
2011-07-04  7:47 ` Eric S Fraga
2011-07-04  8:52 ` Bastien
2011-07-04  9:41   ` Eric S Fraga
2011-07-04 10:25     ` Bastien
2011-07-04 10:38       ` Eric S Fraga
2011-07-04 16:26         ` Achim Gratz
2011-07-04 17:21           ` Eric S Fraga

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).