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

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).