org-mode.git
6 hours agoox: Allow a less strict UNNUMBERED inheritance master
Nicolas Goaziou [Mon, 20 Nov 2017 13:07:03 +0000 (14:07 +0100)]
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>

19 hours agoMerge branch 'maint'
Nicolas Goaziou [Sun, 19 Nov 2017 23:15:05 +0000 (00:15 +0100)]
Merge branch 'maint'

19 hours agoorg.texi: Fix typo maint
Nicolas Goaziou [Sun, 19 Nov 2017 23:14:22 +0000 (00:14 +0100)]
org.texi: Fix typo

* doc/org.texi (Export settings): Fix typo introduced in last commit.

19 hours agoMerge branch 'maint'
Nicolas Goaziou [Sun, 19 Nov 2017 23:14:05 +0000 (00:14 +0100)]
Merge branch 'maint'

20 hours agoox: Fix UNNUMBERED strict inheritance
Nicolas Goaziou [Sun, 19 Nov 2017 22:59:56 +0000 (23:59 +0100)]
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.

20 hours agoorg-table: Insert new column to the right instead of the left
Nicolas Goaziou [Sun, 19 Nov 2017 22:22:16 +0000 (23:22 +0100)]
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.

4 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 15 Nov 2017 21:50:56 +0000 (22:50 +0100)]
Merge branch 'maint'

4 days agoorg-table: Better fix for `:org-untouchable' release_9.1.3
Nicolas Goaziou [Wed, 15 Nov 2017 21:47:06 +0000 (22:47 +0100)]
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.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 15 Nov 2017 17:59:05 +0000 (18:59 +0100)]
Merge branch 'maint'

5 days agoorg-macs: Fix typos in docstrings
Nicolas Goaziou [Wed, 15 Nov 2017 17:58:44 +0000 (18:58 +0100)]
org-macs: Fix typos in docstrings

* lisp/org-macs.el (org-split-string):
(org-string-width): Fix typo in docstring.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 15 Nov 2017 17:14:44 +0000 (18:14 +0100)]
Merge branch 'maint'

5 days agoFix `org-string-display'
Nicolas Goaziou [Wed, 15 Nov 2017 17:13:34 +0000 (18:13 +0100)]
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>

5 days agoox-ascii: Lighten numbering in table of contents
Nicolas Goaziou [Wed, 15 Nov 2017 16:43:08 +0000 (17:43 +0100)]
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.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 15 Nov 2017 16:41:48 +0000 (17:41 +0100)]
Merge branch 'maint'

5 days agoorg-table: Clean left-over `:org-untouchable' property
Nicolas Goaziou [Wed, 15 Nov 2017 16:40:22 +0000 (17:40 +0100)]
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>

5 days agoorg-attach,test-org-attach: Refactoring.
Marco Wahl [Wed, 15 Nov 2017 13:39:26 +0000 (14:39 +0100)]
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.

5 days agoorg-attach: Refactor. Replace self made with available function.
Marco Wahl [Wed, 15 Nov 2017 11:21:18 +0000 (12:21 +0100)]
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.

5 days agoorg-attach: Attach files specified in a dired buffer.
Marco Wahl [Wed, 15 Nov 2017 10:25:51 +0000 (11:25 +0100)]
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.

6 days agoMerge branch 'maint'
Kyle Meyer [Tue, 14 Nov 2017 03:09:46 +0000 (22:09 -0500)]
Merge branch 'maint'

6 days agoBackport commit 98288ecaf from Emacs
Charles A. Roelli [Wed, 8 Nov 2017 19:51:48 +0000 (20:51 +0100)]
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

7 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 12 Nov 2017 22:29:38 +0000 (23:29 +0100)]
Merge branch 'maint'

7 days agoox-html: Allow disabling htmlize
Chunyang Xu [Thu, 9 Nov 2017 16:28:15 +0000 (00:28 +0800)]
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

7 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 12 Nov 2017 21:38:26 +0000 (22:38 +0100)]
Merge branch 'maint'

7 days agoAdd CS export translations
Martin Šlouf [Sun, 12 Nov 2017 21:37:04 +0000 (22:37 +0100)]
Add CS export translations

* lisp/ox.el (org-export-dictionary): Add translations for CS.

TINYCHANGE

10 days agoMerge branch 'maint'
Marco Wahl [Fri, 10 Nov 2017 18:40:15 +0000 (19:40 +0100)]
Merge branch 'maint'

10 days agoorg-attach: Fix handling of ATTACH tag at sychronize
Marco Wahl [Fri, 10 Nov 2017 18:35:35 +0000 (19:35 +0100)]
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.

10 days agoImplement :pre-blank property for items and footnotes definitions
Nicolas Goaziou [Thu, 9 Nov 2017 21:47:35 +0000 (22:47 +0100)]
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.

12 days agov5.7.2 of org-index
Marc Ihm [Tue, 7 Nov 2017 19:49:58 +0000 (20:49 +0100)]
v5.7.2 of org-index

13 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 6 Nov 2017 22:10:13 +0000 (23:10 +0100)]
Merge branch 'maint'

13 days agoox-ascii: Small fix to items that do not start with a paragraph
Nicolas Goaziou [Mon, 6 Nov 2017 22:07:17 +0000 (23:07 +0100)]
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.

2 weeks agoORG-NEWS: Document user-visible changes with new template system
Nicolas Goaziou [Mon, 6 Nov 2017 13:47:55 +0000 (14:47 +0100)]
ORG-NEWS: Document user-visible changes with new template system

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 6 Nov 2017 13:32:11 +0000 (14:32 +0100)]
Merge branch 'maint'

2 weeks agoox-ascii: Fix descriptive lists
Nicolas Goaziou [Mon, 6 Nov 2017 13:27:45 +0000 (14:27 +0100)]
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.

2 weeks agoox-texinfo: Gracefully handle node collision in the same hierarchy
Nicolas Goaziou [Sun, 5 Nov 2017 11:22:18 +0000 (12:22 +0100)]
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)".

2 weeks agoox-texinfo: Preserve target name as node.
Nicolas Goaziou [Sun, 5 Nov 2017 09:32:13 +0000 (10:32 +0100)]
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'.

2 weeks agoReplace easy templates with org-insert-structure-template
Eric Abrahamsen [Sun, 5 Nov 2017 08:25:15 +0000 (09:25 +0100)]
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.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 4 Nov 2017 21:41:07 +0000 (22:41 +0100)]
Merge branch 'maint'

2 weeks agoFix characters conversion issue when loading `org-id-locations-file'
Nicolas Goaziou [Sat, 4 Nov 2017 21:40:02 +0000 (22:40 +0100)]
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>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 4 Nov 2017 20:51:40 +0000 (21:51 +0100)]
Merge branch 'maint'

2 weeks agoorg-element: Fix item parser
Nicolas Goaziou [Sat, 4 Nov 2017 20:50:11 +0000 (21:50 +0100)]
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.

2 weeks agoox-texinfo: Fix @ref without description
Nicolas Goaziou [Sat, 4 Nov 2017 20:48:09 +0000 (21:48 +0100)]
ox-texinfo: Fix @ref without description

* lisp/ox-texinfo.el (org-texinfo--@ref): Prefer @ref{} with a single
  argument when no description is provided.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 3 Nov 2017 22:11:07 +0000 (23:11 +0100)]
Merge branch 'maint'

2 weeks agoFix typo in docstring
Nicolas Goaziou [Fri, 3 Nov 2017 22:10:38 +0000 (23:10 +0100)]
Fix typo in docstring

* lisp/org.el (org-speed-commands-user): Fix typo in docstring.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 3 Nov 2017 21:20:46 +0000 (22:20 +0100)]
Merge branch 'maint'

2 weeks agoorg-capture: Fix aborting after inserting text at end of buffer
Xavier Martinez-Hidalgo [Thu, 2 Nov 2017 10:47:19 +0000 (11:47 +0100)]
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

2 weeks agoFix failing test
Nicolas Goaziou [Wed, 1 Nov 2017 16:54:12 +0000 (17:54 +0100)]
Fix failing test

* testing/lisp/test-ox-publish.el (test-org-publish/resolve-external-link):
  Rewrite test to prevent race condition which could affect results.
* testing/examples/pub/b.org: Add missing keyword.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 3 Nov 2017 11:22:33 +0000 (12:22 +0100)]
Merge branch 'maint'

2 weeks agoox-texinfo: Fix spurious blank lines in detailed menu.
Nicolas Goaziou [Fri, 3 Nov 2017 11:21:56 +0000 (12:21 +0100)]
ox-texinfo: Fix spurious blank lines in detailed menu.

* lisp/ox-texinfo.el (org-texinfo--build-menu): Prevent spurious blank
  lines in detailed menu.

2 weeks agoox-texinfo: Prettify adjunct for indentical nodes.
Nicolas Goaziou [Fri, 3 Nov 2017 10:35:53 +0000 (11:35 +0100)]
ox-texinfo: Prettify adjunct for indentical nodes.

* lisp/ox-texinfo.el (org-texinfo--get-node): Nicer adjunct for
  identical nodes.

2 weeks agoox-texinfo: Allow cross-references to headlines excluded from TOC
Nicolas Goaziou [Fri, 3 Nov 2017 10:34:21 +0000 (11:34 +0100)]
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.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 31 Oct 2017 18:34:35 +0000 (19:34 +0100)]
Merge branch 'maint'

2 weeks agoFix `org-display-inline-images'
Nicolas Goaziou [Tue, 31 Oct 2017 18:33:55 +0000 (19:33 +0100)]
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>

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 29 Oct 2017 23:51:31 +0000 (00:51 +0100)]
Merge branch 'maint'

3 weeks agoFix Org corruption when `org-agenda-files' is invalid
Nicolas Goaziou [Sun, 29 Oct 2017 23:50:11 +0000 (00:50 +0100)]
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>

3 weeks agoVersion 5.7.1 of org-index
U-IHM-NOTEBOOK\Olli [Sun, 29 Oct 2017 14:31:45 +0000 (15:31 +0100)]
Version 5.7.1 of org-index

3 weeks agoorg-table: Fix compatibility with Emacs 24.3
Nicolas Goaziou [Sun, 29 Oct 2017 08:15:01 +0000 (09:15 +0100)]
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>

3 weeks agoRemove `org-babel-use-quick-and-dirty-noweb-expansion'
Nicolas Goaziou [Thu, 26 Oct 2017 11:09:23 +0000 (13:09 +0200)]
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.

3 weeks agoorg-agenda: Refactoring. Deactivate mark in case of a region.
Marco Wahl [Wed, 25 Oct 2017 15:35:26 +0000 (17:35 +0200)]
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.

3 weeks agoorg-agenda: Bulk mark lines in region
Marco Wahl [Wed, 25 Oct 2017 13:13:13 +0000 (15:13 +0200)]
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

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 24 Oct 2017 11:56:56 +0000 (13:56 +0200)]
Merge branch 'maint'

3 weeks agoox-texinfo: Remove TABs from output
Nicolas Goaziou [Tue, 24 Oct 2017 11:55:38 +0000 (13:55 +0200)]
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").

3 weeks agoorg-goto: Fix wrong number of arguments error
Nicolas Goaziou [Tue, 24 Oct 2017 08:28:43 +0000 (10:28 +0200)]
org-goto: Fix wrong number of arguments error

* lisp/org-goto.el (org-goto-location): Fix
  `isearch-search-fun-function' binding.

3 weeks agoorg-goto: Fix keymapp error
Nicolas Goaziou [Tue, 24 Oct 2017 08:27:10 +0000 (10:27 +0200)]
org-goto: Fix keymapp error

* lisp/org-goto.el: Remove spurious `defvar.

3 weeks agoox-texinfo: Small refactoring
Nicolas Goaziou [Tue, 24 Oct 2017 08:07:50 +0000 (10:07 +0200)]
ox-texinfo: Small refactoring

* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Use new `org-export-toc-entry-backend'
function.

3 weeks agoMove a test
Nicolas Goaziou [Tue, 24 Oct 2017 07:55:49 +0000 (09:55 +0200)]
Move a test

* testing/lisp/test-org-macs.el (test-org/in-regexp): Moved from...
* testing/lisp/test-org.el: ... here.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 24 Oct 2017 07:53:47 +0000 (09:53 +0200)]
Merge branch 'maint'

3 weeks agoFix comma escaping with multiple leading commas
Nicolas Goaziou [Tue, 24 Oct 2017 07:51:43 +0000 (09:51 +0200)]
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>

4 weeks agoox-texinfo: Fix missing contents in headings out of TOC
Nicolas Goaziou [Mon, 23 Oct 2017 12:55:05 +0000 (14:55 +0200)]
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.

4 weeks agoorg-goto: Fix header
Nicolas Goaziou [Mon, 23 Oct 2017 07:57:13 +0000 (09:57 +0200)]
org-goto: Fix header

4 weeks agoExtract "org-goto" code into a dedicated library
Nicolas Goaziou [Sun, 22 Oct 2017 14:40:54 +0000 (16:40 +0200)]
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.

4 weeks agoMove some invisibility check functions to "org-macs.el"
Nicolas Goaziou [Sun, 22 Oct 2017 14:20:58 +0000 (16:20 +0200)]
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.

4 weeks agoSilence byte-compiler
Nicolas Goaziou [Sun, 22 Oct 2017 13:41:02 +0000 (15:41 +0200)]
Silence byte-compiler

4 weeks agoRevert "Move `org-key' and `org-defkey' into "org-macs.el""
Nicolas Goaziou [Sun, 22 Oct 2017 13:38:35 +0000 (15:38 +0200)]
Revert "Move `org-key' and `org-defkey' into "org-macs.el""

This reverts commit 7f56a9920fff6c3538f30df2cc1c04cefe4f803b.

`org-key' is specific to Org keybinding, therefore not generic enough
to fit in "org-macs.el". So is `org-defkey'.

4 weeks agoMove some generic functions into "org-macs.el"
Nicolas Goaziou [Sun, 22 Oct 2017 13:34:26 +0000 (15:34 +0200)]
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.

4 weeks agoMove `org-key' and `org-defkey' into "org-macs.el"
Nicolas Goaziou [Sun, 22 Oct 2017 13:05:48 +0000 (15:05 +0200)]
Move `org-key' and `org-defkey' into "org-macs.el"

* lisp/org.el (org-key):
(org-defkey): Move...

* lisp/org-macs.el: ... there.

4 weeks agoMove compatibility functions in "org-compat.el"
Nicolas Goaziou [Sun, 22 Oct 2017 13:01:43 +0000 (15:01 +0200)]
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.

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 22 Oct 2017 12:40:45 +0000 (14:40 +0200)]
Merge branch 'maint'

4 weeks agoPrevent leaking fontification across table fields' borders
Nicolas Goaziou [Sun, 22 Oct 2017 12:39:36 +0000 (14:39 +0200)]
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>

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 22 Oct 2017 10:42:35 +0000 (12:42 +0200)]
Merge branch 'maint'

4 weeks agoFix tangling of org block with nested source block
thibault [Sat, 21 Oct 2017 03:20:35 +0000 (22:20 -0500)]
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.

4 weeks agoorg-agenda: Fix the display of more key substitutions
Kyle Meyer [Sat, 21 Oct 2017 05:31:18 +0000 (01:31 -0400)]
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 b6c5a174d, this call is made outside of the agenda
buffer.

The substitute-command-keys call in org-search-view is already taken
care of by 48f333805.

4 weeks agoMerge branch 'maint'
Marco Wahl [Fri, 20 Oct 2017 10:24:07 +0000 (12:24 +0200)]
Merge branch 'maint'

4 weeks agoox-man: Fix org-man--protect-text
Marco Wahl [Fri, 20 Oct 2017 10:21:08 +0000 (12:21 +0200)]
ox-man: Fix org-man--protect-text

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 19 Oct 2017 19:52:18 +0000 (21:52 +0200)]
Merge branch 'maint'

4 weeks agoox-man: Fix verbatim markup
Nicolas Goaziou [Thu, 19 Oct 2017 19:51:31 +0000 (21:51 +0200)]
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.

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 18 Oct 2017 20:55:18 +0000 (22:55 +0200)]
Merge branch 'maint'

4 weeks agoox-man: Fix code and verbatim export
Nicolas Goaziou [Wed, 18 Oct 2017 20:54:40 +0000 (22:54 +0200)]
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>

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 18 Oct 2017 20:49:10 +0000 (22:49 +0200)]
Merge branch 'maint'

4 weeks agoFix `org-insert-todo-heading'
Allen Li [Wed, 18 Oct 2017 20:48:16 +0000 (22:48 +0200)]
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.

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 17 Oct 2017 21:31:45 +0000 (23:31 +0200)]
Merge branch 'maint'

4 weeks agoUpdate documentation on org-protocol template placeholders
Allen Li [Tue, 17 Oct 2017 21:28:53 +0000 (23:28 +0200)]
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

4 weeks agoMove `org-completing-read' into "org-macs.el"
Nicolas Goaziou [Tue, 17 Oct 2017 08:11:21 +0000 (10:11 +0200)]
Move `org-completing-read' into "org-macs.el"

* lisp/org-macs.el (org-completing-read): Moved here...
* lisp/org.el: ... from there.

4 weeks agoMove `org-xor' into "org-macs.el"
Nicolas Goaziou [Tue, 17 Oct 2017 07:37:34 +0000 (09:37 +0200)]
Move `org-xor' into "org-macs.el"

* lisp/org.el (org-xor): Move...
* lisp/org-macs.el: ... there.

5 weeks agoox-texinfo: Handle "notoc" value
Nicolas Goaziou [Sun, 8 Oct 2017 07:55:06 +0000 (09:55 +0200)]
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.

5 weeks agoImplement `org-export-excluded-from-toc-p'
Nicolas Goaziou [Sun, 15 Oct 2017 10:15:06 +0000 (12:15 +0200)]
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.

5 weeks agoox: Implement "notoc" UNNUMBERED value
Nicolas Goaziou [Sat, 7 Oct 2017 14:03:17 +0000 (16:03 +0200)]
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.

5 weeks agoImprove a docstring
Nicolas Goaziou [Sun, 15 Oct 2017 08:27:53 +0000 (10:27 +0200)]
Improve a docstring

* lisp/org-element.el (org-element-lineage): Improve docstring.

5 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 14 Oct 2017 10:32:25 +0000 (12:32 +0200)]
Merge branch 'maint'

5 weeks agoSilence byte-compiler
Nicolas Goaziou [Sat, 14 Oct 2017 10:32:08 +0000 (12:32 +0200)]
Silence byte-compiler

5 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 14 Oct 2017 10:30:59 +0000 (12:30 +0200)]
Merge branch 'maint'