mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-10-08 10:08:53 +02:00
parent 5a16dec5a4 6432fcd433
commit 7f56bfe0c2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org.el
View File

@ -20763,8 +20763,8 @@ This command does many different things, depending on context:
'(babel-call clock dynamic-block footnote-definition '(babel-call clock dynamic-block footnote-definition
footnote-reference inline-babel-call inline-src-block footnote-reference inline-babel-call inline-src-block
inlinetask item keyword node-property paragraph inlinetask item keyword node-property paragraph
plain-list property-drawer radio-target src-block plain-list planning property-drawer radio-target
statistics-cookie table table-cell table-row src-block statistics-cookie table table-cell table-row
timestamp) timestamp)
t)) t))
(type (org-element-type context))) (type (org-element-type context)))
@ -20916,7 +20916,8 @@ Use `\\[org-edit-special]' to edit table.el tables"))
(cond (arg (call-interactively #'org-table-recalculate)) (cond (arg (call-interactively #'org-table-recalculate))
((org-table-maybe-recalculate-line)) ((org-table-maybe-recalculate-line))
(t (org-table-align)))))) (t (org-table-align))))))
(`timestamp (org-timestamp-change 0 'day)) ((or `timestamp (and `planning (guard (org-at-timestamp-p 'lax))))
(org-timestamp-change 0 'day))
((and `nil (guard (org-at-heading-p))) ((and `nil (guard (org-at-heading-p)))
;; When point is on an unsupported object type, we can miss ;; When point is on an unsupported object type, we can miss
;; the fact that it also is at a heading. Handle it here. ;; the fact that it also is at a heading. Handle it here.