diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-09-28 22:15:34 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-09-28 22:15:34 +0200 |
commit | b8d89496fda538b2110862cecbd41702110665a6 (patch) | |
tree | 7693f0e4e0f43b992e30b7e20a3454ab63561693 | |
parent | 9cfa907971ce447615c3f09c24502b6d88d272e1 (diff) | |
parent | d417eac7ee9fb559cf441359985c104210ee3d20 (diff) | |
download | org-mode-b8d89496fda538b2110862cecbd41702110665a6.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-table.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index 1945e8e..a920fc8 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -1663,13 +1663,15 @@ In particular, this does handle wide and invisible characters." (interactive) (unless (org-at-table-p) (user-error "Not at a table")) (let ((col (current-column)) - (dline (org-table-current-dline))) + (dline (and (not (org-match-line org-table-hline-regexp)) + (org-table-current-dline)))) (org-table-with-shrunk-columns (kill-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))) (if (not (org-at-table-p)) (beginning-of-line 0)) (org-move-to-column col) - (when (or (not org-table-fix-formulas-confirm) - (funcall org-table-fix-formulas-confirm "Fix formulas? ")) + (when (and dline + (or (not org-table-fix-formulas-confirm) + (funcall org-table-fix-formulas-confirm "Fix formulas? "))) (org-table-fix-formulas "@" (list (cons (number-to-string dline) "INVALID")) dline -1 dline))))) |