summaryrefslogtreecommitdiff
path: root/lisp/org/org-table.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org/org-table.el')
-rw-r--r--lisp/org/org-table.el64
1 files changed, 32 insertions, 32 deletions
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index f09d51917c0..cbee75c1f1e 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 6.29c
+;; Version: 6.30c
;;
;; This file is part of GNU Emacs.
;;
@@ -719,9 +719,6 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(append (pop fields) emptystrings))
hfmt))
lines ""))
- ;; Replace the old one
- (delete-region beg end)
- (move-marker end nil)
(if (equal (char-before) ?\n)
;; This hack is for org-indent, to force redisplay of the
;; line prefix of the first line. Apparently the redisplay
@@ -734,14 +731,17 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(insert "\n")))
(move-marker org-table-aligned-begin-marker (point))
(insert new)
+ ;; Replace the old one
+ (delete-region (point) end)
+ (move-marker end nil)
(move-marker org-table-aligned-end-marker (point))
(when (and orgtbl-mode (not (org-mode-p)))
(goto-char org-table-aligned-begin-marker)
(while (org-hide-wide-columns org-table-aligned-end-marker)))
;; Try to move to the old location
- (goto-line winstartline)
+ (org-goto-line winstartline)
(setq winstart (point-at-bol))
- (goto-line linepos)
+ (org-goto-line linepos)
(set-window-start (selected-window) winstart 'noforce)
(org-table-goto-column colpos)
(and org-table-overlay-coordinates (org-table-overlay-coordinates))
@@ -1127,7 +1127,7 @@ However, when FORCE is non-nil, create new columns if necessary."
(insert "| "))
(beginning-of-line 2))
(move-marker end nil)
- (goto-line linepos)
+ (org-goto-line linepos)
(org-table-goto-column colpos)
(org-table-align)
(org-table-fix-formulas "$" nil (1- col) 1)
@@ -1174,7 +1174,7 @@ However, when FORCE is non-nil, create new columns if necessary."
(replace-match "|")))
(beginning-of-line 2))
(move-marker end nil)
- (goto-line linepos)
+ (org-goto-line linepos)
(org-table-goto-column colpos)
(org-table-align)
(org-table-fix-formulas "$" (list (cons (number-to-string col) "INVALID"))
@@ -1218,7 +1218,7 @@ However, when FORCE is non-nil, create new columns if necessary."
(replace-match "|\\2|\\1|")))
(beginning-of-line 2))
(move-marker end nil)
- (goto-line linepos)
+ (org-goto-line linepos)
(org-table-goto-column colpos)
(org-table-align)
(org-table-fix-formulas
@@ -1424,7 +1424,7 @@ should be done in reverse order."
(move-marker beg nil)
(move-marker end nil)
(insert (mapconcat 'cdr lns "\n") "\n")
- (goto-line thisline)
+ (org-goto-line thisline)
(org-table-goto-column thiscol)
(message "%d lines sorted, based on column %d" (length lns) column)))
@@ -1462,7 +1462,7 @@ with `org-table-paste-rectangle'."
(while t
(catch 'nextline
(if (> l1 l2) (throw 'exit t))
- (goto-line l1)
+ (org-goto-line l1)
(if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1))))
(setq cols nil ic1 c1 ic2 c2)
(while (< ic1 (1+ ic2))
@@ -1500,7 +1500,7 @@ lines."
(org-table-get-field nil field)
(setq c (1+ c)))
(beginning-of-line 2))
- (goto-line line)
+ (org-goto-line line)
(org-table-goto-column col)
(org-table-align)))
@@ -1590,7 +1590,7 @@ blank, and the content is appended to the field above."
(setq org-table-clip
(mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ")
nil nlines)))
- (goto-line cline)
+ (org-goto-line cline)
(org-table-goto-column ccol)
(org-table-paste-rectangle))
;; No region, split the current field at point
@@ -1994,7 +1994,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
last-dline (car dlines)
org-table-dlines (apply 'vector (cons nil (nreverse dlines)))
org-table-hlines (apply 'vector (cons nil (nreverse hlines))))
- (goto-line last-dline)
+ (org-goto-line last-dline)
(let* ((l last-dline)
(fields (org-split-string
(buffer-substring (point-at-bol) (point-at-eol))
@@ -2070,7 +2070,7 @@ of the new mark."
(if (and newchar (not forcenew))
(error "Invalid NEWCHAR `%s' in `org-table-rotate-recalc-marks'"
newchar))
- (if l1 (goto-line l1))
+ (if l1 (org-goto-line l1))
(save-excursion
(beginning-of-line 1)
(unless (looking-at org-table-dataline-regexp)
@@ -2091,13 +2091,13 @@ of the new mark."
" # ")))
(if (and l1 l2)
(progn
- (goto-line l1)
+ (org-goto-line l1)
(while (progn (beginning-of-line 2) (not (= (org-current-line) l2)))
(and (looking-at org-table-dataline-regexp)
(org-table-get-field 1 (concat " " new " "))))
- (goto-line l1)))
+ (org-goto-line l1)))
(if (not (= epos (point-at-eol))) (org-table-align))
- (goto-line l)
+ (org-goto-line l)
(and (interactive-p) (message "%s" (cdr (assoc new org-recalc-marks))))))
(defun org-table-maybe-recalculate-line ()
@@ -2360,7 +2360,7 @@ HIGHLIGHT means, just highlight the range."
(if (or (not rangep) (and (= r1 r2) (= c1 c2)))
;; just one field
(progn
- (goto-line r1)
+ (org-goto-line r1)
(while (not (looking-at org-table-dataline-regexp))
(beginning-of-line 2))
(prog1 (org-trim (org-table-get-field c1))
@@ -2369,12 +2369,12 @@ HIGHLIGHT means, just highlight the range."
;; First sort the numbers to get a regular ractangle
(if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
(if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
- (goto-line r1)
+ (org-goto-line r1)
(while (not (looking-at org-table-dataline-regexp))
(beginning-of-line 2))
(org-table-goto-column c1)
(setq beg (point))
- (goto-line r2)
+ (org-goto-line r2)
(while (not (looking-at org-table-dataline-regexp))
(beginning-of-line 0))
(org-table-goto-column c2)
@@ -2550,7 +2550,7 @@ known that the table will be realigned a little later anyway."
(string-to-number (match-string 2 name)))))
(when (and a (or all (equal (nth 1 a) thisline)))
(message "Re-applying formula to field: %s" name)
- (goto-line (nth 1 a))
+ (org-goto-line (nth 1 a))
(org-table-goto-column (nth 2 a))
(push (append a (list (cdr eq))) eqlname1)
(org-table-put-field-property :org-untouchable t)))
@@ -2566,7 +2566,7 @@ known that the table will be realigned a little later anyway."
(setq org-last-recalc-line (org-current-line))
(setq eql eqlnum)
(while (setq entry (pop eql))
- (goto-line org-last-recalc-line)
+ (org-goto-line org-last-recalc-line)
(org-table-goto-column (string-to-number (car entry)) nil 'force)
(unless (get-text-property (point) :org-untouchable)
(org-table-eval-formula nil (cdr entry)
@@ -2575,12 +2575,12 @@ known that the table will be realigned a little later anyway."
;; Now evaluate the field formulas
(while (setq eq (pop eqlname1))
(message "Re-applying formula to field: %s" (car eq))
- (goto-line (nth 1 eq))
+ (org-goto-line (nth 1 eq))
(org-table-goto-column (nth 2 eq))
(org-table-eval-formula nil (nth 3 eq) 'noalign 'nocst
'nostore 'noanalysis))
- (goto-line thisline)
+ (org-goto-line thisline)
(org-table-goto-column thiscol)
(remove-text-properties (point-min) (point-max) '(org-untouchable t))
(or noalign (and org-table-may-need-update (org-table-align))
@@ -2588,7 +2588,7 @@ known that the table will be realigned a little later anyway."
;; back to initial position
(message "Re-applying formulas...done")
- (goto-line thisline)
+ (org-goto-line thisline)
(org-table-goto-column thiscol)
(or noalign (and org-table-may-need-update (org-table-align))
(and all (message "Re-applying formulas...done"))))))
@@ -2744,7 +2744,7 @@ Parameters get priority."
(insert s))
(if (eq org-table-use-standard-references t)
(org-table-fedit-toggle-ref-type))
- (goto-line startline)
+ (org-goto-line startline)
(message "Edit formulas and finish with `C-c C-c'. See menu for more commands.")))
(defun org-table-fedit-post-command ()
@@ -2839,7 +2839,7 @@ For example: 28 -> AB."
(insert (funcall function (buffer-substring (point) (point-at-eol))))
(delete-region (point) (point-at-eol))
(or (eobp) (forward-char 1)))
- (goto-line line)))
+ (org-goto-line line)))
(defun org-table-fedit-toggle-ref-type ()
"Convert all references in the buffer from B3 to @3$2 and back."
@@ -3080,12 +3080,12 @@ With prefix ARG, apply the new formulas to the table."
(cond
((string-match "^\\$[a-zA-Z][a-zA-Z0-9]*" dest)
(setq e (assoc name org-table-named-field-locations))
- (goto-line (nth 1 e))
+ (org-goto-line (nth 1 e))
(org-table-goto-column (nth 2 e)))
((string-match "^@\\([0-9]+\\)\\$\\([0-9]+\\)" dest)
(let ((l (string-to-number (match-string 1 dest)))
(c (string-to-number (match-string 2 dest))))
- (goto-line (aref org-table-dlines l))
+ (org-goto-line (aref org-table-dlines l))
(org-table-goto-column c)))
(t (org-table-goto-column (string-to-number name))))
(move-marker pos (point))
@@ -3099,7 +3099,7 @@ With prefix ARG, apply the new formulas to the table."
(org-table-get-range match nil nil 'highlight))
(error nil)))
((setq e (assoc var org-table-named-field-locations))
- (goto-line (nth 1 e))
+ (org-goto-line (nth 1 e))
(org-table-goto-column (nth 2 e))
(org-table-highlight-rectangle (point) (point))
(message "Named field, column %d of line %d" (nth 2 e) (nth 1 e)))
@@ -3224,7 +3224,7 @@ Use COMMAND to do the motion, repeat if necessary to end up in a data line."
(setq l2 (org-current-line)
c2 (org-table-current-column))
(if (> c1 c2) (setq tmp c1 c1 c2 c2 tmp))
- (goto-line l1)
+ (org-goto-line l1)
(beginning-of-line 1)
(loop for line from l1 to l2 do
(when (looking-at org-table-dataline-regexp)
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-08 01:50:09 +0000