Parcourir la source

Merge branch 'maint'

Bastien Guerry il y a 11 ans
Parent
commit
0db6b24164
1 fichiers modifiés avec 7 ajouts et 7 suppressions
  1. 7 7
      lisp/org-table.el

+ 7 - 7
lisp/org-table.el

@@ -1142,12 +1142,12 @@ copying.  In the case of a timestamp, increment by one day."
 		   (< (string-to-number txt) 100000000))
 	      (setq txt (format "%d" (+ (string-to-number txt) 1))))
 	  (insert txt)
-	  (org-move-to-column col)
+	  (org-move-to-column col nil nil t)
 	  (if (and org-table-copy-increment (org-at-timestamp-p t))
 	      (org-timestamp-up-day)
 	    (org-table-maybe-recalculate-line))
 	  (org-table-align)
-	  (org-move-to-column col))
+	  (org-move-to-column col nil nil t))
       (user-error "No non-empty field found"))))
 
 (defun org-table-check-inside-data-field (&optional noerror)
@@ -1376,12 +1376,12 @@ However, when FORCE is non-nil, create new columns if necessary."
       t
     (let ((col (current-column))
 	  (end (org-table-end)))
-      (org-move-to-column col)
+      (org-move-to-column col nil nil t)
       (while (and (< (point) end)
 		  (or (not (= (current-column) col))
 		      (org-at-table-hline-p)))
 	(beginning-of-line 2)
-	(org-move-to-column col))
+	(org-move-to-column col nil nil t))
       (if (and (org-at-table-p)
 	       (not (org-at-table-hline-p)))
 	  t
@@ -1530,7 +1530,7 @@ first dline below it is used.  When ABOVE is non-nil, the one above is used."
     (beginning-of-line tonew)
     (insert txt)
     (beginning-of-line 0)
-    (org-move-to-column col)
+    (org-move-to-column col nil nil t)
     (unless (or hline1p hline2p
 		(not (or (not org-table-fix-formulas-confirm)
 			 (funcall org-table-fix-formulas-confirm
@@ -1582,7 +1582,7 @@ With prefix ABOVE, insert above the current line."
     (beginning-of-line (if above 1 2))
     (insert line "\n")
     (beginning-of-line (if above 1 -1))
-    (org-move-to-column col)
+    (org-move-to-column col nil nil t)
     (and org-table-overlay-coordinates (org-table-align))))
 
 ;;;###autoload
@@ -1622,7 +1622,7 @@ In particular, this does handle wide and invisible characters."
 	(dline (org-table-current-dline)))
     (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)
+    (org-move-to-column col nil nil t)
     (when (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"))