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

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2013-07-02 09:32:09 +02:00
parent 116a66c5be 4eddd17ba7
commit 25f4e5f7f7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/org.texi
View file

@ -10006,7 +10006,7 @@ Conversely, backslash characters before a comma, and only them, need to be
escaped with another backslash character.}. In addition to defined macros,
@code{@{@{@{title@}@}@}}, @code{@{@{@{author@}@}@}}, etc., will reference
information set by the @code{#+TITLE:}, @code{#+AUTHOR:}, and similar lines.
Also, @code{@{@{@{date(@var{FORMAT})@}@}@}} and
Also, @code{@{@{@{time(@var{FORMAT})@}@}@}} and
@code{@{@{@{modification-time(@var{FORMAT})@}@}@}} refer to current date time
and to the modification time of the file being exported, respectively.
@var{FORMAT} should be a format string understood by

4
lisp/org.el
View file

@ -11618,8 +11618,8 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(if regionp
(delete-region (point) (+ (point) (- region-end region-start)))
(delete-region
(point-at-bol)
(min (buffer-size) (1+ (org-end-of-subtree t))))))
(and (org-back-to-heading t) (point))
(min (buffer-size) (org-end-of-subtree t t) (point)))))
(when (featurep 'org-inlinetask)
(org-inlinetask-remove-END-maybe))
(setq org-markers-to-move nil)