diff options
| author | Carsten Dominik | 2008-12-22 22:14:50 +0000 |
|---|---|---|
| committer | Carsten Dominik | 2008-12-22 22:14:50 +0000 |
| commit | cff4f506ea99ab8b63f2e9aee7f6f5d24c9674f0 (patch) | |
| tree | f859840a60669c4aa2fe41fb75f11db97b582087 | |
| parent | 830334b1a482b3558f8035159721f7eb37247af6 (diff) | |
| download | emacs-cff4f506ea99ab8b63f2e9aee7f6f5d24c9674f0.tar.gz emacs-cff4f506ea99ab8b63f2e9aee7f6f5d24c9674f0.zip | |
2008-12-22 Carsten Dominik <dominik@science.uva.nl>
* org-table.el (org-table-get-formula): Only ask to overwrite
field formula if there really is one.
| -rw-r--r-- | lisp/org/org-table.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index ad07a390a19..b1f143f283d 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el | |||
| @@ -1722,12 +1722,13 @@ When NAMED is non-nil, look for a named equation." | |||
| 1722 | (ref (format "@%d$%d" (org-table-current-dline) | 1722 | (ref (format "@%d$%d" (org-table-current-dline) |
| 1723 | (org-table-current-column))) | 1723 | (org-table-current-column))) |
| 1724 | (refass (assoc ref stored-list)) | 1724 | (refass (assoc ref stored-list)) |
| 1725 | (nameass (assoc name stored-list)) | ||
| 1725 | (scol (if named | 1726 | (scol (if named |
| 1726 | (if (and name (not (string-match "^LR[0-9]+$" name))) | 1727 | (if (and name (not (string-match "^LR[0-9]+$" name))) |
| 1727 | name | 1728 | name |
| 1728 | ref) | 1729 | ref) |
| 1729 | (int-to-string (org-table-current-column)))) | 1730 | (int-to-string (org-table-current-column)))) |
| 1730 | (dummy (and (or name refass) (not named) | 1731 | (dummy (and (or nameass refass) (not named) |
| 1731 | (not (y-or-n-p "Replace field formula with column formula? " )) | 1732 | (not (y-or-n-p "Replace field formula with column formula? " )) |
| 1732 | (error "Abort"))) | 1733 | (error "Abort"))) |
| 1733 | (name (or name ref)) | 1734 | (name (or name ref)) |