d33e6eae51
org-macro: Refactoring
...
* lisp/org-macro.el (org-macro-initialize-templates): Refactor function.
* testing/lisp/test-org-macro.el (test-org/macro-replace-all): Remove
duplicate tests. Add new test.
2018-03-23 23:40:56 +01:00
28977b719c
Merge branch 'maint'
2018-03-23 23:32:00 +01:00
143a87e45c
org-macro: Fix infloop when re-defining built-in macros
...
* lisp/org-macro.el (org-macro-initialize-templates): User-defined
macros have higher precedence than built-in macros.
Reported-by: Eric S Fraga <esflists@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00413.html >
2018-03-23 23:30:06 +01:00
2ddb26f95d
Merge branch 'maint'
2018-03-22 09:26:49 -04:00
fa15abe6e8
Update version keyword
...
As of fffd300ef
2018-03-22 09:18:32 -04:00
366d80a6f2
Merge branch 'maint'
2018-03-22 02:28:02 +01:00
a9139d9976
lisp/org-list.el: Enhance error message
...
* lisp/org-list.el (org-list-indent-item-generic): Use
`user-error' and enhance the error message.
2018-03-22 02:22:15 +01:00
6713c2792f
Merge branch 'maint'
2018-03-21 12:52:43 +01:00
b5a90a7ab5
Silence byte-compiler
2018-03-21 12:52:19 +01:00
4a631383dd
Remove unused regexp
...
* lisp/org.el (org-log-drawer-start-re):
(org-log-drawer-end-re)
(org-log-drawer-re): Remove variables.
2018-03-21 12:49:41 +01:00
f0958d559c
Merge branch 'maint'
2018-03-21 02:13:21 +01:00
894ec00e9f
org.el: Fix recursion stop condition when expanding tags
...
* lisp/org.el (org-expand-tags): Fix recursion stop condition.
See http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00228.html
TINYCHANGE
2018-03-21 02:12:42 +01:00
27d0c469c0
Merge branch 'maint'
2018-03-21 01:58:25 +01:00
e28a5a66ad
org.el: Enhance `org-tag-add-to-alist' and use it more
...
* lisp/org.el (org-tag-add-to-alist): Check against the car of
the ("tag") or ("tag" . ?k) element.
(org-global-tags-completion-table, org-make-tags-matcher)
(org-set-tags, org-change-tag-in-region)
(org-agenda-prepare-buffers): Use `org-tag-add-to-alist'.
2018-03-21 01:57:45 +01:00
393b98ae8e
Include buffer tags in global tags completion
...
* lisp/org.el: (org-global-tags-completion-table): Return all tags,
including tags in the buffer.
This fixes a bug that caused buffer tags to be excluded if user
configured tags either via `org-tag-alist' or the #+TAGS keyword.
2018-03-21 00:56:25 +01:00
a402419716
Merge branch 'maint'
2018-03-20 17:23:29 +01:00
b0cca9656d
org.el: Fix bug when adding persistent tags
...
* lisp/org.el (org-tag-add-to-alist): New function.
(org-set-regexps-and-options): Use the new function to only
append persistent tags if they are not already in the tags
alist.
2018-03-20 17:23:18 +01:00
f18823b80a
Merge branch 'maint'
2018-03-20 14:58:40 +01:00
b7f350f7ef
org.el: Fix bug when building tags groups
...
* lisp/org.el (org-tag-alist-to-groups): Fix bug.
2018-03-20 14:58:20 +01:00
8548dfa33f
Merge branch 'maint'
2018-03-20 12:38:31 +01:00
b2d3dbabf7
org-capture.el: Fix docstring
...
* lisp/org-capture.el (org-capture-templates-contexts): Fix docstring.
2018-03-20 12:38:24 +01:00
f6b74a5649
Remove `org-context-p'
...
* lisp/org.el (org-context-p): Remove function.
The function is not used anywhere, and is deprecated
`org-element-at-point'.
2018-03-20 09:34:26 +01:00
1af7f303d5
Guard against empty headings when sorting
...
* org.el (org-sort-entries): Guard against empty headings when sorting
alphabetically, numerically.
Due to how ‘org-complex-heading-regexp’ is defined, the title capture group
currently returns nil in empty headings, which we don’t want to pass on to
‘org-sort-remove-invisible’.
2018-03-20 09:25:14 +01:00
55d807f348
Merge branch 'maint'
2018-03-20 00:02:26 +01:00
02b1574ea9
ob-table: Mention passing ranges as lists in org-sbe's documentation
...
* ob-table.el (org-sbe): Add documentation note.
2018-03-20 00:01:13 +01:00
c9d617b322
ob-table: Fix org-sbe's handling of list arguments
...
* ob-table.el (org-sbe): Add an explicit case for handling list
arguments. This avoids doing the wrong thing (%s-formatting a list,
thus losing syntax like double-quotes). This enables passing org-table
ranges through org-sbe in a simple and correct manner.
* test-ob-table.el: Add test.
2018-03-20 00:01:09 +01:00
5b59e16c9e
ob-table: Fix org-sbe's handling of quotes in cell values
...
* ob-table.el (org-sbe): org-sbe did the wrong thing when given a
reference to a cell containing quotes or backslashes, because it would
simply wrap any $-prefixed value in quotes, without any escaping. Fix
this by using "%S" (instead of "\"%s\"").
* test-ob-table.el: Add test.
2018-03-20 00:01:05 +01:00
beeb4bf23f
ox: Fix regression in INCLUDE keywords
...
* lisp/ox.el (org-export--prepare-file-contents): Activate Org mode in
temporary buffer so all regexps are set. Also, be more strict when
updating links, i.e., do not bother if both includer and includee
belong to the same directory, or if there's no includer at all.
Eventually, only update links within lines specifications, if any.
* testing/lisp/test-ox.el (test-org/expand-include/links): Add tests.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00394.html >
2018-03-19 23:48:38 +01:00
0de3f78c28
Merge branch 'maint'
2018-03-18 21:27:19 +01:00
e1f1acbbfb
Improve docstring for `org-time-stamp-inactive'
...
* lisp/org.el (org-time-stamp-inactive): Improve docstring.
2018-03-18 21:26:42 +01:00
d81a1d088c
Fix file links when using #+INCLUDE
2018-03-18 16:09:55 +01:00
594b2dbae8
Merge branch 'maint'
2018-03-17 14:57:25 +01:00
ea4cb14883
Fix `org-set-tags-to'.
...
* lisp/org.el (org-set-tags-to): Do not throw an error on empty
headlines.
* testing/lisp/test-org.el (test-org/set-tags): Move test.
(test-org/set-tags-to): New test.
Reported-by: Adrian Bradd <a.bradd@columbia.edu>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00210.html >
2018-03-17 14:56:49 +01:00
5aaf3dfc7e
Move `org-heading-delete-metadata' into "org-list.el"
...
* lisp/org.el (org-heading-delete-metadata): Move to...
* lisp/org-list.el (org-list--delete-metadata): ... here. Refactor
code.
(org-toggle-item): Use new function.
* testing/lisp/test-org-list.el (test-org-list/toggle-item): Add test.
At the moment, this function is only used internally in "org-list.el",
so it belongs there.
Also refrain from removing log or clock drawers, because they may not
contain all clocks or notes anyway. Besides, the information they
contain may still make sense in a plain list.
2018-03-17 11:49:16 +01:00
00938bc98b
org-src: New option for `org-src-window-setup'.
...
org-src.el: (org-src-window-setup) support open edit src window below.
TINYCHANGE
2018-03-17 08:11:24 +01:00
bd0b691716
ob-sql.el: Improve Oracle connection and usage for ob-sql.
...
* lisp/ob-sql.el (org-babel-sql-dbstring-oracle): Permit to omit host
and port to allow use of alias defined in Oracle's TNSNAMES files.
This now allow two way calling it :
<user>/<password>@<host>:<port>/<database ID>
or
<user>/<password>@<database alias>
2018-03-16 23:01:58 +01:00
0edf344e2a
ob-sql.el: Improve Oracle connection and usage for ob-sql.
...
* lisp/ob-sql.el (org-babel-sql-dbstring-oracle): Don't use empty
args. This allows use of alias defined in Oracle's TNSNAMES files.
(org-babel-execute:sql): Don't feed lines with trailing spaces. This
also improve speed for retrieving data.
2018-03-14 14:30:51 +01:00
bc7b24d0d0
ob-core: Silence byte-compiler
2018-03-13 09:29:50 +01:00
96ae324ed1
org-compat: Silence byte-compiler
...
* lisp/org-compat.el (fboundp): Silence byte-compiler.
2018-03-13 09:28:24 +01:00
409a62e5c9
Move some string functions to "org-macs.el"
...
* lisp/org.el (org-string<):
(org-string<=):
(org-string>=):
(org-string>):
(org-string<>): Move to...
* lisp/org-macs.el: ... here.
2018-03-13 09:26:53 +01:00
88bf8aef28
org-table-sort-lines: Fix case-sensitive sorting
...
* org-table.el (org-table-sort-lines): Fix case sensitive sorting,
improve docstring.
* test-org-table.el (test-org-table/sort-lines): Enforce C locale when
testing alphabetic sorting.
‘sort-subr’ ignores ‘sort-fold-case’ when a predicate is provided. To
correctly handle case-sensitivity, we now bake it into the predicate.
Since we are now sorting according to the user’s locale, WITH-CASE
will not make a difference in most instances, since most locales
always sort case-insensitively (cf. how GNU sort ignores the ‘-f’
switch). We now mention this in the function docstring.
In order to meaningfully test case-sensitive sorting, we now enforce
the C locale in the respective unit test.
2018-03-13 09:09:54 +01:00
8e9518a3b0
Fix string-collate-lessp shim
...
* org-compat.el (org-string-collate-lessp): When shimming
string-collate-lessp, accept the same arguments as in the unshimmed
case.
2018-03-13 09:09:48 +01:00
0d6ee386a1
Fix alphabetic string matching operators
...
* org.el (org-string<): Add.
(org-op-to-function): Use it.
(org-string> etc.): Use collated comparison.
Cf. commit 551d2f1fe
2018-03-13 09:09:32 +01:00
e64ff15f67
Fix alphabetic sorting for tables, plain lists
...
* org-table.el (org-table-sort-lines): Use collated sorting.
* org-list.el (org-sort-list): Use collated sorting.
Cf. commit 551d2f1fe
2018-03-13 09:09:07 +01:00
0de818964d
Merge branch 'maint'
2018-03-11 19:22:25 +01:00
2f587d496f
org-capture: Prevent spurious blank line during capture
...
* lisp/org-capture.el (org-capture-place-entry): Prevent spurious
blank line during capture.
Reported-by: Luke <mideniko1234-org@yahoo.co.uk>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00075.html >
2018-03-11 19:21:29 +01:00
69e674f518
Merge branch 'maint'
2018-03-10 22:29:38 +01:00
04f06958ab
Backport commit 16faff6a4 from Emacs
...
; * lisp/org/org-table.el: Replace obsolete alias in comment.
16faff6a46f28b4db2e9b91e52b27404303f3197
Glenn Morris
Fri Mar 9 12:43:21 2018 -0500
2018-03-09 23:41:47 -05:00
f74f55cc75
Merge branch 'maint'
2018-03-07 22:07:42 -05:00
9ac80ede5e
Backport commit f2caf08ca from Emacs
...
; Spelling fixes
f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2
Paul Eggert
Sun Mar 4 17:10:34 2018 -0800
2018-03-07 22:07:25 -05:00
5ad085f34c
Merge branch 'maint'
2018-03-06 10:15:22 +01:00
9449939ca0
org-clock: Fix face for clock overruns
...
* lisp/org-clock.el (org-clock-get-clock-string): Fix 6655429b8http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00078.html >
2018-03-06 10:13:12 +01:00
49a8de4ffd
* ob-core.el (org-babel-result-to-file): relative file link result.
...
Respect option `org-link-file-path-type`.
2018-03-06 14:43:22 +08:00
b420c8e290
ob-core: Fix last commit
...
* lisp/ob-core.el (org-babel-execute-src-block): Fix thinko in commit
122bf2997
2018-03-05 14:34:28 +01:00
69c5b6c999
Remove headings' metadata when turning them into list items
...
* lisp/org-list.el (org-toggle-item): Delete headings'
metadata before turning them into list items.
* lisp/org.el (org-log-drawer-start-re): New variable.
(org-log-drawer-end-re, org-log-drawer-re): New constants.
(org-heading-delete-metadata): New function.
(org-setting-tags): Fix comment.
2018-03-05 10:57:43 +01:00
902148a967
Merge branch 'maint'
2018-03-04 21:22:32 +01:00
74f6ed1eb0
org-clock.el: Strip bracket links from the heading
...
* lisp/org-clock.el (org-clock--mode-line-heading): Strip
links from the heading.
This restores the previous behavior before commit 66554298.
Thanks to Matt Lundin for reporting this.
2018-03-04 21:21:00 +01:00
d97ae53059
Merge branch 'maint'
2018-03-03 23:33:59 +01:00
cb0954d8de
org-gnus: Fix `org-gnus-store-link'
...
* lisp/org-gnus.el (org-gnus-store-link): Fix storing link from an
article when point in the summary buffer does not match the article.
Reported-by: Kevin Brubeck Unhammer <unhammer@fsfe.org>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00037.html >
2018-03-03 23:33:17 +01:00
122bf29974
ob-core: Tiny refactoring
...
* lisp/ob-core.el (org-babel-execute-src-block): Tiny refactoring.
Keep lines under 80 columns.
2018-03-03 10:07:21 +01:00
3fab011755
org-element: Better indentation for `org-element-adopt-elements'
...
* lisp/org-element.el (org-element-adopt-elements): Define a better
indentation rule.
2018-03-03 10:00:06 +01:00
0c96d5066f
Merge branch 'develop' of stardiviner/org-mode into master
2018-03-02 08:52:42 +00:00
39bd69b08d
* ob-core.el: (org-babel-execute-src-block) handle :results graphics :file case.
...
Don't write result to file if result is graphics.
2018-03-02 14:22:52 +08:00
a1659053d5
Merge branch 'maint'
2018-03-01 10:56:01 +01:00
428ab7942a
org-agenda: Obey to "++" prefix when bulk rescheduling/resetting deadline
...
* lisp/org-agenda.el (org-agenda-bulk-action): When date starts with
"++", shift every marked entry.
Reported-by: Michael Hoffman <gmane4-hoffman@sneakemail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2018-03/msg00001.html >
2018-03-01 10:53:35 +01:00
d87148057e
Update .dir-locals
...
* .dir-locals.el (org-mode): Update default values.
* lisp/org-list.el (org-list-description-max-indent): Add :safe
keyword.
2018-02-27 19:17:18 +01:00
2c93a0b2d7
org-tempo: Fix TAB behaviour
...
* lisp/org-tempo.el (org-tempo-complete-tag): Use a different trick to
handle failed completions.
Reported-by: Brent Goodrick <bgoodr@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00164.html >
2018-02-27 02:02:56 +01:00
f521400a08
New face for upcoming deadlines in agenda
...
* lisp/org-faces.el (org-upcoming-distant-deadline-face): New face.
2018-02-27 01:44:49 +01:00
6a56ae53f2
`org-mark-ring-push' also populates Emacs mark ring
...
* lisp/org.el (org-mark-ring-push): Also populate Emacs mark ring.
Fixes: Bug#23745
2018-02-27 01:02:22 +01:00
8ebf4b7274
Change `org-paste-subtree' behavior
...
* lisp/org.el (org-paste-subtree): Never split a section. Instead
always insert tree before the headline after point. Use `org-yank'
to split the section.
* testing/lisp/test-org.el (test-org/paste-subtree): New test.
2018-02-27 00:03:31 +01:00
e445894c0d
Merge branch 'maint'
2018-02-26 12:16:34 +01:00
a0104599dc
Fix `org-paste-subtree'
...
* lisp/org.el (org-paste-subtree): Use `org-outline-regexp-bol'.
The function cannot detect the proper level when a headline around
point contains spurious white spaces after the stars.
2018-02-26 12:14:24 +01:00
5e8fa13610
Re-instate `C-c C-x m' binding
...
Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00322.html >
2018-02-24 23:03:28 +01:00
1b259f95aa
Merge branch 'maint'
2018-02-24 22:38:27 +01:00
fffd300efd
Update version keyword
2018-02-24 22:36:54 +01:00
6ef5d2497c
Revert "org-agenda: Fix lprops when recreating sticky agendas"
...
This reverts commit b306aa2245
2018-02-24 22:36:29 +01:00
6e10c268de
Merge branch 'maint'
2018-02-24 22:01:32 +01:00
65d6d3b043
org-capture: Silence byte-compiler
2018-02-24 22:01:04 +01:00
be93bacfa1
Merge branch 'maint'
2018-02-24 21:59:23 +01:00
84a3d03dff
Replace dash by underscore in temp file names.
...
* org-babel-groovy-evaluate: replace '-' by '_' in temp file names.
Apparently, the JVM uses file names in the construction of names of internal
objects and dashes are illegal in that context. See
https://stackoverflow.com/questions/48893994/groovy-in-org-mode-babel
for an example.
2018-02-24 21:39:50 +01:00
f3c20eb912
Merge branch 'maint'
2018-02-22 14:38:35 +01:00
db90aadd38
org-agenda: make log and clockreport modes local
...
* lisp/org-agenda.el (org-agenda-mode): Only set `org-agenda-show-log'
and `org-agenda-clock-report-mode' to their default values when
constructing an agenda buffer, and not when redoing it.
* lisp/org-agenda.el (org-agenda-log-mode,
org-agenda-clockreport-mode): Do not set the global default value
`org-agenda-start-with-log-mode' (respectively
`org-agenda-start-with-clockreport-mode') with the current value of
`org-agenda-log-mode' (respectively `org-agenda-clockreport-mode'),
which, with sticky agendas is even buffer local.
`org-agenda-show-log' indicates if the the current agenda buffer has
log-mode enabled. When building a new agenda buffer, it gets its
value from `org-agenda-start-with-log-mode'. It is is semantically a
buffer local variable: when creating a new agenda buffer you expect it
to be set to the value in `org-agenda-start-with-log-mode'. However,
2e9c2d71
2018-02-22 14:37:45 +01:00
79b36b6a8d
Merge branch 'maint'
2018-02-21 15:04:37 +01:00
6655429b8d
org-capture: Refresh clock mode line when finalizing capture
...
* lisp/org-capture.el (org-capture-finalize): Refresh clock mode line.
* lisp/org-clock.el (org-clock--mode-line-heading): New function.
(org-clock-get-clock-string): Small refactoring.
(org-clock-update-mode-line): Add optional argument. Use new function.
(org-clock-in): Use new function.
2018-02-21 15:02:33 +01:00
47908228e7
Merge branch 'maint'
2018-02-18 16:33:04 -05:00
ec8590d5e2
Backport commit 69107f347 from Emacs
...
; Fix doc typos related to indefinite articles
69107f347b3ac7f51cd22333f57393fd735915f2
Glenn Morris
Fri Feb 16 17:33:57 2018 -0500
2018-02-18 16:32:41 -05:00
4ddfc6bd69
Backport commit 66a4e651f from Emacs
...
; Fix doc typos related to indefinite articles
66a4e651f3cf38c320d1a9d5ae6f88dcc641792b
Glenn Morris
Fri Feb 16 15:16:15 2018 -0500
2018-02-18 16:32:41 -05:00
bbcf2f939c
Merge branch 'maint'
2018-02-15 15:04:59 +01:00
1562d4e293
ox-publish: Fix last commit
...
* lisp/ox-publish.el (org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Use `file-truename' instead of
`expand-file-name'.
Do not preserve symbolic links when a unique identifier is needed,
e.g., when storing or retrieving file properties from cache.
2018-02-15 14:51:26 +01:00
58da7d4d17
org-table: Fix shrunk columns on hlines
...
* lisp/org-table.el (org-table--shrunk-field): Fix function when on
a hline.
* testing/lisp/test-org-table.el (test-org-table/shrunk-columns): Add
tests.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00231.html >
2018-02-14 18:48:48 +01:00
af824a9b39
Merge branch 'maint'
2018-02-14 18:00:38 +01:00
1a5151c51d
org-clock: Fix default clocktable properties priority
...
* lisp/org-clock.el (org-clock-report): Improve docstring. Refactor
code. Ensure user-defined properties have precedence over automatic
ones.
Reported-by: Tyler Smith <tyler@plantarum.ca>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00215.html >
2018-02-14 17:57:21 +01:00
61c8903c87
Fix failing tests
...
* lisp/org-compat.el (org-string-collate-lessp): Reinstate function,
inadvertently removed in last merge with maint branch.
2018-02-13 14:17:00 +01:00
2a7a4a65ad
Merge branch 'maint'
2018-02-13 14:10:28 +01:00
7c21dfc771
ox-publish: Follow symlink directories
...
* lisp/org-compat.el (directory-files-recursively): Remove
compatibility function, no longer needed.
* lisp/ox-publish.el (org-publish--expand-file-name):
(org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Preserve symlinks in file name.
(org-publish-get-base-files): Follow symlink directories.
(org-publish-get-project-from-filename): Preserve symlinks in file
name. Do not use `file-in-directory-p', which ignores symlinks.
Reported-by: Michel Damiens <michel.damiens@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00186.html >
2018-02-13 14:06:56 +01:00
551d2f1fe7
Fix alphabetic sorting for headlines, tags
...
* org.el (org-sort-entries): Use collated sorting.
(org-tags-sort-function): Use collated sorting.
(org-string-collate-greaterp): Add helper-function to use as defcustom
option, since there is no ‘string-collate-greaterp’ in Emacs.
* org-compat.el (org-string-collate-lessp): Add proxy to fall-back on
string-lessp when string-collate-lessp is missing (Emacs ≤ 24).
* test-org.el (test-org/string-collate-lessp): Add test.
(test-org/sort-entries): Add regression test for non-ASCII inputs.
‘org-sort-entries’ and ‘org-tags-sort-function’ advertise alphabetic
sorting, but actually sort based only on character code. This
produces non-alphabetic orderings of strings in non-ASCII locales.
E. g., German Umlauts “Ä Ü Ö” are alphabetically sorted as if they
were “A U O”, whereas sorting based on character-code will place them
after “Z”, which is unexpected.
2018-02-12 14:57:54 +01:00
b505a5b6ad
Merge branch 'maint'
2018-02-11 15:29:57 -05:00
fe7619cd18
Do not auto-fill when point is in Org property drawer
...
* lisp/org.el (org-return): Set auto-fill-function to nil when point
is in an Org property drawer.
* testing/lisp/test-org.el (test-org/return): Add test.
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00102.html >
2018-02-11 15:19:49 -05:00
da78ccc690
org-tempo: Do not activate Org Tempo in export output buffers and agenda
...
* lisp/org-tempo.el (b): Do not activate Org Tempo in export output
buffers and agenda.
2018-02-11 12:06:42 +01:00
6791fd29d3
org-tempo: Fix obnoxious `ding' when expanding templates
...
* lisp/org-tempo.el (org-tempo-complete-tag): New function.
Reported-by: Brent Goodrick <bgoodr@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00080.html >
2018-02-11 12:03:15 +01:00
6cb6ddc671
org-macs.el: Tiny re-ordering
2018-02-11 11:45:07 +01:00
f487fccbec
org-macs: Use `define-key' instead of `org-defkey'
...
* lisp/org-macs.el (org-completing-read): Use `define-key' instead of
`org-defkey'.
For bootstrapping reasons, "org-macs.el" isn't expected to require
functions from "org.el". Besides, minibuffer isn't supposed to depend
of `org-disputed-keys' either.
2018-02-11 11:40:21 +01:00
013941de86
`org-save-outline-visibility' preserve outline, blocks and drawers
...
* lisp/org-macs.el (org-save-outline-visibility): Also preserve blocks
and drawers visibility. Re-implement without helper functions.
(org-outline-overlay-data):
(org-set-outline-overlay-data): Remove functions.
2018-02-11 11:37:50 +01:00
2956408f75
Move `org-flag-region' to "org-macs.el"
...
* lisp/org.el (org-flag-region): Move function...
* lisp/org-macs.el (org-flag-region): ... here.
2018-02-11 11:27:53 +01:00
b73f7c013d
ox-ascii: Use angle brackets for external links
...
* lisp/ox-ascii.el (org-ascii--describe-links):
(org-ascii-link): Use angle brackets for external links.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00105.html >
2018-02-10 14:16:37 +01:00
da26490208
org-colview: Fix typo in docstring
...
* lisp/org-colview.el (org-columns-summary-types): Fix typo.
2018-02-10 14:03:59 +01:00
c72304b95e
Fix S-<return> and M-S-<return> keybindings for GUI
...
This prevents these key combinations from being translated to M-RET in
window systems. These bindings already have extra keys defined for
TTY.
2018-02-10 13:53:11 +01:00
3558e6e835
Merge branch 'maint'
2018-02-05 15:37:15 +01:00
61a885a399
Make manual and URL links in docstrings clickable
2018-02-05 15:27:12 +01:00
33cbd80850
org-agenda: Remove superfluous messages at bulk marking
2018-02-05 10:41:49 +01:00
cdacaa5e87
Merge branch 'maint'
2018-02-04 23:33:41 +01:00
e6f891e7aa
org-clock.el: Add an autoload entry for the function org-clock-sum-today
...
* lisp/org-clock.el: When the org-mode is called for the very first time
any functionality that requires the org-clock-sum-today used to fail.
(e.g. a column that calculates CLOCKSUM_T)
TINYCHANGE
2018-02-04 23:32:59 +01:00
f500d7c7f6
org-element: Fix example and src block interpreter.
...
* lisp/org-element.el (org-element-example-block-interpreter):
(org-element-src-block-interpreter): Correctly handle indentation.
* testing/lisp/test-org-element.el (test-org-element/example-block-interpreter):
Add tests.
Reported-by: Yasushi SHOJI <yasushi.shoji@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00006.html >
2018-02-04 10:04:17 +01:00
878f2ae68b
org-tempo: Small refactoring
...
* lisp/org-tempo.el (org-tempo-add-templates): Small refactoring.
2018-02-04 08:56:15 +01:00
a2471b1bb6
Silence byte-compiler
2018-02-04 00:51:00 +01:00
85418667a6
Merge branch 'maint'
2018-02-04 00:31:47 +01:00
248bc9631b
org-element: Revert regexp change for inline source blocks and babel calls
...
* lisp/org-element.el (org-element-inline-babel-call-parser):
(org-element-inline-src-block-parser): Revert commit
7efa0f2879http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00002.html >
2018-02-04 00:30:00 +01:00
222a65bdee
org-tempo: Silence byte-compiler
2018-02-04 00:24:01 +01:00
892ae3c2e1
Merge branch 'maint'
2018-02-04 00:13:36 +01:00
19dcbab6f0
ox: Fix select tags and exclude tags and tags hierarchy
...
* lisp/ox.el (org-export--selected-trees): Expand select tags groups.
(org-export--prune-tree): Expand exclude tags groups.
(org-export--skip-p): Change signature.
* testing/lisp/test-ox.el (test-org-export/handle-options): Add tests.
Reported-by: Pierre-Luc Gauthier <p.luc.gauthier@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00039.html >
2018-02-04 00:12:45 +01:00
d89e35ee50
Merge branch 'maint'
2018-02-03 15:24:50 +01:00
52c059a10d
org-feed: Do not stop feed update when a feed is unavailable
...
* lisp/org-feed.el (org-feed-update-all): Do not stop feed update when
a feed is unavailable.
Reported-by: Adrian Tritschler <ajft@ajft.org>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00043.html >
2018-02-03 15:23:47 +01:00
005ff5f5c2
Merge branch 'maint'
2018-02-03 14:54:11 +01:00
d0c4d9ba23
ox-latex: Allow negative tocdepth
...
* lisp/ox-latex.el (org-latex-template): Allow negative tocdepth.
Reported-by: Akater <nuclearspace@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00528.html >
2018-02-03 14:52:20 +01:00
567fc311ac
Merge branch 'maint'
2018-02-03 14:42:49 +01:00
98422471c9
org-agenda: Fix docstring
...
* lisp/org-agenda.el (org-agenda-prefix-format): Fix count of items in
alist.
Reported-by: Nicolas Dudebout <nicolas.dudebout@gmail.com>
2018-02-03 14:41:34 +01:00
4b2006db3d
Merge branch 'maint'
2018-02-01 22:43:19 +01:00
e570e964a3
org-compat: Remove `org-decode-time'
...
* lisp/org-compat.el (org-decode-time): Remove compatibility function,
no longer used.
2018-02-01 22:42:35 +01:00
0790855c93
org-clock: Fix remnant UTC time in clock computation
...
* lisp/org-clock.el (org-clock-get-sum-start): Remove wrong UTC
reference.
Reported-by: Jose Robins <jose.robins@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00018.html >
2018-02-01 22:40:39 +01:00
e490d2766f
Merge branch 'maint'
2018-02-01 15:51:28 +01:00
b4cc12fc32
ob-core: Fix infloop when filling a region with a source block
...
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Do not move point.
Reported-by: Yasushi SHOJI <yasushi.shoji@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00006.html >
2018-02-01 15:40:51 +01:00
75ece16507
Move bindings together
2018-02-01 13:54:25 +01:00
2a91f967ca
Merge branch 'maint'
2018-01-31 21:20:54 +01:00
ddc8e8eb23
ox: Fix typo in docstring
...
* lisp/ox.el (org-export-with-toc): Fix typo in docstring. Slightly
rephrase it.
2018-01-31 21:20:21 +01:00
86f3ef8d80
org-macs: Fix typo in docstring.
...
* lisp/org-macs.el (org-match-any-p): Fix typo in docstring.
2018-01-31 18:20:25 +01:00
68b076bf52
Re-organize some bindings
2018-01-31 17:56:21 +01:00
b86413beb3
ob-exp: Fix Lisp evaluation when exporting a source block
...
* lisp/ob-exp.el (org-babel-exp-src-block): Fully expand block
parameters before exporting a source block.
Reported-by: Fabrice Popineau <fabrice.popineau@supelec.fr>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00471.html >
2018-01-30 10:42:56 +01:00
485f218510
Merge branch 'maint'
2018-01-30 10:12:32 +01:00
7efa0f2879
Fix inline src and inline babel calls parsing
...
* lisp/org-element.el (org-element-inline-babel-call-parser):
(org-element-inline-src-block-parser): Tolerate any prefix before the objects.
* testing/lisp/test-ob-exp.el (ob-exp/exports-inline-code):
* testing/lisp/test-org-element.el (test-org-element/inline-src-block-parser):
Update tests.
Reported-by: Greg Minshall <minshall@acm.org>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00489.html >
2018-01-30 10:11:02 +01:00
04bf418922
org-element: Ignore contiguous spaces in macro arguments
...
* lisp/org-element.el (org-element-macro-parser): Ignore
non-meaningful spaces (e.g., indentation).
(org-element-macro-interpreter): Do not interpret macro from its raw
value. Instead, build it again from its parsed contents.
2018-01-29 15:17:37 +01:00
55e8c6f9c3
Merge branch 'maint'
2018-01-28 17:10:13 +01:00
5b4a711949
Fix fontification of macro spanning over multiple lines
...
* lisp/org.el (org-fontify-macros): Handle macros spanning over
multiple lines.
2018-01-28 17:08:03 +01:00
00dbb3089f
org-element: Improve description item's interpretation
...
* lisp/org-element.el (org-element-item-interpreter): Improve
indentation of description items.
2018-01-28 16:09:54 +01:00
b4dda5f340
org-element: Print lower case affiliated keywords
...
* lisp/org-element.el (org-element--interpret-affiliated-keywords):
Print lower case keywords.
2018-01-28 14:06:33 +01:00
33a9eef11f
Allow editing partially shrunk columns
...
* lisp/org-table.el (org-table-with-shrunk-field): New macro.
(org-table-get-field):
(org-table-toggle-column-width): Use new macro.
(org-table--shrunk-field): Update function.
(org-table--shrink-field): When there is a width cookie, leave first
characters editable.
* lisp/org.el (org-self-insert-command):
(org-delete-backward-char):
(org-delete-char): Small refactoring. Handle shrink overlays.
* testing/lisp/test-org-table.el (test-org-table/toggle-column-width):
Update tests.
2018-01-25 23:57:11 +01:00
5411435633
org-table: Tiny rewording to docstring
...
* lisp/org-table.el (org-table--read-column-selection): Tiny
rewording.
2018-01-25 23:42:58 +01:00
9cf9f56ff6
org-table: Fix `org-table-current-column' on hlines
...
* lisp/org-table.el (org-table-current-column): Return a meaningful
value also on hlines.
(org-table-toggle-column-width): Use `org-table-current-column'
instead of re-inventing wheel.
* testing/lisp/test-org-table.el (test-org-table/current-column): New
test.
2018-01-25 22:55:53 +01:00
13424336a6
org-element: Prefer lower case letters for blocks and keywords
...
* lisp/org-element.el (org-element-center-block-interpreter):
(org-element-dynamic-block-interpreter):
(org-element-inlinetask-interpreter):
(org-element-quote-block-interpreter):
(org-element-special-block-interpreter):
(org-element-babel-call-interpreter):
(org-element-comment-block-interpreter):
(org-element-example-block-interpreter):
(org-element-export-block-interpreter):
(org-element-keyword-interpreter):
(org-element-src-block-interpreter):
(org-element-verse-block-interpreter): Use lower case letters when
interpreting object.
* testing/lisp/test-org-element.el (test-org-element/example-block-parser):
(test-org-element/center-block-interpreter):
(test-org-element/dynamic-block-interpreter):
(test-org-element/inlinetask-interpreter):
(test-org-element/quote-block-interpreter):
(test-org-element/comment-block-interpreter):
(test-org-element/example-block-interpreter):
(test-org-element/keyword-interpreter):
(test-org-element/src-block-interpreter):
(test-org-element/verse-block-interpreter):
* testing/lisp/test-ox.el (test-org-export/handle-options):
(test-org-export/expand-macro):
(test-org-export/before-processing-hook): Update tests.
2018-01-24 12:56:25 +01:00
8ecc4c4365
Move `org-match-any-p' in "org-macs.el"
...
* lisp/org-macs.el (org-match-any-p): Moved from "org.el".
* lisp/org.el (org-match-any-p): Removed.
2018-01-23 09:48:01 +01:00
66bbe54a75
org-table: Small refactoring
...
* lisp/org-table.el (org-table-align): Small refactoring.
2018-01-23 00:40:13 +01:00
2367e25c6b
Merge branch 'maint'
2018-01-22 19:29:32 +01:00
4d46a20ea2
ob-lob: Fix Babel calls with external references
...
* lisp/ob-lob.el (org-babel-lob--src-info):
(org-babel-lob-get-info): Handle calls with external references, i.e.,
FILE:NAME(...) syntax.
* testing/lisp/test-ob-lob.el (test-ob-lob/external-reference-syntax):
(test-ob-lob/call-with-indirection): New tests.
2018-01-22 19:27:13 +01:00
cafa08334a
Merge branch 'maint'
2018-01-21 23:27:05 +01:00
ffa5f3c519
org-clock: Improve `untilnow' range behavior and performance
...
* org-clock.el (org-clock-special-range): Set `untilnow' to use the
year -50000, rather than the earliest representable date.
(org-clock--oldest-date): Remove.
The `untilnow' range relied on the constant `org-clock--oldest-date`
to find the earliest representable date, which caused delays when
loading `org-clock' on systems where `most-negative-fixnum' is large.
This change removes that constant in favor of a simpler hack to
produce a range between the current time and before the dawn of human
civilization. If this breaks your workflow, please report to the Time
Police.
TINYCHANGE
2018-01-21 23:26:22 +01:00
7a20ccafb5
Merge branch 'maint'
2018-01-20 15:55:36 +01:00
b891e46ccb
Fix typo in docstring
...
* lisp/org.el (org-reload): Fix typo.
2018-01-20 15:55:13 +01:00
b7e94882ea
Move some indentation functions in "org-macs.el", remove others
...
* lisp/org-macs.el (org-get-indentation): Moved from "org.el"
(org-get-string-indentation):
(org-fix-indentation): Remove functions.
2018-01-20 15:54:20 +01:00
73861065fc
Tiny cleanup
2018-01-20 15:45:28 +01:00
f1bc02f03b
Merge branch 'maint'
2018-01-20 13:41:41 +01:00
c06f906f02
Fix typos in docstrings
...
* lisp/org.el (org-category):
(org-preview-latex-image-directory):
(org-hidden-keywords):
(org-scan-tags):
(org-find-exact-heading-in-directory):
(org-revert-all-org-buffers): Change "org" to "Org" where appropriate.
2018-01-20 13:40:57 +01:00
1c8e687f47
org-compat: Silence byte-compiler
2018-01-20 13:32:03 +01:00
d6729e3eda
Merge branch 'maint'
2018-01-20 13:29:49 +01:00
c2576f349b
Re-hide archived subtrees when showing branches
...
* lisp/org.el (org-kill-note-or-show-branches): Re-hide archived
subtrees when showing branches.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00340.html >
2018-01-20 13:28:53 +01:00
d378d9ec7e
Do not hijack keybindings in Calendar mode
...
* lisp/org-compat.el (org-calendar-to-agenda-key):
(org-calendar-insert-diary-entry-key): Moved from "org.el".
(org--setup-calendar-bindings): New function.
Fixes: Bug#10289
2018-01-20 13:07:46 +01:00
929b65533a
Merge branch 'maint'
2018-01-19 18:31:48 +01:00
63c0266688
Update URLs in source code or tests
...
TINYCHANGE
2018-01-19 18:30:40 +01:00
0155441358
Merge branch 'maint'
2018-01-19 18:22:00 +01:00
b289a65be7
Use https for links to orgmode.org
...
TINYCHANGE
2018-01-19 18:14:58 +01:00
c27d0f85e5
Merge branch 'maint'
2018-01-18 23:43:44 +01:00
bdc220ca17
ox-publish: Fix including files with a search option
...
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing): Remove
double quotes prior to pruning search options.
Reported-by: Joseph Carter Osborn <jcosborn@ucsc.edu>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00317.html >
2018-01-18 23:40:55 +01:00
2372276883
Merge branch 'maint'
2018-01-18 23:10:51 +01:00
daceceb424
Fix `org-store-link'
...
* lisp/org.el (org-store-link): Fix parameter to `completing-read',
which expects a string, not a symbol.
Reported-by: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
2018-01-18 23:09:12 +01:00
ba6c0f1ea9
ox-html: Add label and number to equations in HTML export
...
* lisp/ox-html.el (org-html--wrap-latex-environment): New function.
(org-html--math-environment-p): New function.
(org-html-latex-environment): Use `org-html--wrap-latex-environment' to
wrap equation in HTML container (non-MathJax modes). Make latex
environment unnumbered when compiling equations to images. Insert latex
label in environment in MathJax mode.
(org-html-link): Calculate equation number limiting counter to equation
environments. Use eqref for link when using MathJax
(org-html--make-unlabelled-latex-environment): New function.
2018-01-17 22:24:31 +01:00
92176c90be
Merge branch 'maint'
2018-01-15 23:29:21 +01:00
78e4be78cb
org-list: Silence byte-compiler
2018-01-15 23:28:52 +01:00
21cf8d8e61
Merge branch 'maint'
2018-01-15 23:15:26 +01:00
b74655a4e5
Fix `org-toggle-checkbox' on a headline.
...
* lisp/org-list.el (org-toggle-checkbox): When called with a prefix
argument, ignore all drawers after planning info line. Fix
docstring.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00278.html >
2018-01-15 23:13:51 +01:00
c3fffcd8d2
Fix C-<return> binding
2018-01-15 22:59:40 +01:00
0aeb66f64d
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-01-15 16:39:37 +01:00
ebb67cebe5
Merge branch 'maint'
2018-01-15 16:39:11 +01:00
ad390e895a
ox-html.el (org-html-head): Fix docstring
...
* ox-html.el (org-html-head): Fix docstring.
Thanks to Adam Porter for reporting this.
2018-01-15 16:38:33 +01:00
9f181d4404
org-agenda: Disable message logging for some messages
...
* lisp/org-agenda.el (org-agenda-filter-by-tag):
(org-agenda-view-mode-dispatch):
(org-agenda-diary-entry):
(org-agenda-bulk-action): Disable message logging for some messages.
TINYCHANGE
2018-01-15 16:34:25 +01:00
6965098a53
Use a single keybinding representation
...
* lisp/org.el (org-replace-disputed-keys): Fix docstring.
Use `kbd' macro everywhere. Also add missing "ESC" equivalents for
"M-" bindings.
2018-01-15 16:13:37 +01:00
a8a04348fd
org-timer: Add missing autoload cookies
...
* lisp/org-timer.el (org-timer-pause-or-continue):
(org-timer-stop): Add missing autoload cookies.
2018-01-15 16:13:19 +01:00
d5b70fa68b
Silence byte-compiler
2018-01-13 14:19:50 +01:00
000b943ebd
Re-order visibility functions in "org.el"
...
* lisp/org-macs.el (org-outline-overlay-data):
(org-set-outline-overlay-data): Moved from "org.el".
* lisp/org.el (org-remove-empty-overlays-at):
(org-show-empty-lines-in-parent):
(org-files-list):
(org-entry-beginning-position):
(org-entry-end-position):
(org-subtree-end-visible-p):
(org-first-headline-recenter):
(org-flag-region):
(org-show-entry):
(org-show-children):
(org-show-subtree):
(org-hide-block-toggle-maybe):
(org-hide-block-toggle):
(org-hide-block-toggle-all):
(org-hide-block-all):
(org-cycle-hide-drawers):
(org-flag-drawer):
(org-previous-block):
(org-next-block): Move functions.
2018-01-13 14:15:53 +01:00
a8ee20d23d
Replace `outline-flag-region' with `org-flag-region'
...
* lisp/org-inlinetask.el (org-inlinetask-toggle-visibility):
* lisp/org-list.el (org-list-set-item-visibility):
* lisp/org.el (org-flag-subtree):
(org-cycle-internal-local):
(org-cycle-show-empty-lines):
(org-set-outline-overlay-data):
(org-move-subtree-down):
(org-set-tags):
(org-flag-heading):
(org-show-children):
(org-show-subtree):
(org-show-entry): Replace `outline-flag-region' with
`org-flag-region'.
2018-01-10 15:58:21 +01:00
4dbb4a76a7
Implement `org-show-all'
...
* lisp/org.el (org-show-all): New function.
(org-cycle):
(org-cycle-internal-global):
(org-global-cycle):
(org-set-startup-visibility):
(org-set-outline-overlay-data):
(org-hide-block-all):
(org-mode-hook):
(org-tree-to-indirect-buffer):
(org-sort-entries):
(org-mode-map):
(org-org-menu):
* lisp/ob-lilypond.el (org-babel-lilypond-mark-error-line):
* lisp/org-archive.el (org-archive-subtree):
* lisp/org-capture.el (org-capture-place-template):
* lisp/org-mouse.el (org-mouse-popup-global-menu):
* lisp/ox-org.el (org-org-publish-to-org):
* testing/org-test.el (org-test-at-id):
(org-test-in-example-file): Use new function.
* lisp/org-compat.el (org-show-block-all): Mark as obsolete.
2018-01-10 15:58:21 +01:00
d30bea7cee
Fold CLOCK and LOGBOOK drawers upon creating them
...
* lisp/org-clock.el (org-clock-find-position): Use a faster call to hide
clock drawer.
* lisp/org.el (org-log-beginning): Make sure logbook drawer is folded as
soon as inserted.
(org-store-log-note): Remove unnecessary call to
`org-cycle-hide-drawers'.
2018-01-10 15:58:21 +01:00
4403d4685e
Give drawers their own invisibility spec
...
* lisp/org.el (org-mode): Add special invisibility spec for drawers.
(org-show-set-visibility): Handle new invisibility spec.
(org-clean-visibility-after-subtree-move): Fix argument for
`org-cycle-hide-drawers'. `overview' is a no-op.
(org-cycle-hook):
(org-cycle-internal-local):
(org-flag-drawer):
(org-move-subtree-down):
(org-show-entry):
* lisp/org-agenda.el (org-agenda-clock-in):
* lisp/org-clock.el (org-clock-goto):
* lisp/org-feed.el (org-feed-update):
* lisp/org-inlinetask.el (org-inlinetask-toggle-visibility): Do not hide
drawers when expanding a headline.
Drawers and headlines visibility are now unrelated. As a consequence,
there is no need to hide drawers every time a headline is expanded.
2018-01-10 15:58:21 +01:00
4f74aa4c0e
Change signature for `org-set-visibility-according-to-property'
...
* lisp/org.el (org-set-visibility-according-to-property): Remove unused
argument.
(org-set-startup-visibility):
(org-overview): Apply signature change.
2018-01-10 15:58:21 +01:00
e886d1566d
Implement `org-flag-region'
...
* lisp/org.el (org-flag-region): New function.
(org-hide-block-toggle): Use new function.
Unlike `outline-flag-region', this function handles multiple invisible
specs.
2018-01-10 15:55:46 +01:00
bbf1c26aaf
Remove `org-hide-block-overlays' variable
...
* lisp/org.el (org-hide-block-overlays): Remove variable.
(org-show-block-all): Use `remove-overlays' to remove block-related
overlays instead of relying on a global state.
(org-hide-block-toggle): Do not update removed variable. Tiny
refactoring.
2018-01-10 15:55:46 +01:00
728920a8ed
Rename `org-timestamp--to-internal-time' into `org-timestamp-to-time'
...
* lisp/org.el (org-timestamp-to-time): New function.
(org-timestamp--to-internal-time): Remove function.
(org-timestamp-format): Use new function.
* testing/lisp/test-org.el (test-org/timestamp-to-time): New test.
2018-01-10 15:05:11 +01:00
ee27fb010e
Fix docstring
...
* lisp/org.el (org-timestamp-from-time): Fix docstring.
2018-01-10 14:37:02 +01:00
d3cdc35e06
Implement `org-timestamp-from-string', `org-timestamp-from-time'
...
* lisp/org.el (org-timestamp-from-string):
(org-timestamp-from-time): New functions.
* testing/lisp/test-org.el (test-org/timestamp-from-string):
(test-org/timestamp-from-time): New tests.
2018-01-10 14:35:32 +01:00
0c409d64d0
Merge branch 'maint'
2018-01-10 12:49:23 +01:00
0a8711a0a5
org-clock.el: Fix one time continuous clock in
...
* org-clock.el (org-clock-in): Abort after calling `org-clock-in'
recursively with `org-clock-continuously' set.
Without the change the recursive call to `org-clock-in' would
insert a clock of last clock-out, but then the original call
would continue by inserting another clock at
current-time. As a result of that, clocking out uses the latter
of the two clocks and leaves the other one dangling.
TINYCHANGE
2018-01-10 12:48:28 +01:00
46e24f6830
Merge branch 'maint'
2018-01-09 19:51:17 +01:00
8c7a14a850
org-clock: Consider hours when splitting the table with :steps
...
* lisp/org-clock.el (org-clocktable-steps): Check time when :tstart
and :tend are defined.
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/step): Add
tests.
Reported-by: savoie@nsidc.org
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00227.html >
2018-01-09 19:47:39 +01:00
c82c21c7ac
Merge branch 'maint'
2018-01-08 20:40:16 +01:00
ed2bcab0ea
ox: Fix typo in docstring
...
* lisp/ox.el (org-export-search-cells): Fix typo.
2018-01-08 20:39:31 +01:00
857425e184
ox-org: Obey to `org-display-custom-times'
...
* lisp/ox-org.el (org-org-timestamp): New function.
(org): Use new function.
2018-01-08 15:39:01 +01:00
c0a1fb4138
Merge branch 'maint'
2018-01-08 15:24:21 +01:00
3566a3eeee
org-clock: Fix `org-clock-display' called with `C-u C-u C-u'
...
* lisp/org-clock.el (org-clock-display): Compute H and M when
necessary.
2018-01-08 15:22:33 +01:00
7544f2b6d7
Merge branch 'maint'
2018-01-08 15:00:28 +01:00
9c675b0727
org-clock: Small fixes
...
* lisp/org-clock.el (org-clock-display-default-range): Improve
docstring. Add :safe keyword.
(org-clock-display): Fix comparison function.
2018-01-08 14:59:53 +01:00
b65fe0f7a2
Merge branch 'maint'
2018-01-07 10:56:02 +01:00
0c93296f83
org-table: Obey to `org-table-formula-create-columns'
...
* lisp/org-table.el (org-table-recalculate): Return an error when the
formula cannot create a necessary column.
(org-table-formula-create-columns): Fix docstring.
* testing/lisp/test-org-table.el (test-org-table/field-formula-outside-table):
Fix tests.
2018-01-07 10:55:30 +01:00
34bb61bf81
Update master-only copyright years
2018-01-07 00:28:44 -05:00
d94f7024bc
Merge branch 'maint'
2018-01-07 00:28:35 -05:00
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
9bc6e644e9
Merge branch 'maint'
2018-01-07 01:34:59 +01:00
b306aa2245
org-agenda: Fix lprops when recreating sticky agendas
...
* lisp/org-agenda.el (org-agenda-lprops): New variable.
(org-agenda-local-vars): Add it.
(org-agenda-prepare): Set lprops from symbol property.
(org-agenda-redo): Get lprops from variable, not property.
2018-01-07 01:34:13 +01:00
6b06a6238b
Merge branch 'maint'
2018-01-06 10:19:37 +01:00
5dfab7957d
org-agenda: documentation addition
...
* lisp/org-agenda.el: Add docstring to `org-agenda-show-log'
2018-01-06 10:19:01 +01:00
e2b47eb5e7
Merge branch 'maint'
2018-01-04 16:35:24 +01:00
6c3c06273e
org.el (org-copy-subtree): Correct typo
2018-01-04 16:26:08 +01:00
fc1e7c2033
Merge branch 'maint'
2018-01-03 22:55:39 +01:00
76ee7b7cdd
org-clock: Allow CLOCK_MODELINE_TOTAL inheritance
...
* lisp/org-clock.el (org-clock-get-sum-start): Allow
CLOCK_MODELINE_TOTAL inheritance.
2018-01-03 22:54:28 +01:00
ff3d23e64e
Do not use `called-interactively-p' in `org-store-link'
...
* lisp/org.el (org-store-link): Do not use `called-interactively-p'.
Fixes: 19915
2018-01-03 18:04:55 +01:00
c0ea20aab7
org-mobile: Save agenda files before pushing
...
* lisp/org-mobile.el (org-mobile-push): Save agenda files before
pushing.
Fixes: 19448
2018-01-03 15:45:53 +01:00
837e1b4249
Merge branch 'maint'
2018-01-03 15:26:38 +01:00
7e8e12be21
org-table: Improve a docstring
...
* lisp/org-table.el (org-table-import): Improve docstring.
Fixes: 22597
2018-01-03 15:25:33 +01:00
d6369e9ac6
Use completion in `org-set-effort'
...
* contrib/manual.org: Document change.
* lisp/org.el (org-set-effort): Change signature.
(org-inc-effort): Apply signature change.
Fixes: 22776, 22597
2018-01-02 22:00:35 +01:00
b030475575
Merge branch 'maint'
2018-01-02 14:14:18 +01:00
16c7ae7996
Fix handling nested VISIBILITY properties
...
* lisp/org.el (org-set-visibility-according-to-property): Fix handling
nested VISIBILITY properties.
* testing/lisp/test-org.el (test-org/set-visibility-according-to-property):
New test.
Reported-by: Michael Maurer <maurer.michael@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00012.html >
2018-01-02 14:13:46 +01:00
1bf34d5b8a
Merge branch 'maint'
2018-01-02 12:43:36 +01:00
ec6813157e
org-capture: Demote error when capturing `file+headline' in non-Org buffers
...
* lisp/org-capture.el (org-capture-set-target-location): Warn when
capturing a `file+headline' target and buffer is not in Org mode.
Fixes: 22352
2018-01-02 12:40:54 +01:00
63e9f45238
Merge branch 'maint'
2018-01-02 11:51:52 +01:00
4c9b5f600f
ox-beamer: Update copyright year
2018-01-02 11:51:26 +01:00
c887e78c02
Merge branch 'maint'
2018-01-02 11:50:20 +01:00
18cc1068a2
ox-beamer: Update default environment templates
...
* lisp/ox-beamer.el (org-beamer-environments-default): Update
templates wrt %U.
%U meaning changed in commit
f3168ff90a
2018-01-02 11:00:58 +01:00
9067b8427d
Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
2018-01-01 13:06:12 +01:00
e9f30779de
Merge branch 'maint'
2017-12-31 15:49:55 +01:00
af58a6dbf7
Change Org-mode into Org mode
...
* lisp/ob-core.el (org-babel-result-to-file):
* lisp/ob-picolisp.el:
* lisp/org-agenda.el (org-check-for-org-mode):
(org-search-view):
(org-tags-view):
(org-agenda-cleanup-fancy-diary):
(org-agenda-get-day-entries):
* lisp/org-table.el (orgtbl-mode):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode):
* lisp/org.el (org-modules):
(org-startup-options):
(org-fontify-meta-lines-and-blocks):
* mk/default.mk:
* mk/manfull.pl:
* mk/org-fixup.el (org-make-org-version):
(org-make-org-loaddefs):
* mk/orgcard2txt.pl (rep_esc):
* mk/targets.mk ($(info):
* testing/README:
(Example):
* testing/examples/no-heading.org:
* testing/examples/normal.org: Change Org-mode into Org mode
2017-12-31 15:48:09 +01:00
a374b8b92a
Silence byte-compiler
2017-12-31 15:16:12 +01:00
87eb9ab4e9
org-list: Remove radio lists
...
* lisp/org-list.el (org-list-radio-list-templates): Remove variable.
(org-list-insert-radio-list):
(org-list-send-list): Remove functions.
* contrib/manual.org: Remove references to radio lists.
2017-12-30 10:28:50 +01:00
2b96b08eaf
Remove reference to Message mode
...
* lisp/org.el (org-adaptive-fill-function):
(org-fill-element): Remove reference to Message mode. These functions
are Org mode specific.
2017-12-30 10:28:50 +01:00
eeb4c22090
Remove OrgStruct mode
...
* lisp/org.el (org-overview): Use `org-outline-regexp-bol' instead of
`outline-regexp'.
(org-heading-components): Ignore orgstruct-mode.
(orgstruct-heading-prefix-regexp):
(orgstruct-setup-hook):
(org-local-vars):
(orgstruct-mode):
(turn-on-orgstruct):
(orgstruct-is-++):
(org-fb-vars):
(orgstruct++-mode):
(turn-on-orgstruct++):
(orgstruct-error):
(orgstruct-setup):
(orgstruct-make-binding):
(org-run-like-in-org-mode):
(org-indent-line):
(org-fill-paragraph):
(org-show-children): Remove Orgstruct mode
* doc/org.texi (Orgstruct mode): Remove node.
2017-12-30 10:28:50 +01:00
d4d9e90d19
org-table: Small optimization
...
* lisp/org-table.el (org-table-check-inside-data-field): Add optional
argument.
(org-table-find-dataline): Do not call `org-at-table-p' needlessly.
(org-table-delete-column):
(org-table-move-column):
(org-table-copy-region):
(org-table-eval-formula): Use new argument.
(org-table-force-dataline): Small refactoring.
This patch limits the number of calls to `org-at-table-p'.
2017-12-30 00:58:11 +01:00
58c9bedfd5
Merge branch 'maint'
2017-12-29 18:58:41 +01:00
199908ba62
org: Enhance non-interactive calls to `org-insert-link`
...
* org.el (org-insert-link): When called non-interactivily,
don't allow to edit the default description.
2017-12-29 18:43:40 +01:00
29dd9a6605
org.el: New value for `org-todo-repeat-to-state'
...
* lisp/org.el (org-todo-repeat-to-state): Allow `t' to use
the previous TODO state.
* doc/org.texi (Repeated tasks): Document the new optional
value of `org-todo-repeat-to-state'.
2017-12-29 18:36:27 +01:00
8983ac917b
org-colview: Allow to filter by tags/property when capturing colview
...
* org-colview.el (org-columns--capture-view): New
argument "match" to filter out unmatched entries.
(org-dblock-write:columnview): Use the new argument.
Thanks to Thierry Stoehr for proposing this.
2017-12-29 18:18:14 +01:00
d792b57ffc
org-table: Correctly match ".[0-9]+" as a number
...
* lisp/org-table.el (org-table-copy-down): Correctly match
".[0-9]+" as a number.
2017-12-29 18:14:42 +01:00
144451143a
Merge branch 'maint'
2017-12-28 19:15:43 +01:00
e401afffde
inlinetask: Fix folding of directly consecutive inlinetask children
2017-12-28 19:12:36 +01:00
6311c12556
Merge branch 'maint'
2017-12-28 18:05:54 +01:00
b29a972307
org-inlinetask:Fix folding of inline tasks within plain list
...
This is the fix proposed by Nicolas. See
http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00564.html
Add and accommodate some tests.
2017-12-28 17:59:52 +01:00
401890986c
Revert "org-table: Improve bidirectional reordering in tables"
...
This reverts commit f4ae1941c9
2017-12-28 12:29:04 +01:00
a88bd87787
Merge branch 'maint'
2017-12-27 23:57:37 +01:00
ff0f3e4723
Fix `org-todo'
...
* org.el (org-todo): Use marker `change-plist' position property to
permit triggering through "org-depend.el" with parent heading
statistics.
When TODO statistics in parent headings were updated it shifted the point
defining the :position property in `change-plist' causing headlines
with TRIGGER properties to fail to evaluate.
TINYCHANGE
2017-12-27 23:57:15 +01:00
01e150eb59
ox-publish: Cache results for `org-publish-find-date'
...
* lisp/ox-publish.el (org-publish-find-date): Cache results.
(org-publish-find-title): Tiny refactoring.
Reported-by: Lorenzo Bolla <lbolla@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00561.html >
2017-12-27 23:44:55 +01:00
b30afa39b0
Merge branch 'maint'
2017-12-27 23:24:08 +01:00
f2c712a6a4
Fix inserting link
...
* lisp/org.el (org-insert-link): Fix when search option in a file link
contains two consecutive slashes.
Reported-by: Ag Ibragimov <agzam.ibragimov@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00560.html >
2017-12-27 23:22:07 +01:00
7b6ec64e0e
Merge branch 'maint'
2017-12-25 23:54:36 +01:00
85ed1fd01d
Fix visibility cycling when point is invisible
...
* lisp/org.el (org-cycle-internal-local): Fix visibility cycling when
point is invisible.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00314.html >
2017-12-25 23:53:26 +01:00
b9491c967c
Merge branch 'maint'
2017-12-25 12:35:42 -05:00
5696f353dc
ob-haskell: Fix indentation from b46787743
...
This fails Emacs's pre-commit check (lisp/org/ob-haskell.el:77: space
before tab in indent).
2017-12-25 12:29:27 -05:00
57a8dde8e3
Merge branch 'maint'
2017-12-25 00:14:51 +01:00
b3ddb051e6
ob-exp: Fix source blocks generated by other source blocks
...
* lisp/ob-exp.el (org-babel-exp--at-source): Source blocks generated
by evaluating other source blocks may not be found in the original
buffer. In that case, do not move point.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00538.html >
2017-12-25 00:10:39 +01:00
a343b0000a
org-table: Improve bidirectional reordering in tables
...
* lisp/org-table.el (org-table-separator-space): New variable.
(org-table-align): Use new variable.
2017-12-23 23:42:46 +01:00
f4ae1941c9
org-table: Improve bidirectional reordering in tables
...
* lisp/org-table.el (org-table-separator-space): New variable.
(org-table-align): Use new variable.
2017-12-23 23:37:45 +01:00
4d3e7a2a57
ob-core: All Noweb parameters are read at point of definition
...
* lisp/ob-core.el (org-babel-params-from-properties): Do not force
using `org-babel-current-src-block-location'. Extract properties
from point.
(org-babel--noweb-reference): Remove function.
(org-babel-expand-noweb-references): Apply function removal. Small
refactoring.
* lisp/ob-lob.el (org-babel-lob-get-info): Small refactoring.
2017-12-23 15:56:53 +01:00
38be851245
ob-core: Do not always evaluate Lisp code in parameters
...
* lisp/ob-core.el (org-babel-get-src-block-info):
(org-babel-params-from-properties):
(org-babel-parse-header-arguments): Add optional argument disabling
Lisp evaluation in parameters.
2017-12-23 15:45:03 +01:00
1e40dd6486
ob-core: Tiny refactoring
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Tiny
refactoring.
2017-12-23 14:03:52 +01:00
774e553f11
Merge branch 'maint'
2017-12-23 14:03:47 +01:00
d9125e435f
Fix recursive Noweb expansion
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Recursive Noweb
expansion obey to :noweb parameter.
* testing/lisp/test-ob.el (test-ob/noweb-expansion): Add tests.
Fixes: 17523
2017-12-23 13:58:25 +01:00
7e77560ebb
Merge branch 'maint'
2017-12-22 19:22:06 +01:00
bac8d25441
org-clock: Fix timezone in `org-clock-get-sum-start'
...
* lisp/org-clock.el (org-clock-get-sum-start): Remove timezone
argument from `encode-time'.
Reported-by: Ihor Radchenko <ihor_radchenko@mymail.sutd.edu.sg>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00499.html >
2017-12-22 19:19:49 +01:00
6e95e088e8
Merge branch 'maint'
2017-12-20 17:15:52 -05:00
4f3fc9cb20
Fix double-escaping of # and 
Nicolas Goaziou
Kyle Meyer
Bastien
Martin Kampas
Matt Lundin
Sebastian Reuße
Vladimir Panteleev
Daniel Gomez
stardiviner
Pierre Téchoueyres
Glenn Morris
Paul Eggert
Alex Branham
Nick Dokos
Nicolas Dudebout
Kaushal Modi
Tim Landscheidt
Marco Wahl
Jose Robins
Jack Henahan
thibault
Xu Chunyang
Aliaksey Artamonau
Ian Dunn
Alex Branham
Adrian Bradd
Neil Jerram
Jack Kamm
Doro Rose
Rasmus
Eric S Fraga