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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-11-05 23:24:10 +01:00
parent 4c9b24b4d5 73a5c27cc1
commit 0edad6725a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/org.el
View File

@ -20162,23 +20162,23 @@ overwritten, and the table is not marked as requiring realignment."
((and ((and
(org-table-p) (org-table-p)
(progn (progn
;; check if we blank the field, and if that triggers align ;; Check if we blank the field, and if that triggers align.
(and (featurep 'org-table) org-table-auto-blank-field (and (featurep 'org-table) org-table-auto-blank-field
(memq last-command (memq last-command
'(org-cycle org-return org-shifttab org-ctrl-c-ctrl-c)) '(org-cycle org-return org-shifttab org-ctrl-c-ctrl-c))
(if (or (equal (char-after) ?\ ) (looking-at "[^|\n]* |")) (if (or (eq (char-after) ?\s) (looking-at "[^|\n]* |"))
;; got extra space, this field does not determine column width ;; Got extra space, this field does not determine
;; column width.
(let (org-table-may-need-update) (org-table-blank-field)) (let (org-table-may-need-update) (org-table-blank-field))
;; no extra space, this field may determine column width ;; No extra space, this field may determine column
;; width.
(org-table-blank-field))) (org-table-blank-field)))
t) t)
(eq N 1) (eq N 1)
(looking-at "[^|\n]* |")) (looking-at "[^|\n]* \\( \\)|"))
(let (org-table-may-need-update) ;; There is room for insertion without re-aligning the table.
(goto-char (1- (match-end 0))) (delete-region (match-beginning 1) (match-end 1))
(backward-delete-char 1) (self-insert-command N))
(goto-char (match-beginning 0))
(self-insert-command N)))
(t (t
(setq org-table-may-need-update t) (setq org-table-may-need-update t)
(self-insert-command N) (self-insert-command N)