tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-10-03 13:44:20 +02:00
parent 6f5180bd9f 79ee98d755
commit 2020009cc9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org.el
View File

@ -20221,6 +20221,10 @@ This command does many different things, depending on context:
(if (save-excursion (beginning-of-line) (looking-at "[ \t]*$"))
(or (run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-final-hook)
(user-error "C-c C-c can do nothing useful at this location"))
;; When at a link, act according to the parent instead.
(when (eq type 'link)
(setq context (org-element-property :parent context))
(setq type (org-element-type context)))
;; For convenience: at the first line of a paragraph on the
;; same line as an item, apply function on that item instead.
(when (eq type 'paragraph)
@ -20228,12 +20232,6 @@ This command does many different things, depending on context:
(when (and (eq (org-element-type parent) 'item)
(= (point-at-bol) (org-element-property :begin parent)))
(setq context parent type 'item))))
;; When heading text is a link, treat the heading, not the link,
;; as the current element
(when (eq type 'link)
(let ((parent (org-element-property :parent context)))
(when (and (eq (org-element-type parent) 'headline))
(setq context parent type 'headline))))
;; Act according to type of element or object at point.
(case type
(clock (org-clock-update-time-maybe))