mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 00:32:54 +00:00
Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
432e1256bc
|
@ -258,7 +258,7 @@ For example \orgTITLE for #+TITLE."
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
|
||||||
(defcustom org-export-latex-date-format
|
(defcustom org-export-latex-date-format
|
||||||
"%d %B %Y"
|
"\\today"
|
||||||
"Format string for \\date{...}."
|
"Format string for \\date{...}."
|
||||||
:group 'org-export-latex
|
:group 'org-export-latex
|
||||||
:type 'string)
|
:type 'string)
|
||||||
|
|
|
@ -468,10 +468,10 @@ This checks `org-list-ending-method'."
|
||||||
(looking-at org-list-end-re))
|
(looking-at org-list-end-re))
|
||||||
(throw 'exit nil))
|
(throw 'exit nil))
|
||||||
;; Skip blocks, drawers, inline-tasks, blank lines
|
;; Skip blocks, drawers, inline-tasks, blank lines
|
||||||
((looking-at "^[ \t]*#\\+end_")
|
((and (looking-at "^[ \t]*#\\+end_")
|
||||||
(re-search-backward "^[ \t]*#\\+begin_" nil t))
|
(re-search-backward "^[ \t]*#\\+begin_" lim-up t)))
|
||||||
((looking-at "^[ \t]*:END:")
|
((and (looking-at "^[ \t]*:END:")
|
||||||
(re-search-backward drawers-re nil t)
|
(re-search-backward drawers-re lim-up t))
|
||||||
(beginning-of-line))
|
(beginning-of-line))
|
||||||
((and inlinetask-re (looking-at inlinetask-re))
|
((and inlinetask-re (looking-at inlinetask-re))
|
||||||
(org-inlinetask-goto-beginning)
|
(org-inlinetask-goto-beginning)
|
||||||
|
@ -689,10 +689,10 @@ Assume point is at an item."
|
||||||
(memq (assq (car beg-cell) itm-lst) itm-lst))))
|
(memq (assq (car beg-cell) itm-lst) itm-lst))))
|
||||||
;; Skip blocks, drawers, inline tasks, blank lines
|
;; Skip blocks, drawers, inline tasks, blank lines
|
||||||
;; along the way.
|
;; along the way.
|
||||||
((looking-at "^[ \t]*#\\+end_")
|
((and (looking-at "^[ \t]*#\\+end_")
|
||||||
(re-search-backward "^[ \t]*#\\+begin_" nil t))
|
(re-search-backward "^[ \t]*#\\+begin_" lim-up t)))
|
||||||
((looking-at "^[ \t]*:END:")
|
((and (looking-at "^[ \t]*:END:")
|
||||||
(re-search-backward drawers-re nil t)
|
(re-search-backward drawers-re lim-up t))
|
||||||
(beginning-of-line))
|
(beginning-of-line))
|
||||||
((and inlinetask-re (looking-at inlinetask-re))
|
((and inlinetask-re (looking-at inlinetask-re))
|
||||||
(org-inlinetask-goto-beginning)
|
(org-inlinetask-goto-beginning)
|
||||||
|
@ -756,11 +756,11 @@ Assume point is at an item."
|
||||||
(throw 'exit (push (cons 0 (point)) end-lst-2)))
|
(throw 'exit (push (cons 0 (point)) end-lst-2)))
|
||||||
;; Skip blocks, drawers, inline tasks and blank lines
|
;; Skip blocks, drawers, inline tasks and blank lines
|
||||||
;; along the way
|
;; along the way
|
||||||
((looking-at "^[ \t]*#\\+begin_")
|
((and (looking-at "^[ \t]*#\\+begin_")
|
||||||
(re-search-forward "^[ \t]*#\\+end_")
|
(re-search-forward "^[ \t]*#\\+end_" lim-down t))
|
||||||
(forward-line 1))
|
(forward-line 1))
|
||||||
((looking-at drawers-re)
|
((and (looking-at drawers-re)
|
||||||
(re-search-forward "^[ \t]*:END:" nil t)
|
(re-search-forward "^[ \t]*:END:" lim-down t))
|
||||||
(forward-line 1))
|
(forward-line 1))
|
||||||
((and inlinetask-re (looking-at inlinetask-re))
|
((and inlinetask-re (looking-at inlinetask-re))
|
||||||
(org-inlinetask-goto-end))
|
(org-inlinetask-goto-end))
|
||||||
|
@ -2073,6 +2073,10 @@ in subtree, ignoring drawers."
|
||||||
block-item
|
block-item
|
||||||
lim-up
|
lim-up
|
||||||
lim-down
|
lim-down
|
||||||
|
(drawer-re (concat "^[ \t]*:\\("
|
||||||
|
(mapconcat 'regexp-quote org-drawers "\\|")
|
||||||
|
"\\):[ \t]*$"))
|
||||||
|
(keyword-re (concat "^[ \t]*" org-keyword-time-regexp))
|
||||||
(orderedp (org-entry-get nil "ORDERED"))
|
(orderedp (org-entry-get nil "ORDERED"))
|
||||||
(bounds
|
(bounds
|
||||||
;; In a region, start at first item in region
|
;; In a region, start at first item in region
|
||||||
|
@ -2085,11 +2089,14 @@ in subtree, ignoring drawers."
|
||||||
(error "No item in region"))
|
(error "No item in region"))
|
||||||
(setq lim-down (copy-marker limit))))
|
(setq lim-down (copy-marker limit))))
|
||||||
((org-on-heading-p)
|
((org-on-heading-p)
|
||||||
;; On an heading, start at first item after drawers
|
;; On an heading, start at first item after drawers and
|
||||||
|
;; time-stamps (scheduled, etc.)
|
||||||
(let ((limit (save-excursion (outline-next-heading) (point))))
|
(let ((limit (save-excursion (outline-next-heading) (point))))
|
||||||
(forward-line 1)
|
(forward-line 1)
|
||||||
(when (looking-at org-drawer-regexp)
|
(while (or (looking-at drawer-re) (looking-at keyword-re))
|
||||||
(re-search-forward "^[ \t]*:END:" limit nil))
|
(if (looking-at keyword-re)
|
||||||
|
(forward-line 1)
|
||||||
|
(re-search-forward "^[ \t]*:END:" limit nil)))
|
||||||
(if (org-list-search-forward (org-item-beginning-re) limit t)
|
(if (org-list-search-forward (org-item-beginning-re) limit t)
|
||||||
(setq lim-up (point-at-bol))
|
(setq lim-up (point-at-bol))
|
||||||
(error "No item in subtree"))
|
(error "No item in subtree"))
|
||||||
|
|
Loading…
Reference in a new issue