Nicolas Goaziou
bbf39576f4
org-tempo: Fix typo
...
* lisp/org-tempo.el (org-tempo-tags): Fix typo
2017-12-14 00:25:59 +01:00
Nicolas Goaziou
5d2517ba5a
Merge branch 'maint'
2017-12-14 00:18:20 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
a36d18caa4
Merge branch 'maint'
2017-12-13 23:52:06 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
2390b6302d
Merge branch 'maint'
2017-12-11 23:21:07 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
e8b71b86d2
Merge branch 'maint'
2017-12-11 15:14:01 +01:00
Doro Rose
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
Nicolas Goaziou
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
Nicolas Goaziou
076cba6b2d
Fix last commit
...
* lisp/org.el (org-show-all): Remove function.
2017-12-10 23:50:30 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
a34431f6ea
org-tempo: Tiny refactoring
...
* lisp/org-tempo.el (org-tempo--include-file): Tiny refactoring.
2017-12-10 17:11:24 +01:00
Rasmus
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
Rasmus
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
Nicolas Goaziou
d435c75f54
Merge branch 'maint'
2017-12-07 14:20:33 +01:00
Eric S Fraga
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
Nicolas Goaziou
3695415199
Merge branch 'maint'
2017-12-06 23:16:55 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
15df8db7ad
Merge branch 'maint'
2017-12-04 22:43:31 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
494414028a
Merge branch 'maint'
2017-12-04 22:21:25 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
f8db6e0295
Merge branch 'maint'
2017-12-04 18:55:29 +01:00
Nicolas Goaziou
d3f7309cbd
org-irc: Silence byte-compiler
2017-12-04 18:55:03 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
0c691737aa
Merge branch 'maint'
2017-12-04 08:24:19 +01:00
thibault
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
Nicolas Goaziou
a0e3f1d505
Merge branch 'maint'
2017-12-03 18:14:48 +01:00
Nicolas Goaziou
037db00f40
Fix last commit
...
* lisp/org.el (org-org-menu): Fix last commit.
2017-12-03 18:14:21 +01:00
Nicolas Goaziou
7fc901ca0f
Merge branch 'maint'
2017-12-03 18:04:18 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
ff36e945ca
Merge branch 'maint'
2017-12-03 16:24:49 +01:00
Nicolas Goaziou
efe440adbe
org-gnus: Silence byte-compiler
...
Fixes: 29329
2017-12-03 16:22:45 +01:00
Nicolas Goaziou
259656a76e
Merge branch 'maint'
2017-12-03 09:03:37 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
8bd9839952
Revert "Fix headline fontification"
...
This reverts commit 5873d99121
.
2017-12-02 23:07:51 +01:00
Nicolas Goaziou
bdaf5dacf4
Merge branch 'maint'
2017-12-02 17:27:53 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
0ace32b045
Merge branch 'maint'
2017-12-02 12:23:02 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
7a3cae65a7
Merge branch 'maint'
2017-12-01 19:35:54 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
1bb9cf1597
Merge branch 'maint'
2017-11-29 23:02:42 +01:00
Matt Lundin
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
, but for
nnir search groups in gnus.
2017-11-29 21:05:19 +01:00
Nicolas Goaziou
326b2e85e4
Merge branch 'maint'
2017-11-29 19:03:22 +01:00
Matt Lundin
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
Nicolas Goaziou
fada34bb97
Merge branch 'maint'
2017-11-29 15:10:48 +01:00
Nicolas Goaziou
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
Alex Branham
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
Nicolas Goaziou
819b2a1a3d
Merge branch 'maint'
2017-11-28 23:59:21 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
e92732efd0
Merge branch 'maint'
2017-11-28 23:35:44 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
c1d7b2cda3
Merge branch 'maint'
2017-11-27 23:26:38 +01:00
Nicolas Goaziou
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 1d8126385c
.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00384.html >
2017-11-27 23:23:04 +01:00
Nicolas Goaziou
68544f4f21
Merge branch 'maint'
2017-11-27 23:02:26 +01:00
Nicolas Goaziou
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
Kyle Meyer
5cd7eb3d53
Merge branch 'maint'
2017-11-26 20:35:57 -05:00
Paul Eggert
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
Nicolas Goaziou
579fa12f50
Merge branch 'maint'
2017-11-26 11:02:14 +01:00
Nicolas Goaziou
ac4b756588
Silence byte-compiler
2017-11-26 11:01:55 +01:00
Nicolas Goaziou
18f6610b32
ox-html: Fix last commit
...
* lisp/ox-html.el (org-html-link): Fix last commit.
2017-11-26 10:57:02 +01:00
Matt Lundin
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
Matt Lundin
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
Nicolas Goaziou
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
Nicolas Goaziou
b0ab7008df
Merge branch 'maint'
2017-11-26 10:47:55 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
be1e807942
Merge branch 'maint'
2017-11-25 21:13:58 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
d7f2c8b8e1
Merge branch 'maint'
2017-11-25 15:42:33 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
f67e62eb3f
Merge branch 'maint'
2017-11-25 15:33:22 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
b6df86a303
org-macro: Silence byte-compiler
2017-11-22 23:35:50 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
f482cfa785
Merge branch 'maint'
2017-11-20 00:14:05 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
de289d1fe8
Merge branch 'maint'
2017-11-15 22:50:56 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
04e0532ef5
Merge branch 'maint'
2017-11-15 18:59:05 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
966af419f9
Merge branch 'maint'
2017-11-15 18:14:44 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
8ff3673dfc
Merge branch 'maint'
2017-11-15 17:41:48 +01:00
Nicolas Goaziou
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
Marco Wahl
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
Marco Wahl
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
Marco Wahl
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
Kyle Meyer
c029c4d45d
Merge branch 'maint'
2017-11-13 22:09:46 -05:00
Charles A. Roelli
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
Nicolas Goaziou
9cac9d7bc7
Merge branch 'maint'
2017-11-12 23:29:38 +01:00
Chunyang Xu
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
Nicolas Goaziou
4c703513a7
Merge branch 'maint'
2017-11-12 22:38:26 +01:00
Martin Šlouf
fcf4bb61ec
Add CS export translations
...
* lisp/ox.el (org-export-dictionary): Add translations for CS.
TINYCHANGE
2017-11-12 22:37:04 +01:00
Marco Wahl
44189a72d5
Merge branch 'maint'
2017-11-10 19:40:15 +01:00
Marco Wahl
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
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
Nicolas Goaziou
28ebfa6d77
Merge branch 'maint'
2017-11-06 23:10:13 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
76a9e1d01d
Merge branch 'maint'
2017-11-06 14:32:11 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
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
Eric Abrahamsen
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
Nicolas Goaziou
fd50740c96
Merge branch 'maint'
2017-11-04 22:41:07 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
7ba058963e
Merge branch 'maint'
2017-11-04 21:51:40 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
9bee79a102
Merge branch 'maint'
2017-11-03 23:11:07 +01:00
Nicolas Goaziou
08c9de2a74
Fix typo in docstring
...
* lisp/org.el (org-speed-commands-user): Fix typo in docstring.
2017-11-03 23:10:38 +01:00
Nicolas Goaziou
6a273e30d7
Merge branch 'maint'
2017-11-03 22:20:46 +01:00
Xavier Martinez-Hidalgo
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
Nicolas Goaziou
902bfe1892
Merge branch 'maint'
2017-11-03 12:22:33 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
36578fda46
Merge branch 'maint'
2017-10-31 19:34:35 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
4388bdf852
Merge branch 'maint'
2017-10-30 00:51:31 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
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
Marco Wahl
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
Marco Wahl
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
Nicolas Goaziou
bebfd341af
Merge branch 'maint'
2017-10-24 13:56:56 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
3a5b75d4ee
org-goto: Fix keymapp error
...
* lisp/org-goto.el: Remove spurious `defvar.
2017-10-24 10:28:39 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
96c7fd7541
Merge branch 'maint'
2017-10-24 09:53:47 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
c024bec29e
org-goto: Fix header
2017-10-23 09:57:13 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
fc551191a7
Silence byte-compiler
2017-10-22 15:41:02 +02:00
Nicolas Goaziou
59d21881b1
Revert "Move `org-key' and `org-defkey' into "org-macs.el""
...
This reverts commit 7f56a9920f
.
`org-key' is specific to Org keybinding, therefore not generic enough
to fit in "org-macs.el". So is `org-defkey'.
2017-10-22 15:38:35 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
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
Nicolas Goaziou
95b76608a6
Merge branch 'maint'
2017-10-22 14:40:45 +02:00
Nicolas Goaziou
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