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
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