diff -c "-L" "c:/Users/andrea/AppData/Roaming/.emacs.d/elpa/org-20140804/org-table.el" "-L" "#<buffer org-table.el>" "c:/Users/andrea/AppData/Roaming/.emacs.d/elpa/org-20140804/org-table.el" "c:/Users/andrea/AppData/Local/Temp/buffer-content-3236IUh"
*** c:/Users/andrea/AppData/Roaming/.emacs.d/elpa/org-20140804/org-table.el
--- #<buffer org-table.el>
***************
*** 2600,2606 ****
  	    (unless (string-match "\\S-" fmt)
  	      (setq fmt nil))))
        (if (and (not suppress-const) org-table-formula-use-constants)
! 	  (setq formula (org-table-formula-substitute-names formula)))
        (setq orig (or (get-text-property 1 :orig-formula formula) "?"))
        (while (> ndown 0)
  	(setq fields (org-split-string
--- 2600,2606 ----
  	    (unless (string-match "\\S-" fmt)
  	      (setq fmt nil))))
        (if (and (not suppress-const) org-table-formula-use-constants)
! 	  (setq formula (org-table-formula-substitute-names (org-table-formula-handle-first/last-rc formula))))
        (setq orig (or (get-text-property 1 :orig-formula formula) "?"))
        (while (> ndown 0)
  	(setq fields (org-split-string
***************
*** 3767,3773 ****
        (if (eq what 'name) (setq var (substring match 1)))
        (when (eq what 'range)
  	(or (equal (string-to-char match) ?@) (setq match (concat "@" match)))
! 	(setq match (org-table-formula-substitute-names match)))
        (unless local
  	(save-excursion
  	  (end-of-line 1)
--- 3767,3773 ----
        (if (eq what 'name) (setq var (substring match 1)))
        (when (eq what 'range)
  	(or (equal (string-to-char match) ?@) (setq match (concat "@" match)))
! 	(setq match (org-table-formula-substitute-names (org-table-formula-handle-first/last-rc match))))
        (unless local
  	(save-excursion
  	  (end-of-line 1)

Diff finished.  Thu Aug 28 01:17:44 2014