Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-08-25 09:39:38 +02:00
commit 50412d29c5
1 changed files with 4 additions and 1 deletions

View File

@ -2136,7 +2136,10 @@ For all numbers larger than LIMIT, shift them by DELTA."
(when remove (when remove
(while (re-search-forward re2 (point-at-eol) t) (while (re-search-forward re2 (point-at-eol) t)
(unless (save-match-data (org-in-regexp "remote([^)]+?)")) (unless (save-match-data (org-in-regexp "remote([^)]+?)"))
(replace-match "")))) (if (equal (char-before (match-beginning 0)) ?.)
(error "Change makes TBLFM term %s invalid. Use undo to recover."
(match-string 0))
(replace-match "")))))
(while (re-search-forward re (point-at-eol) t) (while (re-search-forward re (point-at-eol) t)
(unless (save-match-data (org-in-regexp "remote([^)]+?)")) (unless (save-match-data (org-in-regexp "remote([^)]+?)"))
(setq s (match-string 1) n (string-to-number s)) (setq s (match-string 1) n (string-to-number s))