263a0cf00e
Fix defcustom type
...
* lisp/org-agenda.el (org-agenda-custom-commands-local-options):
* lisp/org-duration.el (org-duration-units):
* lisp/org.el (org-occur-case-fold-search): Remove spurious quote.
Fixes: 29694
lignes
2017-12-14 00:40:27 +01:00
bbf39576f4
org-tempo: Fix typo
...
* lisp/org-tempo.el (org-tempo-tags): Fix typo
2017-12-14 00:25:59 +01:00
5d2517ba5a
Merge branch 'maint'
2017-12-14 00:18:20 +01:00
d9a6408baf
Fix defgroups
...
* lisp/org.el (org-structure-template-alist): Use `org-edit-structure'
instead of non-existent `org-completion'.
* lisp/ox-publish.el (org-export-publish): Rename from `org-publish'.
* lisp/org-pcomplete.el (org-complete): Remove unused group.
Fixes: 29698
2017-12-14 00:16:18 +01:00
a36d18caa4
Merge branch 'maint'
2017-12-13 23:52:06 +01:00
08fa2ae056
Fix some defcustoms types
...
* lisp/ob-stan.el (org-babel-stan-cmdstan-directory):
* lisp/org.el (org-latex-default-packages-alist):
* lisp/ox-odt.el (org-odt-with-latex): Fix type mismatch.
Fixes: 29695
2017-12-13 23:51:10 +01:00
2390b6302d
Merge branch 'maint'
2017-12-11 23:21:07 +01:00
0dde39ccd3
org-archive: Fix point after archiving to sibling
...
* lisp/org-archive.el (org-archive-to-archive-sibling): Move point in
a consistent way upon archiving to a sibling.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00158.html >
2017-12-11 23:19:40 +01:00
e8b71b86d2
Merge branch 'maint'
2017-12-11 15:14:01 +01:00
b467877437
Fix ob-haskell.el to work with custom ghci prompts
...
* lisp/ob-haskell.el (haskell-prompt-regexp): Define defvar
`haskell-prompt-regexp`. This variable will override the variable set by
inf-haskell, when `org-babel-execute:haskell` is called.
(org-babel-execute:haskell): Make sure that
`comint-prompt-regexp` is set appropriately to enable correct parsing
of "λ"-prompts. Set `comint-preoutput-filter-functions` appropriately to
enable correct parsing of coloured ghci prompts.
The problem was that code sent back from the inf-haskell buffer to
org-babel wasn't parsed correctly in `org-babel-comint-with-output`.
This occured when the user uses the commonly used "λ"-prompt.
TINYCHANGE
2017-12-11 15:11:56 +01:00
c3c1c52eb8
ox: Fix inline source block evaluation
...
* lisp/ox.el (org-export-as): Specifically expand {{{results}}} macro
after Babel code execution.
* testing/lisp/test-ox.el (test-org-export/expand-macro): Add test.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00202.html >
2017-12-11 14:56:57 +01:00
076cba6b2d
Fix last commit
...
* lisp/org.el (org-show-all): Remove function.
2017-12-10 23:50:30 +01:00
6f89177ee6
Move `org-unlogged-message' to "org-macs.el"
...
* lisp/org.el (org-unlogged-message): Move function to...
* lisp/org-macs.el: ... here.
2017-12-10 23:37:59 +01:00
fc5abc2d55
ob-core: Insert lowercase results
...
* lisp/ob-core.el (org-babel-insert-result): Insert lower case blocks
and drawers.
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--results-wrap):
(test-ob/org-babel-remove-result--results-org):
(test-ob/org-babel-remove-result--results-html):
(test-ob/org-babel-remove-result--results-latex):
(test-ob/org-babel-remove-result--results-code): Update tests.
2017-12-10 23:05:32 +01:00
a34431f6ea
org-tempo: Tiny refactoring
...
* lisp/org-tempo.el (org-tempo--include-file): Tiny refactoring.
2017-12-10 17:11:24 +01:00
3efb000739
org-tempo: Enable Tempo in all Org buffers after load
...
* lisp/org-tempo.el: Enable Org Tempo in all buffers after load.
Reported-by: Charles Berry <ccberry@ucsd.edu>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00172.html
2017-12-10 12:01:09 +01:00
94f1a58438
org-tempo.el: New file for expansion of templates
...
* lisp/org-tempo.el: New file.
* doc/org.texi (Structure templates):
* lisp/org.el (org-modules): Add org-tempo.
* testing/lisp/test-org-tempo.el: New file.
2017-12-08 00:29:08 +01:00
d435c75f54
Merge branch 'maint'
2017-12-07 14:20:33 +01:00
1187538a21
Allow gnuplot to generate plots in different directories
...
* lisp/ob-gnuplot.el (org-babel-expand-body:gnuplot) if the Org buffer
is associated with a file, direct gnuplot to change to the directory
for that file.
2017-12-07 14:20:06 +01:00
3695415199
Merge branch 'maint'
2017-12-06 23:16:55 +01:00
b570175d76
Fix `org-files-list'
...
* lisp/org.el (org-files-list): Prevent duplicates in result.
Reported-by: Renato Ferreira <renatofdds@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00134.html >
2017-12-06 23:15:59 +01:00
15df8db7ad
Merge branch 'maint'
2017-12-04 22:43:31 +01:00
0e7e3bc6df
Remove some references to reserved keybinding prefix `C-c a'
...
* lisp/org-agenda.el (org-stuck-projects):
(org-agenda-menu):
* lisp/org.el (org-org-menu): Remove references to reserved keybinding
prefix `C-c a'.
Fixes: 28263
2017-12-04 22:42:16 +01:00
494414028a
Merge branch 'maint'
2017-12-04 22:21:25 +01:00
66754e9042
org-feed: Fix parsing <guid>
...
* lisp/org-feed.el (org-feed-parse-rss-feed): Fix regexp for <guid>.
Fixes: 27711
2017-12-04 22:20:25 +01:00
f8db6e0295
Merge branch 'maint'
2017-12-04 18:55:29 +01:00
d3f7309cbd
org-irc: Silence byte-compiler
2017-12-04 18:55:03 +01:00
ada2f64b16
org-attach: Make `org-attach-directory' a safe variable
...
* lisp/org-attach.el (org-attach-directory): Add :safe keyword.
2017-12-04 14:55:20 +01:00
0c691737aa
Merge branch 'maint'
2017-12-04 08:24:19 +01:00
e22ee8b8a3
Fix bug in HTML export of code blocks with starting blank lines
...
* lisp/ox-html.el (org-html-do-format-code): Preverse starting blank
lines when splitting code lines (use `split-string' instead of
`org-split-string').
(org-html-fontify-code): Preserve starting blank lines in returned
code string.
2017-12-04 08:24:02 +01:00
a0e3f1d505
Merge branch 'maint'
2017-12-03 18:14:48 +01:00
037db00f40
Fix last commit
...
* lisp/org.el (org-org-menu): Fix last commit.
2017-12-03 18:14:21 +01:00
7fc901ca0f
Merge branch 'maint'
2017-12-03 18:04:18 +01:00
b4079bb894
Activate CDLatex entry in menu only if `cdlatex' is loaded
...
* lisp/org.el (org-org-menu): Activate CDLatex entry in menu only if
`cdlatex' is loaded.
Fixes: 4068
2017-12-03 18:03:19 +01:00
ff36e945ca
Merge branch 'maint'
2017-12-03 16:24:49 +01:00
efe440adbe
org-gnus: Silence byte-compiler
...
Fixes: 29329
2017-12-03 16:22:45 +01:00
259656a76e
Merge branch 'maint'
2017-12-03 09:03:37 +01:00
2faaacfeeb
Revert the whole time zone mess
...
* lisp/org.el (org-time-string-to-time):
(org-time-string-to-seconds): Remove optional ZONE argument.
(org-2ft):
(org-check-before-date):
(org-check-after-date):
(org-check-dates-range):
(org-parse-time-string):
* lisp/org-clock.el (org-clock-get-sum-start):
(org-clock-out):
(org-clock-timestamps-change):
(org-clock-sum):
(org-clock-update-time-maybe):
* lisp/org-colview.el (org-columns--age-to-minutes): Apply change.
* testing/lisp/test-org-clock.el (org-test-clock-create-clock):
(test-org-clock/clocktable/scope):
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
Apply change. Simplify tests to avoid daylight saving time issue.
2017-12-03 08:57:37 +01:00
14620fdf0c
Yet another tweak to fontification
...
* lisp/org.el (org-do-emphasis-faces): Handle properly asterisks at
the beginning of line.
2017-12-02 23:21:36 +01:00
8bd9839952
Revert "Fix headline fontification"
...
This reverts commit 5873d99121
2017-12-02 23:07:51 +01:00
bdaf5dacf4
Merge branch 'maint'
2017-12-02 17:27:53 +01:00
ca43c1f262
Fix RET past the last column of a table
...
* lisp/org.el (org-return): Split the table before first column or
after last one.
* lisp/org-table.el (org-table-next-row): Remove code handling split.
* testing/lisp/test-org.el (test-org/return): Add test.
2017-12-02 17:23:03 +01:00
0ace32b045
Merge branch 'maint'
2017-12-02 12:23:02 +01:00
f53d1e2005
Let `or-export-last-sibling-p' handle discontinuous headlines
...
* lisp/ox.el (org-export-last-sibling-p): Handle discontinuous
headlines.
* testing/lisp/test-ox.el (test-org-export/last-sibling-p): Add test.
Fixes: 24836
2017-12-02 12:22:32 +01:00
7a3cae65a7
Merge branch 'maint'
2017-12-01 19:35:54 +01:00
0cc231a7bb
Call store link functions only once
...
* lisp/org.el (org-store-link): Call store link functions only once.
Fixes: 19914
2017-12-01 19:33:35 +01:00
1bb9cf1597
Merge branch 'maint'
2017-11-29 23:02:42 +01:00
dd3bf50adf
Preserve point when storing link in Gnus nnir groups
...
* lisp/org-gnus.el: (org-gnus-store-link) This fixes a similar issue
as commit 84b329516e
2017-11-29 21:05:19 +01:00
326b2e85e4
Merge branch 'maint'
2017-11-29 19:03:22 +01:00
84b329516e
Preserve position of point in gnus virtual group
...
* lisp/org-gnus.el: (org-gnus-store-link) Add a save-excursion to
protect the position of point. Otherwise, when calling org-capture
in an article with a virtual group, the point is moved and the
region captured is incorrect.
2017-11-29 19:02:57 +01:00
fada34bb97
Merge branch 'maint'
2017-11-29 15:10:48 +01:00
45c4502713
org-capture: Re-introduce history list per prompt
...
* lisp/org-capture.el (org-capture--prompt-history-table):
(org-capture--prompt-history): New variables.
(org-capture-fill-template): Handle history list per prompt.
Reported-by: Karl Eichwalder <ke@gnu.franken.de>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00251.html >
2017-11-29 15:09:44 +01:00
ee7ead62aa
Make `org-comment-dwim' check if on a heading
...
* lisp/org.el (org-comment-dwim): If on a heading, comment the
heading.
* testing/lisp/test-org.el: Add test.
TINYCHANGE
2017-11-29 14:41:12 +01:00
819b2a1a3d
Merge branch 'maint'
2017-11-28 23:59:21 +01:00
b4b2809eb1
ob-core: Fix `org-babel-src-block-names'
...
* lisp/ob-core.el (org-babel-src-block-names): Do not change
visibility or windows when called.
2017-11-28 23:57:18 +01:00
e92732efd0
Merge branch 'maint'
2017-11-28 23:35:44 +01:00
ebe9eb2423
ob-core: Fix last commit
...
* lisp/ob-core.el (org-babel-result-end): Add missing `example-block'
result type.
2017-11-28 23:35:01 +01:00
c1d7b2cda3
Merge branch 'maint'
2017-11-27 23:26:38 +01:00
d7940ae2a7
ob-core: Fix removal of elements after RESULTS
...
* lisp/ob-core.el (org-babel-result-end): Ignore elements that do not
correspond to a valid result type (e.g., a headline).
Fixes commit 1d8126385chttp://lists.gnu.org/r/emacs-orgmode/2017-11/msg00384.html >
2017-11-27 23:23:04 +01:00
68544f4f21
Merge branch 'maint'
2017-11-27 23:02:26 +01:00
5873d99121
Fix headline fontification
...
* lisp/org.el (org-do-emphasis-faces): Do not emphasize stars in
headlines.
Reported-by: swflint@flintfam.org (Samuel W. Flint)
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00363.html >
2017-11-27 22:54:41 +01:00
5cd7eb3d53
Merge branch 'maint'
2017-11-26 20:35:57 -05:00
adfbfd42b2
Backport commit a89f0b6f3 from Emacs
...
maint: shorten https://lists.gnu.org/archive/html/ ... links
a89f0b6f33f9eb8910a1fceda9028d76ef50b05d
Paul Eggert
Sat Nov 25 22:48:12 2017 -0800
2017-11-26 20:35:46 -05:00
579fa12f50
Merge branch 'maint'
2017-11-26 11:02:14 +01:00
ac4b756588
Silence byte-compiler
2017-11-26 11:01:55 +01:00
18f6610b32
ox-html: Fix last commit
...
* lisp/ox-html.el (org-html-link): Fix last commit.
2017-11-26 10:57:02 +01:00
b186d1d723
Do not save target buffer after archiving subtree
...
* lisp/org-archive.el: (org-archive-subtree) Do not save buffer after
each archive. Saving the archive buffer after archiving each
subtree results in substantial slowdown and many writes to disk when
archiving an active region. This brings the behavior of
org-archive-subtree into line with org-refile, which does not save
the target buffer after refiling.
2017-11-26 10:52:31 +01:00
63f6e851bc
Do not save target buffer after archiving subtree
...
* lisp/org-archive.el: (org-archive-subtree) Do not save buffer after
each archive. Saving the archive buffer after archiving each
subtree results in substantial slowdown and many writes to disk when
archiving an active region. This brings the behavior of
org-archive-subtree into line with org-refile, which does not save
the target buffer after refiling.
2017-11-26 10:52:03 +01:00
26c2ad99cf
ox-publish: Fix resolving url-encoded external links
...
* lisp/ox-publish.el (org-publish-resolve-external-link): Handle
url-encoded links. Do not ask to create a new headline if none is
found.
2017-11-26 10:49:28 +01:00
b0ab7008df
Merge branch 'maint'
2017-11-26 10:47:55 +01:00
6aac798f25
Fix publishing links to absolute file names belonging to project
...
* lisp/ox-publish.el (org-publish-file-relative-name): New function.
* lisp/ox-html.el (org-html-link): Use new function.
* testing/lisp/test-ox-publish.el (test-org-publish/file-relative-name):
New test.
2017-11-26 10:46:53 +01:00
be1e807942
Merge branch 'maint'
2017-11-25 21:13:58 +01:00
1d8126385c
ob-core: Fix results removal without blank line between source and results
...
* lisp/ob-core.el (org-babel-remove-result): Delete blank lines before
results.
(org-babel-result-end): Use `org-element-at-point'.
* testing/lisp/test-ob.el (test-ob-verify-result-and-removed-result):
Remove duplicate.
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--no-blank-line):
New test.
* testing/lisp/test-ob.el (test-ob/results-in-narrowed-buffer): Small
refactoring.
Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00338.html >
2017-11-25 21:07:52 +01:00
d7f2c8b8e1
Merge branch 'maint'
2017-11-25 15:42:33 +01:00
ed06b159c3
Small fix to emphasis fontification
...
* lisp/org.el (org-do-emphasis-faces): Do not span over paragraph
separators.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00202.html >
2017-11-25 15:42:10 +01:00
f67e62eb3f
Merge branch 'maint'
2017-11-25 15:33:22 +01:00
1b1966a144
Fix cross-references from %-encoded links in publishing
...
* lisp/ox-publish.el (org-publish-resolve-external-link): Decode
search string.
Reported-by: Martin Hans <martinhansdk@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00328.html >
2017-11-25 15:30:56 +01:00
b6df86a303
org-macro: Silence byte-compiler
2017-11-22 23:35:50 +01:00
51234f9555
org-macro: Implement "keyword" macro
...
* lisp/org-macro.el (org-macro-initialize-templates): Implement
"keyword" macro.
* doc/org.texi (Macro replacement): Document new macro.
* testing/lisp/test-org-macro.el (test-org-macro/keyword): New test.
2017-11-21 23:38:24 +01:00
5f5d82ed51
Remove second pass for macro expansion
...
* lisp/org-macro.el (org-macro-initialize-templates): Initialize all
macros, including {{{title}}} and al.
(org-macro-replace-all): Change signature.
(org-macro--find-keyword-value): New function.
* lisp/ox.el (org-export-as): Remove second macro expansion
2017-11-21 22:27:42 +01:00
7455f4bf83
ox: Allow a less strict UNNUMBERED inheritance
...
* lisp/ox.el (org-export-collect-headlines):
(org-export-excluded-from-toc-p): Allow to number headlines in the
middle of an otherwise unnumbered tree.
* testing/lisp/test-ox.el (test-org-export/collect-headlines):
(test-org-export/excluded-from-toc-p):
(test-org-export/toc-entry-backend): Update tests. Add more tests.
Reported-by: Akater <nuclearspace@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00219.html >
2017-11-20 14:07:03 +01:00
f482cfa785
Merge branch 'maint'
2017-11-20 00:14:05 +01:00
82812ff086
ox: Fix UNNUMBERED strict inheritance
...
* lisp/ox.el (org-export-numbered-headline-p): Use a less opinionated
definition of inheritance.
* testing/lisp/test-ox.el (test-org-export/numbered-headline-p):
Update test.
* doc/org.texi (Export settings): Insist on UNNUMBERED inheritance.
It is now possible to number a headline within an unnumbered tree.
2017-11-20 00:09:59 +01:00
b8d473a04f
org-table: Insert new column to the right instead of the left
...
* lisp/org-table.el (org-table-insert-column): Insert new column to
the right instead of the left.
* testing/lisp/test-org-table.el (test-org-table/insert-column): New
test.
2017-11-19 23:22:16 +01:00
de289d1fe8
Merge branch 'maint'
2017-11-15 22:50:56 +01:00
946f76d707
org-table: Better fix for `:org-untouchable'
...
* lisp/org-table.el (org-table-recalculate): Fix typo in existing
`remove-text-properties' call instead of adding a new one.
Also, cleaning property before processing formulas is more robust,
e.g., if last process raised an error.
2017-11-15 22:47:06 +01:00
04e0532ef5
Merge branch 'maint'
2017-11-15 18:59:05 +01:00
696ec60341
org-macs: Fix typos in docstrings
...
* lisp/org-macs.el (org-split-string):
(org-string-width): Fix typo in docstring.
2017-11-15 18:58:44 +01:00
966af419f9
Merge branch 'maint'
2017-11-15 18:14:44 +01:00
40f73953f6
Fix `org-string-display'
...
* lisp/org-macs.el (org-string-display): Preserve original string's
display property when computing displayed width.
* testing/lisp/test-org-macs.el (test-org/string-display): Add test.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00160.html >
2017-11-15 18:13:34 +01:00
64ac3bb5b3
ox-ascii: Lighten numbering in table of contents
...
* lisp/ox-ascii.el (org-ascii--build-title): Use only last number in
headline numbering when building table of contents.
2017-11-15 17:43:08 +01:00
8ff3673dfc
Merge branch 'maint'
2017-11-15 17:41:48 +01:00
6059c3a057
org-table: Clean left-over `:org-untouchable' property
...
* lisp/org-table.el (org-table-recalculate): Clean `:org-untouchable'
property once we no longer need it.
* testing/lisp/test-org-table.el (test-org-table/formula-priority):
New test.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00159.html >
2017-11-15 17:40:22 +01:00
5c382f2ee2
org-attach,test-org-attach: Refactoring.
...
* lisp/org-attach.el (org-attach-dired-to-subtree): Renamed from
`org-attach-dired-attach-to-next-best-subtree'. Convenience
functions have been dropped.
* testing/lisp/test-org-attach.el: Tests use
`org-test-with-temp-text-in-file' now and are cleaner now.
2017-11-15 14:39:26 +01:00
a49ac98f3f
org-attach: Refactor. Replace self made with available function.
...
* lisp/org-attach.el (org-attach-dired-marked-files-or-file-at-cursor-in-dired)
(org-attach-dired-marked-files-in-dired): Removed. Use
`dired-get-marked-files' instead.
2017-11-15 12:21:18 +01:00
615b147031
org-attach: Attach files specified in a dired buffer.
...
* lisp/org-attach.el (org-attach-attach-files): New.
(org-attach-dired-marked-files-in-dired): New
(org-attach-dired-marked-files-or-file-at-cursor-in-dired): New.
(org-attach-dired-attach-to-next-best-subtree): New command.
(org-attach-dired-attach-to-next-best-subtree-cp): New command.
(org-attach-dired-attach-to-next-best-subtree-mv): New command.
(org-attach-dired-attach-to-next-best-subtree-ln): New command.
(org-attach-dired-attach-to-next-best-subtree-lns): New command.
* testing/lisp/test-org-attach.el: Tests.
2017-11-15 11:25:51 +01:00
c029c4d45d
Merge branch 'maint'
2017-11-13 22:09:46 -05:00
18af0f88d7
Backport commit 98288ecaf from Emacs
...
* lisp/org-clock.el (org-clock--oldest-date): Fix an issue when
compiling on macOS 10.6 with a western time zone (a continuation of
Bug#27736).
Further workaround for faulty localtime() under macOS 10.6
98288ecaffbc0947ec3193088172ea85ad5e42a5
Charles A. Roelli
Wed Nov 8 20:51:48 2017 +0100
2017-11-13 22:07:59 -05:00
9cac9d7bc7
Merge branch 'maint'
2017-11-12 23:29:38 +01:00
3f8d67c490
ox-html: Allow disabling htmlize
...
* lisp/ox-html.el (org-html-fontify-code): Do it.
Disable htmlize by setting org-html-htmlize-output-type to nil.
TINYCHANGE
2017-11-12 23:28:57 +01:00
4c703513a7
Merge branch 'maint'
2017-11-12 22:38:26 +01:00
fcf4bb61ec
Add CS export translations
...
* lisp/ox.el (org-export-dictionary): Add translations for CS.
TINYCHANGE
2017-11-12 22:37:04 +01:00
44189a72d5
Merge branch 'maint'
2017-11-10 19:40:15 +01:00
12e41c445b
org-attach: Fix handling of ATTACH tag at sychronize
...
* lisp/org-attach.el (org-attach-sync): Remove ATTACH tag at
synchronize when no files left.
2017-11-10 19:35:35 +01:00
d07ee7f7f2
Implement :pre-blank property for items and footnotes definitions
...
* lisp/org-element.el (org-element-footnote-definition-parser):
(org-element-item-parser): Add `:pre-blank' property.
(org-element-footnote-definition-interpreter):
(org-element-item-interpreter):
(org-element-interpret-data):
* lisp/ox.el (org-export-data): Use new property.
* testing/lisp/test-org-element.el (test-org-element/footnote-definition-parser):
(test-org-element/item-parser): Add tests.
2017-11-10 00:38:31 +01:00
28ebfa6d77
Merge branch 'maint'
2017-11-06 23:10:13 +01:00
0880fc580e
ox-ascii: Small fix to items that do not start with a paragraph
...
* lisp/ox-ascii.el (org-ascii-item): Use better heuristics to
determine if contents should follow bullet or start a new line.
Contents follow bullet when the first contributing line is
a paragraph. As a consequence, the following snippet
-
#+html: ...
This is a paragraph.
is exported as
- This is a paragraph.
instead of
-
This is a paragraph.
previously.
2017-11-06 23:07:17 +01:00
76a9e1d01d
Merge branch 'maint'
2017-11-06 14:32:11 +01:00
7000ed9ee0
ox-ascii: Fix descriptive lists
...
* lisp/ox-ascii.el (org-ascii-quote-margin): Update docstring.
(org-ascii--current-text-width): Properly handle width of text within
nested plain-list items.
(org-ascii-item): Always start a new line for description contents.
Indent them by `org-ascii-quote-margin' characters.
2017-11-06 14:27:45 +01:00
8d43a0c49f
ox-texinfo: Gracefully handle node collision in the same hierarchy
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Ensure the upper element
get the shorter node.
Considering the following document:
* Headline
** Headline
the level 1 headlines get "Headline" node and the other one
"Headline (1)".
2017-11-05 12:22:18 +01:00
04f35fc473
ox-texinfo: Preserve target name as node.
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Use target's value as
base for the node name, instead of using `org-export-get-reference'.
2017-11-05 10:32:13 +01:00
c04e357f3d
Replace easy templates with org-insert-structure-template
...
* lisp/org.el (org-insert-structure-template): New function for
wrapping region (or element at point) in a begin/end block.
(org-structure-predefined-blocks): New option holding predefined
blocks, for completion.
(org-try-structure-completion,
org-complete-expand-structure-template): Remove functions.
* doc/org.texi (Inserting structure templates): Document.
* testing/lisp/test-org.el (test-org/insert-template): New test.
2017-11-05 09:56:26 +01:00
fd50740c96
Merge branch 'maint'
2017-11-04 22:41:07 +01:00
271e58f2dd
Fix characters conversion issue when loading `org-id-locations-file'
...
* lisp/org-id.el (org-id-locations-load): Use `insert-file-contents'
instead of `insert-file-contents-literally'.
Reported-by: Anders Johansson <mejlaandersj@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00037.html >
2017-11-04 22:40:02 +01:00
7ba058963e
Merge branch 'maint'
2017-11-04 21:51:40 +01:00
6186ed3a22
org-element: Fix item parser
...
* lisp/org-element.el (org-element--list-struct): Correctly handle end
of sub-lists and end of last item.
* testing/lisp/test-org-element.el (test-org-element/item-parser):
(test-org-element/plain-list-parser): Add tests.
2017-11-04 21:50:11 +01:00
db16370c0b
ox-texinfo: Fix @ref without description
...
* lisp/ox-texinfo.el (org-texinfo--@ref): Prefer @ref{} with a single
argument when no description is provided.
2017-11-04 21:50:00 +01:00
9bee79a102
Merge branch 'maint'
2017-11-03 23:11:07 +01:00
08c9de2a74
Fix typo in docstring
...
* lisp/org.el (org-speed-commands-user): Fix typo in docstring.
2017-11-03 23:10:38 +01:00
6a273e30d7
Merge branch 'maint'
2017-11-03 22:20:46 +01:00
f38a7d433b
org-capture: Fix aborting after inserting text at end of buffer
...
* lisp/org-capture.el (org-capture-mark-kill-region): Set end marker
insertion type so that it advances when inserting text at the end of
the capture buffer.
* testing/lisp/test-org-capture.el (test-org-capture/insert-at-end-abort):
Add test case.
Inserting text at the end of the capture buffer does not advance the
end kill marker. This causes the narrowing region and the kill
markers to get out of sync, which prevents 'org-capture-finalize' from
correctly cleaning the target buffer when aborting the capture.
Setting the kill end marker insertion type fixes this.
TINYCHANGE
2017-11-03 22:20:11 +01:00
902bfe1892
Merge branch 'maint'
2017-11-03 12:22:33 +01:00
b5f075aa05
ox-texinfo: Fix spurious blank lines in detailed menu.
...
* lisp/ox-texinfo.el (org-texinfo--build-menu): Prevent spurious blank
lines in detailed menu.
2017-11-03 12:21:56 +01:00
c470edba77
ox-texinfo: Prettify adjunct for indentical nodes.
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Nicer adjunct for
identical nodes.
2017-11-03 11:35:53 +01:00
f9c09b194f
ox-texinfo: Allow cross-references to headlines excluded from TOC
...
* lisp/ox-texinfo.el (org-texinfo-headline): Use @anchor instead of
@node for headlines outside TOC.
2017-11-03 11:34:21 +01:00
36578fda46
Merge branch 'maint'
2017-10-31 19:34:35 +01:00
8860fe2938
Fix `org-display-inline-images'
...
* lisp/org.el (org-display-inline-images): Fix regexp.
Reported-by: Leslie Watter <watter@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00455.html >
2017-10-31 19:33:55 +01:00
4388bdf852
Merge branch 'maint'
2017-10-30 00:51:31 +01:00
2567fee3c9
Fix Org corruption when `org-agenda-files' is invalid
...
* lisp/org.el (org-install-agenda-files-menu): Prevent errors in
`org-agenda-files' from corrupting Org initialization.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00424.html >
2017-10-30 00:50:11 +01:00
f474c7149b
org-table: Fix compatibility with Emacs 24.3
...
* lisp/org-table.el (org-table-align): Call `split-string' with the
expected number of arguments in Emacs 24.3.
Reported-by: thomas <thomas@friendlyvillagers.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00430.html >
2017-10-29 09:15:01 +01:00
99dbca3d4f
Remove `org-babel-use-quick-and-dirty-noweb-expansion'
...
* lisp/ob-core.el (org-babel-use-quick-and-dirty-noweb-expansion):
Remove variable.
(org-babel-expand-noweb-references): Update function.
* doc/org.texi (noweb-ref): Document new behaviour.
(Noweb reference syntax): Delete reference to removed variable.
`org-babel-use-quick-and-dirty-noweb-expansion' main use is to speed
up Noweb expansion when expanding only by name. By distinguishing
name and reference expansion, we no longer need this variable. In the
first case, the expansion is quicker anyway, and in the second case,
we most certainly need an accurate expansion.
2017-10-26 13:09:23 +02:00
22e7bc8e2b
org-agenda: Refactoring. Deactivate mark in case of a region.
...
* lisp/org-agenda.el (org-agenda-bulk-mark): Use region-beginning/end
defuns. And deactivate the mark in case.
2017-10-25 17:35:26 +02:00
78c6a299d2
org-agenda: Bulk mark lines in region
...
* lisp/org-agenda.el (org-agenda-bulk-mark): Added bulk mark for entries
in region. This is like in dired now.
* doc/org.texi (Agenda commands): Document bulk mark entries in region
2017-10-25 15:13:13 +02:00
bebfd341af
Merge branch 'maint'
2017-10-24 13:56:56 +02:00
5c91976b49
ox-texinfo: Remove TABs from output
...
* lisp/ox-texinfo.el (org-texinfo--untabify): New function.
(texinfo): Use new function as a final output filter.
See (info "(texinfo) Conventions").
2017-10-24 13:55:38 +02:00
048169d270
org-goto: Fix wrong number of arguments error
...
* lisp/org-goto.el (org-goto-location): Fix
`isearch-search-fun-function' binding.
2017-10-24 10:28:43 +02:00
3a5b75d4ee
org-goto: Fix keymapp error
...
* lisp/org-goto.el: Remove spurious `defvar.
2017-10-24 10:28:39 +02:00
73a15d1bfb
ox-texinfo: Small refactoring
...
* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Use new `org-export-toc-entry-backend'
function.
2017-10-24 10:07:50 +02:00
96c7fd7541
Merge branch 'maint'
2017-10-24 09:53:47 +02:00
3aa4d44ba8
Fix comma escaping with multiple leading commas
...
* lisp/org-src.el (org-escape-code-in-region):
(org-escape-code-in-string):
(org-unescape-code-in-region):
(org-unescape-code-in-string): Fix comma escaping with multiple
leading commas.
* testing/lisp/test-org-src.el (test-org-src/escape-code-in-string):
(test-org-src/unescape-code-in-string): New tests.
Reported-by: Michal Politowski <mpol@meep.pl>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00359.html >
2017-10-24 09:51:43 +02:00
e59199e3a8
ox-texinfo: Fix missing contents in headings out of TOC
...
* lisp/ox-texinfo.el (org-texinfo-section): Include contents even in
headings out of TOC.
2017-10-23 14:55:05 +02:00
c024bec29e
org-goto: Fix header
2017-10-23 09:57:13 +02:00
e1c2db37ed
Extract "org-goto" code into a dedicated library
...
* lisp/org-goto.el: New file.
* lisp/org.el (org-goto-interface):
(org-goto-max-level):
(org-goto-auto-isearch):
(org-goto-local-auto-isearch):
(org-goto-ret):
(org-goto-left):
(org-goto-right):
(org-goto-quit):
(org-goto): Move to new file.
(org-goto-location): Change signature. Move to new file.
(org-goto-map): Remove function.
* lisp/org-id.el (org-id-get-with-outline-drilling): Update to new
`org-goto-location' signature.
2017-10-22 16:49:17 +02:00
87116700e6
Move some invisibility check functions to "org-macs.el"
...
* lisp/org.el (org-invisible-p):
(org-truely-invisible-p):
(org-invisible-p2): Move...
* lisp/org-macs.el: ... there.
2017-10-22 16:20:58 +02:00
fc551191a7
Silence byte-compiler
2017-10-22 15:41:02 +02:00
59d21881b1
Revert "Move `org-key' and `org-defkey' into "org-macs.el""
...
This reverts commit 7f56a9920f
2017-10-22 15:38:35 +02:00
486331e323
Move some generic functions into "org-macs.el"
...
* lisp/org.el (org-do-wrap): Remove function.
(org-base-buffer):
(org-find-base-buffer-visiting):
(org-overlay-display):
(org-overlay-before-string):
(org-find-overlays):
(org-reverse-string):
(org-shorten-string):
(org-remove-tabs):
(org-wrap):
(org-remove-indentation):
(org-do-remove-indentation):
(org-uniquify-alist):
(org-combine-plists):
(org-skip-whitespace):
(org-in-regexp):
(org-point-in-group):
(org-get-at-eol):
(org-find-text-property-in-string):
(org-display-warning):
(org-eval):
* lisp/org-compat.el (org-add-props): Move ...
* lisp/org-macs.el: ... there.
(org--do-wrap): New function.
2017-10-22 15:34:26 +02:00
7f56a9920f
Move `org-key' and `org-defkey' into "org-macs.el"
...
* lisp/org.el (org-key):
(org-defkey): Move...
* lisp/org-macs.el: ... there.
2017-10-22 15:05:48 +02:00
7554012cef
Move compatibility functions in "org-compat.el"
...
* lisp/org.el (org-imenu-and-speedbar):
(org-imenu-markers):
(org-imenu-new-marker):
(org-imenu-get-tree):
(org-speedbar-restriction-lock-overlay):
(org-speedbar-set-agenda-restriction):
(org--flyspell-object-check-p):
(org-mode-flyspell-verify):
(org-remove-flyspell-overlays-in):
(org-bookmark-jump-unhide):
(org-mark-jump-unhide): Move...
* lisp/org-compat.el: ... there.
2017-10-22 15:01:43 +02:00
95b76608a6
Merge branch 'maint'
2017-10-22 14:40:45 +02:00
a2a034f5b9
Prevent leaking fontification across table fields' borders
...
* lisp/org.el (org-do-emphasis-faces): Prevent leaking fontification
across table fields' borders.
Reported-by: Ryan <rct@thompsonclan.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00321.html >
2017-10-22 14:39:36 +02:00
bed03c4b42
Merge branch 'maint'
2017-10-22 12:42:35 +02:00
1613153aac
Fix tangling of org block with nested source block
...
* lisp/ob-tangle.el (org-babel-tangle-single-block): Prevent double unescaping
of source block by removing unnecessary call to `org-unescape-code-in-string'.
* testing/lisp/test-ob-tangle.el (ob-tangle/nested-block) New function.
2017-10-22 12:42:05 +02:00
33ca07b5df
org-agenda: Fix the display of more key substitutions
...
* lisp/org-agenda.el (org-todo-list):
(org-tags-view): Specify the keymap for the substitute-command-keys
call because, as of b6c5a174d48f333805
2017-10-21 01:31:29 -04:00
620ba14460
Merge branch 'maint'
2017-10-20 12:24:07 +02:00
3df62457be
ox-man: Fix org-man--protect-text
2017-10-20 12:21:08 +02:00
0cc59cea23
Merge branch 'maint'
2017-10-19 21:52:18 +02:00
37142cea78
ox-man: Fix verbatim markup
...
* lisp/ox-man.el (org-man--protect-text): New function.
(org-man-code): Use new function.
(org-man-verbatim): Use inline markup.
2017-10-19 21:51:31 +02:00
ff6fbaf395
Merge branch 'maint'
2017-10-18 22:55:18 +02:00
ee24c0769b
ox-man: Fix code and verbatim export
...
* lisp/ox-man.el (org-man-code):
(org-man-verbatim): Fix functions.
Reported-by: Anthony Agelastos <iqgrande@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00313.html >
2017-10-18 22:54:40 +02:00
cd9cccb4b2
Merge branch 'maint'
2017-10-18 22:49:10 +02:00
8c5c030c64
Fix `org-insert-todo-heading'
...
* lisp/org.el (org-insert-todo-heading): Insert TODO keyword relative
to the original headline, not to the headline above.
* testing/lisp/test-org.el (test-org/insert-todo-heading-respect-content):
Add test.
2017-10-18 22:48:16 +02:00
52d4ca4b29
Merge branch 'maint'
2017-10-17 23:31:45 +02:00
90d283f189
Update documentation on org-protocol template placeholders
...
* doc/org.texi (@code{capture} protocol): Fix placeholder names
(Template expansion): Add org-protocol placeholders
* lisp/org.el (org-store-link-plist): Fix docstring grammar
(org-store-link-props): Fix docstring grammar
2017-10-17 23:28:53 +02:00
7ac8883394
Move `org-completing-read' into "org-macs.el"
...
* lisp/org-macs.el (org-completing-read): Moved here...
* lisp/org.el: ... from there.
2017-10-17 10:11:21 +02:00
45a1918efe
Move `org-xor' into "org-macs.el"
...
* lisp/org.el (org-xor): Move...
* lisp/org-macs.el: ... there.
2017-10-17 09:37:34 +02:00
5b2b8f3175
ox-texinfo: Handle "notoc" value
...
* lisp/ox-texinfo.el (org-texinfo-classes): Introduce @chapheading and
al. in default value.
(org-texinfo--structuring-command): Remove function.
(org-texinfo-headline): Handle unnumbered out of TOC headlines.
(org-texinfo-section): Do not add menu in unnumbered headings.
2017-10-15 16:51:13 +02:00
b401d3a44b
Implement `org-export-excluded-from-toc-p'
...
* lisp/ox.el (org-export-excluded-from-toc-p): New function.
* testing/lisp/test-ox.el (test-org-export/excluded-from-toc-p): New
test.
2017-10-15 16:51:13 +02:00
9b13e44ad7
ox: Implement "notoc" UNNUMBERED value
...
* lisp/ox.el (org-export-collect-headlines): Exclude headlines with
UNNUMBERED property set to "notoc".
* doc/org.texi (Export settings):
(Table of contents): Document new value.
* testing/lisp/test-ox.el (test-org-export/collect-headlines): Add
test.
2017-10-15 16:51:10 +02:00
29b4134687
Improve a docstring
...
* lisp/org-element.el (org-element-lineage): Improve docstring.
2017-10-15 10:29:00 +02:00
2525dc6c72
Merge branch 'maint'
2017-10-14 12:32:25 +02:00
1d5142601a
Silence byte-compiler
2017-10-14 12:32:08 +02:00
7df5d21f79
Merge branch 'maint'
2017-10-14 12:30:59 +02:00
827af59873
Fix links without contents in table of contents' entries
...
* lisp/ox.el (org-export-toc-entry-backend): New function.
* lisp/ox-html.el (org-html--format-toc-headline):
* lisp/ox-md.el (org-md--build-toc):
* lisp/ox-odt.el (org-odt-toc): Use new function.
* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Handle links without contents.
* testing/lisp/test-ox.el (test-org-export/toc-entry-backend): New
test.
Reported-by: ConcreteVitamin <concretevitamin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00235.html >
2017-10-14 12:29:52 +02:00
4ffddc2a93
Merge branch 'maint'
2017-10-14 11:01:32 +02:00
5861a55740
`org-file-contents': Improve error message
...
* lisp/org.el (org-file-contents): Improve error message.
2017-10-14 10:59:51 +02:00
8184de6e13
Merge branch 'maint'
2017-10-13 15:13:38 -04:00
3f1d5f9091
Backport commit 5d51403ce from Emacs
...
; Typo fixes, mostly repeated words
5d51403ceb9b86a1bfa66f00c7af39f1200e65f1
Paul Eggert
Mon Oct 9 22:55:06 2017 -0700
2017-10-13 15:12:27 -04:00
df0e3611f1
Backport commit 0d004ed01 from Emacs
...
; Spelling fixes
0d004ed01abb5fa025bdc9d58fce2a3abff0b6a4
Paul Eggert
Mon Oct 9 22:55:05 2017 -0700
2017-10-13 15:11:00 -04:00
61c81e8255
Merge branch 'maint'
2017-10-12 01:01:14 +02:00
76163e983b
ox-md: Export TODO keywords and priority cookies
...
* lisp/ox-md.el (org-md-headline): Export TODO keywords and priority
cookies.
Reported-by: Ganesh Krishnan <gkrishnan.gt@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00171.html >
2017-10-12 01:00:14 +02:00
0b83168465
Adjust version numbers of unreleased changes
...
* lisp/org-table.el (org-table-shrunk-column-indicator):
* lisp/org.el (org-startup-shrink-all-tables): Update Org version to 9.2
and Emacs version to 27.1.
(customize-package-emacs-version-alist): Map Org 9.2 to Emacs 27.1.
Emacs 26.1 is now in the pretest phase, and the version for Emacs's
development branch is 27.1.
2017-10-08 13:44:33 -04:00
2a55d206e3
Merge branch 'maint'
2017-10-08 10:54:00 +02:00
07f939f419
org-clock: Fix clock report sometimes ignoring hours before :wstart
...
* lisp/org-clock (org-clocktable-steps): Fix weekly-step clock report
ignoring hours between start of period and start of week, when start
of period is on a day of week numerically less than start of week.
Clock report now always inserts a "week" starting at the start of
the period, if necessary; all following weeks start on the start of
the week as expected.
TINYCHANGE
2017-10-08 10:53:39 +02:00
fa56da61a7
Merge branch 'maint'
2017-10-08 10:36:48 +02:00
d747e51fbf
Consider headlines as sentences by themselves
...
* lisp/org.el (org-forward-sentence): Consider headlines as sentences
by themselves.
* testing/lisp/test-org.el (test-org/forward-sentence): Add test.
Reported-by: Mat Vibrys <vibrysec@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00130.html >
2017-10-08 10:35:22 +02:00
7f56bfe0c2
Merge branch 'maint'
2017-10-08 10:08:53 +02:00
6432fcd433
C-c C-c on a planning info timestamp fixes day
...
* lisp/org.el (org-ctrl-c-ctrl-c): On a timestamp in a planning line,
fix day, like regular timestamps.
Reported-by: Aaron Jensen <aaronjensen@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00132.html >
2017-10-08 10:07:36 +02:00
5a16dec5a4
org-inlinetask: Wrap region at insertion
...
* lisp/org-inlinetask.el (org-inlinetask-insert-task): If there is a
region at insertion time wrap it. This is similar to
`org-insert-drawer'.
2017-10-07 15:44:25 +02:00
44e3745c78
Merge branch 'maint'
2017-10-06 19:35:25 +02:00
fb403ca34e
Fix `org-backward-paragraph' on an empty heading
...
* lisp/org.el (org-backward-paragraph): Fix behavior on greater
elements without contents.
* testing/lisp/test-org.el (test-org/backward-paragraph): Add test.
Reported-by: Omar Antolin <omar.antolin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00099.html >
2017-10-06 19:34:28 +02:00
9455c6910e
Merge branch 'maint'
2017-10-06 19:14:21 +02:00
ce536f6375
Fix interactive timestamp entry in capture templates
...
* lisp/org-capture.el: (org-capture-fill-template) Fix interactive
timestamp entry to match the behavior of org-time-stamp. This fixes
a bug related to the %^t and %^u template escapes which resulted in
incorrect timestamps (<2017-10-06 Fri-12:00>). The difference
between %^t and %^T now corresponds to the difference between
org-time-stamp called without and with a prefix argument.
2017-10-06 19:13:57 +02:00
1b12ad5cf6
Merge branch 'maint'
2017-10-04 12:58:41 +02:00
ef6dac812b
Fix `org-backward-paragraph' on block opening line
...
* lisp/org.el (org-backward-paragraph): Do not error when called from
a block opening line.
* testing/lisp/test-org.el (test-org/backward-paragraph): Add tests.
Reported-by: Omar Antolin <omar.antolin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00051.html >
2017-10-04 12:57:14 +02:00
1a946d04e4
Merge branch 'maint'
2017-10-01 20:56:08 -04:00
24ea1b136a
Backport commit bd49b6f1b from Emacs
...
* lisp/org-clock.el (org-clock--oldest-date): Only execute
'decode-time' on times later than year -2**31 under macOS 10.6.
See Bug#27706.
Workaround for faulty localtime() under macOS 10.6
bd49b6f1b39cffeaf6098bc7b0182552683b1c07
Charles A. Roelli
Sun Oct 1 19:07:22 2017 +0200
2017-10-01 20:46:11 -04:00
5d3e17bf85
Backport commit bbda601d1 from Emacs
...
; Spelling fixes
bbda601d1d4e125c9d3c374b56eee3e2e9623f1d
Paul Eggert
Fri Sep 29 16:41:50 2017 -0700
2017-10-01 20:00:42 -04:00
eb8c088995
Backport commit 26d58f0c5 from Emacs
...
; Standardize license notices
26d58f0c5865c9132e2fc559e061ef704a086d30
Glenn Morris
Fri Sep 29 12:49:19 2017 -0400
2017-10-01 19:53:04 -04:00
428368af2f
Merge branch 'maint'
2017-10-01 19:02:47 +02:00
Nicolas Goaziou
Doro Rose
Rasmus
Eric S Fraga
thibault
Matt Lundin
Alex Branham
Kyle Meyer
Paul Eggert
Matt Lundin
Marco Wahl
Charles A. Roelli
Chunyang Xu
Martin Šlouf
Eric Abrahamsen
Xavier Martinez-Hidalgo
Allen Li
Georgiy Tugai
Glenn Morris