26f54050b6
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-04-28 08:06:20 +02:00
39b9a12bab
org.el: Enhance a few docstrings
...
* lisp/org.el (org-structure-template-alist)
(org--insert-structure-template-mks)
(org--insert-structure-template-unique-keys)
(org-insert-structure-template): Enhance docstrings.
2018-04-28 08:05:54 +02:00
eab65c9cf8
Fix colview-related failing tests
...
* lisp/org-compat.el (org-line-number-display-width): New function.
* lisp/org-colview.el (org-columns--display-here-title): Use new
function.
2018-04-28 02:17:44 +02:00
031f362352
Fix `org-toggle-tag'
...
* lisp/org.el (org-toggle-tag): Fix weird behavior with inherited tags.
* testing/lisp/test-org.el (test-org/toggle-tag): Add test.
Reported-by: Bernt Hansen <bernt@norang.ca>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00537.html >
2018-04-28 02:10:44 +02:00
d48bff37ad
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-04-28 00:59:25 +02:00
4e97d8621e
org-tempo.el: Enhance a few docstrings
...
* lisp/org-tempo.el (org-tempo, org-tempo-keywords-alist)
(org-tempo-setup, org-tempo-add-templates)
(org-tempo--include-file): Enhance docstrings.
2018-04-28 00:46:25 +02:00
9a1f208223
Merge branch 'maint'
2018-04-27 17:13:40 +02:00
388254e0d0
Revert "org.el: Fix bug when links contain special characters"
...
This reverts commit b1d084c1ab
2018-04-27 17:12:18 +02:00
b08245a74e
Merge branch 'maint'
2018-04-27 12:32:30 +02:00
e8c40b7a07
org.el: Update version keyword to 9.1.12
...
Thanks to Nicolas for reminding me.
2018-04-27 12:31:13 +02:00
1a5ca5fa83
Merge branch 'maint'
2018-04-27 03:17:44 +02:00
5d0792057d
Fix commit f21fb8a
2018-04-27 03:17:12 +02:00
8b6e5d5f2e
Revert "org-agenda.el: Fix bug when getting the warning delay of a deadline"
...
This reverts commit f21fb8ad3b
2018-04-27 03:09:28 +02:00
67f1a33b45
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-04-27 01:27:40 +02:00
6cd224e833
Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
2018-04-27 01:27:15 +02:00
8fd176ee76
Merge branch 'maint' into wip
2018-04-27 01:09:51 +02:00
a0a40a4651
org: Remove special whitespace treatment when moving subtree
...
* lisp/org.el (org-move-subtree-down): Remove special whitespace treatment.
* testing/lisp/test-org.el (test-org/drag-element-backward):
Accommodate test.
2018-04-27 01:08:29 +02:00
8cdefed80b
org-colview.el: Possibly take linum-offset into account
...
* lisp/org-colview.el (org-columns--display-here-title):
Possibly take linum-offset into account.
Thanks to Eric S Fraga for reporting this.
2018-04-27 00:44:55 +02:00
25f99522ad
org-src.el: Don't set `buffer-file-name'
...
* lisp/org-src.el (org-src-mode-configure-edit-buffer): Don't
set `buffer-file-name'.
Thanks to Clément Pit-Claudel for reporting this.
2018-04-27 00:25:15 +02:00
f21fb8ad3b
org-agenda.el: Fix bug when getting the warning delay of a deadline
...
* lisp/org-agenda.el (org-agenda-get-deadlines): Fix bug when
getting the warning delay of a deadline.
Thanks to Alex Branham for reporting this.
2018-04-26 22:59:36 +02:00
b1d084c1ab
org.el: Fix bug when links contain special characters
...
* lisp/org.el (org-open-link-from-string): Fix bug when links
contain special characters.
Thanks to Joon Ro for reporting this.
2018-04-26 21:52:39 +02:00
b64f31abd2
org.el: Tiny enhancements for `org-open-at-point-global'
...
* lisp/org.el (org-open-at-point-global): Use `thing-at-point'
to match possibly more urls and emails. Enhance docstring.
2018-04-26 21:50:37 +02:00
d561b3d0b9
org.el: Add org-eww to the list of default modules
...
* lisp/org.el (org-modules): Add org-eww to the list of
default modules.
2018-04-26 21:30:37 +02:00
71ad7d19ea
org.el: Add org-tempo to the list of default modules
...
* lisp/org.el (org-modules): Add org-tempo to the list of
default modules.
Template expansion is likely to be expected by many users, as it was
on by default in previous releases. Let's load org-tempo by default
and let users remove it. If needed, we can remove this in future
releases.
2018-04-26 21:29:48 +02:00
407014e068
Fix default directory for git-annex checks
...
* lisp/org-attach.el: (org-attach-annex-get-maybe) Ensure shell
command that checks whether a git-annex file exists is called from
within the git-annex repository. Otherwise, it will result in an
error.
2018-04-26 21:17:55 +02:00
877617d467
org-agenda: Act on the current entry if there is no mark
...
* lisp/org-agenda.el (org-agenda-bulk-action): When there is
no mark, act on the agenda entry at point.
Thanks to Marco Wahl for suggesting this.
2018-04-26 21:12:20 +02:00
f80f7ed98b
org-clock.el: New option :tags to insert tags in clock reports
...
* lisp/org-clock.el (org-clocktable-defaults)
(org-clocktable-write-default, org-clock-get-table-data):
Rename :tags to :match and use :tags to insert a column with
the headline's tags.
Thanks to Raymond Zeitler for suggesting this.
2018-04-26 20:55:27 +02:00
2742211ec6
org-agenda.el: Fix bug when keyboard-quitting the match prompt
...
* lisp/org-agenda.el (org-tags-view): Don't leave an empty
*Org agenda* buffer when keyboard-quitting the match prompt.
Thanks to Xu Chunyang for reporting this.
2018-04-26 18:44:58 +02:00
8944b578b8
Remove agenda-archives even with buffer restriction
...
* lisp/org-agenda.el (org-search-view): Remove agenda-archives even
with buffer restriction.
2018-04-26 16:12:39 +02:00
b8d0498a0e
org-inlinetask.el: Tiny formatting and rephrasing fixes
2018-04-26 15:51:18 +02:00
60483fbfc3
Merge branch 'maint'
2018-04-26 14:18:07 +02:00
e2e5495239
Fix "(wrong-number-of-arguments max 0)" with fast tag selection
...
* lisp/org.el (org-fast-tag-selection): Fix
"(wrong-number-of-arguments max 0)" error when setting tag and no
tag is defined.
2018-04-26 14:16:17 +02:00
ea6825cf1f
Improve docstring
...
* lisp/org.el (org-set-tags-command): Improve docstring.
2018-04-26 13:52:19 +02:00
886ab9c766
Modify syntax entry for < and > globally
...
* lisp/org.el (org-mode): Let < and > be recognized as opening
and ending characters.
These characters are typically used in timestamps where it is useful
to use C-M-f and C-M-b to manipulate them.
2018-04-26 11:29:30 +02:00
5a0162097a
org.el (org-mode): Don't modify syntax entry for "@" globally
...
* lisp/org.el (org-mode): Don't modify syntax entry for "@" globally.
This syntax entry dates from commit fe939ecb
2018-04-26 11:26:18 +02:00
2ea09c9ad7
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-04-26 09:57:05 +02:00
23a4a1c99b
Merge branch 'maint'
2018-04-26 09:56:55 +02:00
4323db60c5
Fix typo in docstring
...
* lisp/org-eww.el (org-eww-copy-for-org-mode): Fix typo in docstring.
Thanks to Xu Chunyang <mail@xuchunyang.me> for reporting this.
2018-04-26 09:56:45 +02:00
2056b60aae
Fix merge with maint
...
Re-introduce commit "Fix multiple tag selection" (f1b43fe9e
2018-04-26 02:44:23 +02:00
8a90b34aa6
Fix error when setting more than one tag
...
* lisp/org.el (org-set-tags-command): Fix type of history argument in
`completing-read'.
2018-04-26 02:30:09 +02:00
f1b43fe9e6
Fix multiple tag selection
...
* lisp/org.el (org--tag-add-to-alist): Preserve order when merging tag
alists. Remove duplicates only when they are outside a group.
Rename from `org-tag-add-to-alist'.
(org-set-regexps-and-options):
(org-global-tags-completion-table):
(org-make-tags-matcher):
(org-set-tags):
(org-change-tag-in-region):
(org-agenda-prepare-buffers): Apply renaming.
Reported-by: Alex Branham <alex.branham@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00311.html >
2018-04-23 15:24:23 +02:00
08e196d7fa
Merge branch 'maint'
2018-04-22 11:13:14 -04:00
e3b1c664e7
Update version keyword
2018-04-22 11:09:36 -04:00
02e290d1d4
Merge branch 'maint'
2018-04-21 15:22:53 +02:00
cb63ccb78e
org-capture: Fix error on capture abort
...
* lisp/org-capture.el (org-capture-finalize): Do not set `abort-note'
to `dirty' too easily.
Reported-by: Brad Knotwell <bknotwell@yahoo.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00183.html >
2018-04-21 15:21:25 +02:00
8b121d3aa2
org-agenda: Fix missing colons in agenda tags
...
* lisp/org-agenda.el (org-agenda-format-item): Fix missing colons in
agenda tags.
This regression was introduced in "Standardize tag regexps" commit.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00321.html >
2018-04-21 11:54:25 +02:00
c1ebb6d221
Merge branch 'maint'
2018-04-21 11:26:54 +02:00
c75c574d58
org-capture: Fix error when clipboard is empty
...
* lisp/org-capture.el (org-capture-fill-template): Fix "%x"
placeholder when clipboard is empty.
Reported-by: Brady Trainor <mail@bradyt.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00328.html >
2018-04-21 11:25:46 +02:00
56fe493618
Merge branch 'maint'
2018-04-21 11:13:03 +02:00
5792f06871
ox-md: Tiny refactoring
...
* lisp/ox-md.el (org-md--build-toc): Tiny refactoring.
2018-04-21 11:12:04 +02:00
Bastien
Nicolas Goaziou
Marco Wahl
Matt Lundin
Allen Li
Kyle Meyer