ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-28 17:59:33 +02:00
parent fe7f964b49 6e7b6cae4f
commit 55436135e7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-table.el
View File

@ -2179,7 +2179,8 @@ For all numbers larger than LIMIT, shift them by DELTA."
(save-excursion (save-excursion
(goto-char (org-table-end)) (goto-char (org-table-end))
(when (let ((case-fold-search t)) (looking-at "[ \t]*#\\+tblfm:")) (when (let ((case-fold-search t)) (looking-at "[ \t]*#\\+tblfm:"))
(let ((re (concat key "\\([0-9]+\\)")) (let ((msg "The formulas in #+TBLFM have been updated")
(re (concat key "\\([0-9]+\\)"))
(re2 (re2
(when remove (when remove
(if (or (equal key "$") (equal key "$LR")) (if (or (equal key "$") (equal key "$LR"))
@ -2199,10 +2200,11 @@ For all numbers larger than LIMIT, shift them by DELTA."
(setq s (match-string 1) n (string-to-number s)) (setq s (match-string 1) n (string-to-number s))
(cond (cond
((setq a (assoc s replace)) ((setq a (assoc s replace))
(replace-match (concat key (cdr a)) t t)) (replace-match (concat key (cdr a)) t t)
(message msg))
((and limit (> n limit)) ((and limit (> n limit))
(replace-match (concat key (int-to-string (+ n delta))) (replace-match (concat key (int-to-string (+ n delta))) t t)
t t))))))))) (message msg)))))))))
(defun org-table-get-specials () (defun org-table-get-specials ()
"Get the column names and local parameters for this table." "Get the column names and local parameters for this table."