mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Nicolas Goaziou 2016-01-21 10:42:58 +01:00
commit 58af2e01be
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-agenda.el
View File

@ -4614,7 +4614,7 @@ in `org-agenda-text-search-extra-files'."
(> (org-reduced-level (org-outline-level))
org-agenda-search-view-max-outline-level)
(forward-line -1)
(outline-back-to-heading t)))
(org-back-to-heading t)))
(skip-chars-forward "* ")
(setq beg (point-at-bol)
beg1 (point)

4
lisp/org-clock.el
View File

@ -874,7 +874,7 @@ This macro also protects the current active clock from being altered."
(org-clock-effort)
(org-clock-marker (car ,clock))
(org-clock-hd-marker (save-excursion
(outline-back-to-heading t)
(org-back-to-heading t)
(point-marker))))
,@forms)))
(def-edebug-spec org-with-clock (form body))
@ -959,7 +959,7 @@ If necessary, clock-out of the currently active clock."
(org-with-wide-buffer
(let ((drawer-re (format "^[ \t]*:%s:[ \t]*$"
(regexp-quote (if (stringp drawer) drawer "LOGBOOK"))))
(beg (save-excursion (outline-back-to-heading t) (point))))
(beg (save-excursion (org-back-to-heading t) (point))))
(catch 'exit
(while (re-search-backward drawer-re beg t)
(let ((element (org-element-at-point)))

2
lisp/org.el
View File

@ -7137,7 +7137,7 @@ open and agenda-wise Org files."
(defsubst org-entry-beginning-position ()
"Return the beginning position of the current entry."
(save-excursion (outline-back-to-heading t) (point)))
(save-excursion (org-back-to-heading t) (point)))
(defsubst org-entry-end-position ()
"Return the end position of the current entry."