浏览代码

org-table.el: Er... fix the previous fix about time formulas computation.

The error was introduced by Bastien, not Maciek Starzyk.  Bzg was
trying to fix things manually too hastily :)
Eric S Fraga 14 年之前
父节点
当前提交
9f056593a5
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      lisp/org-table.el

+ 2 - 2
lisp/org-table.el

@@ -2513,13 +2513,13 @@ not overwrite the stored one."
 		       (error "#ERROR"))
 		       (error "#ERROR"))
 		  ev (if (numberp ev) (number-to-string ev) ev)
 		  ev (if (numberp ev) (number-to-string ev) ev)
 		  ev (if duration (org-table-time-seconds-to-string 
 		  ev (if duration (org-table-time-seconds-to-string 
-				   (string-to-number ev) ev)))
+				   (string-to-number ev)) ev))
 	  (or (fboundp 'calc-eval)
 	  (or (fboundp 'calc-eval)
 	      (error "Calc does not seem to be installed, and is needed to evaluate the formula"))
 	      (error "Calc does not seem to be installed, and is needed to evaluate the formula"))
 	  (setq ev (calc-eval (cons form modes)
 	  (setq ev (calc-eval (cons form modes)
 			      (if numbers 'num))
 			      (if numbers 'num))
 		ev (if duration (org-table-time-seconds-to-string 
 		ev (if duration (org-table-time-seconds-to-string 
-				 (string-to-number ev) ev))))
+				 (string-to-number ev)) ev)))
 
 
 	(when org-table-formula-debug
 	(when org-table-formula-debug
 	  (with-output-to-temp-buffer "*Substitution History*"
 	  (with-output-to-temp-buffer "*Substitution History*"