Nicolas Goaziou
3944547bf2
Merge branch 'maint'
2017-09-14 14:47:15 +02:00
Nicolas Goaziou
7584268314
ox-html: Fix missing Mathjax config with maths elements in captions
...
* lisp/ox-html.el (org-html--build-mathjax-config): Fix missing
Mathjax config with maths elements in captions.
Reported-by: Lawrence Bottorff <borgauf@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00302.html >
2017-09-14 14:40:33 +02:00
Nicolas Goaziou
657302b97e
Merge branch 'maint'
2017-09-13 14:17:24 +02:00
Nicolas Goaziou
23c4716a94
org-table: Fix `org-table-copy-down' with timestamps
...
* lisp/org-table.el (org-table-copy-down): Allow matching inactive
timestamps.
Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00304.html >
2017-09-13 14:17:00 +02:00
Nicolas Goaziou
c59cb987eb
Merge branch 'maint'
2017-09-12 09:02:43 +02:00
Nicolas Goaziou
95271315cc
Fix `org-forward-sentence' on a headline
...
* lisp/org.el (org-forward-sentence): Fix `org-forward-sentence' on a headline.
* testing/lisp/test-org.el (test-org/forward-sentence): Add tests.
Reported-by: Mat Vibrys <vibrysec@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00282.html >
2017-09-12 09:02:02 +02:00
Nicolas Goaziou
81e7ad6507
Add missing documentation part about shrunk columns
...
* doc/org.texi (In-buffer settings): Document
`org-startup-shrink-all-tables'.
2017-09-12 09:00:27 +02:00
Kyle Meyer
793b429f95
Merge branch 'maint'
2017-09-10 16:54:02 -04:00
Paul Eggert
a4f1395cbe
Backport commit cdef84fb6 from Emacs
...
Spelling fixes
cdef84fb6893f69ffee1a99fe82a262e02e59bf5
Paul Eggert
Sun Sep 10 09:24:37 2017 -0700
2017-09-10 16:51:26 -04:00
Nicolas Goaziou
c6e5639b7e
ox-texinfo: Do not add @node for unnumbered headings
...
* lisp/ox-texinfo.el (org-texinfo-headline): Do not add @node for
unnumbered headings.
2017-09-10 19:17:44 +02:00
Nicolas Goaziou
bd2378161e
Table of contents ignore unnumbered headlines
...
* doc/org.texi (Table of contents): Document behavior.
* lisp/ox-texinfo.el (org-texinfo-classes): Use @heading commands and
alike for unnumbered sections.
* lisp/ox.el (org-export-collect-headlines): Ignore unnumbered
headlines.
* testing/lisp/test-ox.el (test-org-export/collect-headlines): Add
test.
2017-09-10 15:53:20 +02:00
Nicolas Goaziou
7a47458b39
Merge branch 'maint'
2017-09-10 14:12:52 +02:00
Nicolas Goaziou
1168d085d2
org-agenda: Fix `org-agenda-skip-if-todo'
...
* lisp/org-agenda.el (org-agenda-skip-if-todo): Make sure TODO search
is case sensitive. Refactor function.
2017-09-10 14:10:49 +02:00
Nicolas Goaziou
27a03dd97f
org-agenda: Fix `org-agenda-skip-if'
...
* lisp/org-agenda.el (org-agenda-skip-if): Prevent some checks from
moving point, since this stops following checks from running
properly.
Reported-by: "cro cefisso" <crocefisso@gmx.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00182.html >
2017-09-10 14:08:16 +02:00
Nicolas Goaziou
7b1fabbf88
org-colview: Fix defcustom type
...
* lisp/org-colview.el (org-columns-summary-types): Fix defcustom type.
2017-09-10 11:16:40 +02:00
Stig Brautaset
2b2314d46d
org-colview: Allow custom COLLECT functions for derived properties
...
* lisp/org-colview.el (org-columns-summary-types): Allow new format.
(org-columns--summarize): Update to new summary type format.
(org-columns--collect): New function.
(org-columns--compute-spec): Apply changes.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
Add test.
In addition to (LABEL . SUMMARIZE), org-columns-summary-types now
accepts (LABEL SUMMARIZE COLLECT) entries. The new COLLECT function is
called with one argument, the property being summarized.
TINYCHANGE
2017-09-10 11:06:43 +02:00
Nicolas Goaziou
3ab1afd0ea
Merge branch 'maint'
2017-09-10 09:39:50 +02:00
Matt Lundin
2dfbafa4a9
Ensure that top-level capture targets are pasted at level 1
...
* lisp/org-capture.el: (org-capture-place-entry) Ensure that level is
set to 1 (i.e., the top level) if there is no headline target
defined. Otherwise, captured items are improperly nested by context.
2017-09-10 09:39:24 +02:00
Nicolas Goaziou
007bbddbcc
ox-html: Prevent spurious target below headlines
...
* lisp/ox-html.el (org-html-headline):
(org-html-link): Do not insert an additional target.
* lisp/ox-publish.el (org-publish-resolve-external-link): Add an
optional argument.
* lisp/ox.el (org-export-get-reference): Improve docstring.
* testing/examples/pub/a.org:
* testing/examples/pub/b.org: New files.
* testing/lisp/test-ox-publish.el (test-org-publish/resolve-external-link):
New test.
2017-09-10 00:23:42 +02:00
Nicolas Goaziou
b3ab012d69
Merge branch 'maint'
2017-09-08 22:37:16 +02:00
Nicolas Goaziou
e0259f9374
org-agenda: Fix typo
...
* lisp/org-agenda.el (org-search-view): Add missing :test keyword.
2017-09-08 22:35:54 +02:00
Nicolas Goaziou
2a9d8653eb
Merge branch 'maint'
2017-09-08 21:19:53 +02:00
Nicolas Goaziou
d059b7895b
org-agenda: Better state change detection
...
* lisp/org-agenda.el (org-agenda-get-progress): Use appropriate regexp
as TODO keywords are not limited to alphanumeric characters.
Reported-by: email@edgar-kalkowski.de
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00206.html >
2017-09-08 21:18:22 +02:00
Nicolas Goaziou
c8aaf8f694
Merge branch 'maint'
2017-09-08 13:21:22 +02:00
Nicolas Goaziou
7ce9a24115
Fix duplicate tests
...
Reported-by: Stig Brautaset <stig@brautaset.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00187.html >
2017-09-08 13:20:48 +02:00
Nicolas Goaziou
17013d6f38
Remove duplicate test
...
* testing/lisp/test-org-table.el (test-org-table/align): Remove test.
2017-09-08 13:14:55 +02:00
Nicolas Goaziou
289539e119
Merge branch 'maint'
2017-09-08 07:00:00 +02:00
Reuben Thomas
a307011136
Fix logic of calling org-make-link-desciption-function
...
* lisp/org.el (org-insert-link): Simplify so that description is only
prompted for once, if auto-desc is not set, and takes as its default
value, in order, default-description, the return value of
org-make-link-description-function (if the variable is non-nil), and
the current desc. Update the docstring to reflect that
default-description takes precedence over
org-make-link-description-function.
(org-make-link-description-function): Remove from docstring the
statement that if the variable is nil, then the link will be used as
the default description. This is undesirable, and was not in any case
implemented.
2017-09-08 06:59:30 +02:00
Nicolas Goaziou
e21768d24b
Merge branch 'maint'
2017-09-08 06:49:34 +02:00
Neil Jerram
e09cb53bde
Improve Scheme code evaluation
...
* lisp/ob-scheme.el (org-babel-scheme-execute-with-geiser): Use
Geiser's explicit 'retort' object, instead of catching and parsing
an expected Emacs message (which for me is in any case overwritten
by a following "Mark set" message); this also means we don't need
the with-output-to-string approach for getting 'output' results.
Also 'let' Geiser variables so as to avoid popping up the REPL
and *Geiser dbg* buffers.
2017-09-08 06:48:15 +02:00
Kyle Meyer
88ffcf54d8
Merge branch 'maint'
2017-09-07 16:59:39 -04:00
Kyle Meyer
79d9f0c0ce
Update customize-package-emacs-version-alist
...
* lisp/org.el (customize-package-emacs-version-alist): Add entries for
all existing ":package-version" values, and remove entries for
versions that aren't used as ":package-version" values.
Note that this alist has a limited effect because we specify
":version" in almost all of our defcustoms. Two functions make use of
this alist: describe-variable-custom-version-info and
customize-changed-options. The former only looks at the alist if
:version isn't specified, and the latter only looks at :version if an
entry for :package-version isn't found in the alist.
We should consider removing the defcustom :version specifications so
that the package-version->version mapping only needs to be maintained
in one place.
2017-09-07 16:56:15 -04:00
Kyle Meyer
6496d0ca95
Correct defcustom version information
...
* lisp/ob-lilypond.el (org-babel-lilypond-commands):
* lisp/ob-lua.el (org-babel-lua-command):
(org-babel-lua-mode):
(org-babel-lua-hline-to):
(org-babel-lua-None-to):
* lisp/org-agenda.el (org-agenda-search-view-max-outline-level):
* lisp/org.el (org-mouse-1-follows-link):
(org-src-fontify-natively):
(orgstruct-heading-prefix-regexp):
* lisp/ox-ascii.el (org-ascii-format-inlinetask-function):
* lisp/ox-latex.el (org-latex-format-drawer-function):
(org-latex-listings-langs):
* lisp/ox-odt.el (org-odt-format-drawer-function):
* lisp/ox.el (org-export-with-properties): Correct ":version" value.
* lisp/org-attach.el (org-attach-annex-auto-get): Correct
":package-version" value.
2017-09-07 16:56:11 -04:00
Kaushal Modi
bca91bb7ee
Merge branch 'maint'
2017-09-07 14:23:20 -04:00
Kaushal Modi
7a29c82e11
Make ob-sclang.el work on emacs 24.3
...
* contrib/lisp/ob-sclang.el: Use eval-after-load instead of
with-eval-after-load.
2017-09-07 14:13:38 -04:00
Nicolas Goaziou
d15a4a4a9b
Silence byte-compiler
2017-09-07 18:21:01 +02:00
Nicolas Goaziou
7d1757f7d2
org-table: Fix failing tests
...
* lisp/org-table.el (org-table--shrink-columns): Use compatibility function.
2017-09-07 18:13:13 +02:00
Nicolas Goaziou
f22c23277f
Merge branch 'maint'
2017-09-07 18:03:03 +02:00
Nicolas Goaziou
b16086d9af
Fix `org-confirm-babel-evaluate' with `org-sbe'
...
* lisp/ob-core.el (org-babel-check-confirm-evaluate): Do not move
point, as it is neither necessary nor expected by
`org-babel-check-confirm-evaluate'.
Reported-by: Alex Bennée <alex.bennee@linaro.org>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00167.html
2017-09-07 17:43:32 +02:00
Nicolas Goaziou
9c5d03ca3b
Merge branch 'maint'
2017-09-07 15:55:20 +02:00
Nicolas Goaziou
22e916fb36
org-agenda: Remove duplicate files when building a search view
...
* lisp/org-agenda.el (org-search-view): Remove duplicate files when
building a search view.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00112.html >
2017-09-07 15:53:49 +02:00
Nicolas Goaziou
706932bec3
Restriction lock means no extra files in agenda search view
...
* lisp/org-agenda.el (org-search-view): Restriction lock means no
extra files in agenda search view.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00112.html >
2017-09-07 15:51:30 +02:00
Nicolas Goaziou
19d039abd3
Merge branch 'maint'
2017-09-07 15:29:03 +02:00
Nicolas Goaziou
d50170b208
Tolerate editing an export block without type
...
* lisp/org-src.el (org-edit-export-block): Tolerate editing an export
block without type.
2017-09-07 15:27:55 +02:00
Nicolas Goaziou
11979e298d
org-archive: Fix failing tests
...
* testing/lisp/test-org-archive.el (test-org-element/archive-update-status-cookie):
Fix failing tests.
2017-09-07 15:25:00 +02:00
Nicolas Goaziou
6cfc7cb958
Merge branch 'maint'
2017-09-07 15:21:35 +02:00
Nicolas Goaziou
91a76063d8
org-duration: Fix `org-duration-to-minutes' with the empty string
...
* lisp/org-duration.el (org-duration-to-minutes): Accept the empty
string.
* testing/lisp/test-org-duration.el (test-org-duration/to-minutes):
Add test.
For backward compatibility with `org-duration-string-to-minutes'
accept the empty string as a duration.
2017-09-07 15:20:26 +02:00
Nicolas Goaziou
85ba4912a0
org.texi: Fix last commit
...
* doc/org.texi (Column width and alignment): Fix keybinding and
function syntax.
2017-09-07 14:40:06 +02:00
Nicolas Goaziou
ad1c0faa7e
Merge branch 'maint'
2017-09-07 14:38:23 +02:00
Nicolas Goaziou
f1a1cad93a
ORG-NEWS: Add incompatible change about `org-split-string'
2017-09-07 14:37:49 +02:00