Bastien
0c85c8d7ed
Merge branch 'maint'
2021-05-18 16:06:39 +02:00
Sébastien Miquel
857ae366b3
org.el (org-src--contents-for-write-back): Indent blank lines
...
* lisp/org.el (org-src--contents-for-write-back): Indent blank lines.
* lisp/org-src.el (org-return): Revert part of commit bfda3cc7df
.
2021-05-18 16:06:27 +02:00
Bastien
e80a0094bb
Merge branch 'maint'
2021-05-17 07:20:32 +02:00
Bastien
a34d71560b
Revert "lisp/org-agenda.el: Let tags-todo searches include DONE keywords"
...
This reverts commit 823f9744e9
.
2021-05-17 07:18:35 +02:00
Bastien
59c6e24606
Merge branch 'maint'
2021-05-17 00:54:23 +02:00
Bastien
823f9744e9
lisp/org-agenda.el: Let tags-todo searches include DONE keywords
...
* lisp/org-agenda.el (org-agenda, org-agenda-run-series): Don't
set the todo-only parameter to '(4) when calling `org-tags-view'.
Reported-by: Stig Brautaset <stig@brautaset.org>
Link: https://orgmode.org/list/m2ftazm3l1.fsf@brautaset.org/
This completes 2fb129b5c
, as per Kyle's analysis here:
https://orgmode.org/list/87r1ufmw72.fsf@kyleam.com/
2021-05-17 00:49:32 +02:00
Bastien
59edcc27c4
Merge branch 'maint'
2021-05-17 00:17:06 +02:00
Bastien
c670379adf
Fix `org-agenda-todo' undo behavior when logging (not adding note)
...
* lisp/org.el (org-log-setup): New variable.
(org-auto-repeat-maybe): Check against `org-log-setup' if we are
currently logging.
(org-add-log-setup): Only use `post-command-hook' when logging a
note, otherwise use `org-log-setup'.
(org-add-log-note): Reset `org-log-setup' to nil.
(org-store-log-note): Remove useless code.
* lisp/org-agenda.el (org-agenda-bulk-action): Check
`org-log-setup' instead of `post-command-hook'.
This is a more correct fix that supersedes the previous attempt with
08a47b09
for the same problem.
Reported-by: Warren Lynn <wrn.lynn@gmail.com>
Link: https://orgmode.org/list/87v98a8mes.fsf@gnu.org/
2021-05-17 00:14:31 +02:00
Bastien
b2be3dd0e0
Merge branch 'maint'
2021-05-16 21:53:05 +02:00
Sébastien Miquel
a9af1faaa1
org-src.el (org-edit-src-exit): Fix write-back-buf not getting killed
...
* lisp/org.el (org-edit-src-exit): Fix write-back-buf not getting
killed
2021-05-16 21:52:15 +02:00
Bastien
e4943d0bfa
lisp/org.el: Fix some indentation issues
2021-05-16 21:47:59 +02:00
Nicholas Savage
8cf704e3fe
lisp/org.el: Fix org-update-statistics-cookies error
...
* lisp/org.el (org-update-statistics-cookies): Replace
usage of `org-map-entries' with `org-map-region' to prevent bug where
an error was thrown if the current buffer had not yet been saved to disk.
Formatted from a patch proposal by mail@kisaragi-hiu.com
Reported-by: mail@kisaragi-hiu.com
2021-05-16 21:41:32 +02:00
Bastien
e738211f73
Merge branch 'maint'
2021-05-16 14:11:08 +02:00
Sébastien Miquel
d65ae82f4b
lisp/org-src.el: Continue the previous fix ( d02ad1f2
)
...
* lisp/org-src.el (org-src--contents-for-write-back): Shorten the
first line of the docstring.
(org-edit-src-exit): Conditionnally kill the write-back buffer.
2021-05-16 14:10:04 +02:00
Bastien
aac4a2d597
Merge branch 'maint'
2021-05-16 14:02:07 +02:00
Sébastien Miquel
d02ad1f207
lisp/org-src.el: Use `replace-buffer-contents'
...
* lisp/org-src.el (org-src--contents-for-write-back): Use a write
back buffer.
* lisp/org-src.el (org-edit-src-exit, org-edit-src-save): Use
`replace-buffer-contents'.
Reported-by: "Sébastien Miquel" <sebastien.miquel@posteo.eu>
Link: https://orgmode.org/list/603f9c4e-c621-7592-5b20-a7354c11d5d2@posteo.eu/
2021-05-16 14:01:57 +02:00
Bastien
70d98b56b2
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2021-05-16 10:37:10 +02:00
Bastien
4362b93018
Merge branch 'maint'
2021-05-16 10:36:42 +02:00
Bastien
9802877fbe
doc/Makefile: Use the .info extension for org.info and orgguide.info
...
* doc/Makefile (install): Use the .info extension when generating
info files (org.info and orgguide.info).
2021-05-16 10:36:02 +02:00
Nicolas Goaziou
53b5af21fd
Merge branch 'maint'
2021-05-16 10:16:50 +02:00
Nicolas Goaziou
8846ea71fa
element: Fix drawer parsing
...
* lisp/org-element.el (org-element-drawer-parser): A single ":END:"
line should not be recognized as a drawer.
* testing/lisp/test-org-element.el (test-org-element/drawer-parser):
Add test.
Reported-by: Ihor Radchenko <yantar92@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2021-05/msg00819.html >
2021-05-16 10:14:54 +02:00
Bastien
fdd70728a8
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2021-05-16 10:03:08 +02:00
Bastien
336efd6dd9
lisp/*: Use version number when obsoleting
...
* lisp/org-compat.el:
* lisp/org-agenda.el:
* lisp/org-macs.el:
* lisp/org.el:
* lisp/ob-sqlite.el: Use version number when obsoleting.
2021-05-16 09:54:28 +02:00
Bastien
b4133552e1
lisp/ol.el: Enhance message when the link has already been stored
...
* lisp/ol.el (org-store-link): Enhance message when the link has
already been stored.
2021-05-16 09:54:28 +02:00
Bastien
f4b881eb03
lisp/org.el: Explicit the docstrings of org-priority-highest/lowest
...
* lisp/org.el (org-priority-highest, org-priority-lowest): Make
the docstring more explicit.
2021-05-16 09:54:28 +02:00
Nicolas Goaziou
f63cbd36c5
lisp/org.el: Fix bug in `org-sort-remove-invisible'
...
* lisp/org.el (org-sort-remove-invisible): Rewrite using
`org-element-interpret-data' to clean invisible parts more
rigorously.
Link: https://orgmode.org/list/87a6qg1rjx.fsf@posteo.net/
2021-05-16 09:54:28 +02:00
Bastien
b91e934a59
lisp/org.el: Minor enhancement to `org-priority'
...
* lisp/org.el (org-priority): When the set of numeric priorities
only comprises single digits, ask for a single char event.
2021-05-16 09:54:28 +02:00
Bastien
c77066dd7f
etc/ORG-NEWS: Add a news entry about ditaa.jar not being bundled
2021-05-16 09:54:28 +02:00
Bastien
cbc450d03c
lisp/org-list.el: Fix bug wrt updating statistics
...
* lisp/org-list.el (org-update-checkbox-count): Don't update
statistics when toggling a checkbox witin a heading that has
COOKIE_DATA set to "todo".
Reported-by: Michael Brand <michael.ch.brand@gmail.com>
Link: https://orgmode.org/list/CALn3zohYfoyDm6w-AYWsVRSbOCndBPZQyb+YvHcaEby3JEhWMw@mail.gmail.com
2021-05-16 09:54:28 +02:00
Nicolas Goaziou
ef495b76ec
ox-html: Fix typography in a docstring
...
* lisp/ox-html.el (org-html-link-org-files-as-html): Replace org-mode
with Org mode and org-mode file with Org file.
2021-05-16 09:54:28 +02:00
Bastien
e444181ee3
lisp/*: Use version number when obsoleting
...
* lisp/org-compat.el:
* lisp/org-agenda.el:
* lisp/org-macs.el:
* lisp/org.el:
* lisp/ob-sqlite.el: Use version number when obsoleting.
2021-05-16 08:57:08 +02:00
Bastien
c50c92bc45
lisp/ol.el: Enhance message when the link has already been stored
...
* lisp/ol.el (org-store-link): Enhance message when the link has
already been stored.
2021-05-16 08:28:53 +02:00
Bastien
60fccc752e
lisp/org.el: Explicit the docstrings of org-priority-highest/lowest
...
* lisp/org.el (org-priority-highest, org-priority-lowest): Make
the docstring more explicit.
2021-05-16 08:02:29 +02:00
Bastien
e8116dece1
Merge branch 'maint'
2021-05-16 07:48:58 +02:00
Nicolas Goaziou
589962b730
lisp/org.el: Fix bug in `org-sort-remove-invisible'
...
* lisp/org.el (org-sort-remove-invisible): Rewrite using
`org-element-interpret-data' to clean invisible parts more
rigorously.
Link: https://orgmode.org/list/87a6qg1rjx.fsf@posteo.net/
2021-05-16 07:48:01 +02:00
Bastien
1d99f5a65a
lisp/org.el: Minor enhancement to `org-priority'
...
* lisp/org.el (org-priority): When the set of numeric priorities
only comprises single digits, ask for a single char event.
2021-05-15 23:07:50 +02:00
Bastien
747b10c2e0
etc/ORG-NEWS: Add a news entry about ditaa.jar not being bundled
2021-05-15 22:21:48 +02:00
Bastien
5c8e735af4
lisp/org-list.el: Fix bug wrt updating statistics
...
* lisp/org-list.el (org-update-checkbox-count): Don't update
statistics when toggling a checkbox witin a heading that has
COOKIE_DATA set to "todo".
Reported-by: Michael Brand <michael.ch.brand@gmail.com>
Link: https://orgmode.org/list/CALn3zohYfoyDm6w-AYWsVRSbOCndBPZQyb+YvHcaEby3JEhWMw@mail.gmail.com
2021-05-15 22:05:19 +02:00
Bastien
e860fbf22a
lisp/org-list.el: Fix bug wrt updating statistics
...
* lisp/org-list.el (org-update-checkbox-count): Don't update
statistics when toggling a checkbox witin a heading that has
COOKIE_DATA set to "todo".
Reported-by: Michael Brand <michael.ch.brand@gmail.com>
Link: https://orgmode.org/list/CALn3zohYfoyDm6w-AYWsVRSbOCndBPZQyb+YvHcaEby3JEhWMw@mail.gmail.com
2021-05-15 22:03:47 +02:00
Nicolas Goaziou
702fefe9f6
ox-html: Fix typography in a docstring
...
* lisp/ox-html.el (org-html-link-org-files-as-html): Replace org-mode
with Org mode and org-mode file with Org file.
2021-05-15 16:45:23 +02:00
Bastien
c7be27d505
Merge remote-tracking branch 'savannah/bugfix'
2021-05-15 16:25:09 +02:00
Bastien
f4b0ce243c
Merge branch 'maint'
2021-05-15 16:19:22 +02:00
mosquito-magnet
307e722dd9
org-agenda.el: Fix clocking issues regex
...
* org-agenda.el (org-agenda-show-clocking-issues): Fix regex
to prevent false-positive clocking issue detection.
Regex was missing a grouping to restrict the alternative \| to the
literal parentheses.
TINYCHANGE
2021-05-15 16:18:58 +02:00
Juan Manuel Macías
df9b509a6c
lisp/org-attach-git.el: New option `org-attach-git-dir'
...
* lisp/org-attach-git.el (org-attach-git-dir): New option to allow
using the attachment directory of the current node as a Git
repository, if correctly initialized.
(org-attach-git-use-annex, org-attach-git-annex-get-maybe)
(org-attach-git-commit): Use the new option.
* etc/ORG-NEWS: Announce the new option.
Link: https://orgmode.org/list/87y2g8rj7s.fsf@posteo.net/
2021-05-15 16:13:49 +02:00
Bastien
83ab852478
etc/ORG-NEWS: Various enhancements
2021-05-15 16:13:49 +02:00
Juan Manuel Macías
91373e15c8
ox-latex.el: Support specific attributes for verse block
...
* lisp/ox-latex.el (org-latex-verse-block): Support verse-specific
attributes.
* doc/org-manual.org (Verse blocks in LaTeX export): New section.
Link: https://orgmode.org/list/874kfdn0k5.fsf@posteo.net/
2021-05-15 16:13:49 +02:00
Thomas S. Dye
ee40458d00
lisp/ox-latex.el: Allow arbitrary float environments
...
* lisp/ox-latex.el (org-latex--inline-image)
(org-latex--decorate-table): Recognize arbitrary :float value.
* etc/ORG-NEWS: Announce new :float capability.
LaTeX users are able to define arbitrary float types.
This patch makes them accessible from Org mode.
2021-05-15 16:13:49 +02:00
Ihor Radchenko
72894cde6f
Allow moving inlinetasks using org-metaup/down
...
* lisp/org.el (org-metaup, org-metadown): Use
`org-drag-elementbackward'/`org-drag-element-forward' to move
inlinetasks.
2021-05-15 16:13:49 +02:00
Bastien
81c7a2dee8
lisp/org-agenda.el: Use "09:00" instead of " 9:00"
...
* lisp/org-agenda.el (org-get-time-of-day): Use "09:00" instead
of " 9:00" when displaying as a string.
This makes the string more readable, especially for users reading
the agenda with a screen reader.
Reported-by: Sébastien Hinderer
2021-05-15 16:13:49 +02:00
Kévin Le Gouguec
f0447de941
Set org-adapt-indentation explicitly in some tests
...
* testing/lisp/test-org.el (test-org/indent-line)
(test-org/indent-region): Make sure `org-adapt-indentation' is
consistent with expected results.
2021-05-15 16:13:49 +02:00