Commit Graph

14259 Commits

Author SHA1 Message Date
Nicolas Goaziou b8d89496fd Merge branch 'maint' 2017-09-28 22:15:34 +02:00
Nicolas Goaziou d417eac7ee org-table: Fix formula correction when removing a hline
* lisp/org-table.el (org-table-kill-row): Do not correct formula when
  removing a hline.

Reported-by: alan.wehmann@gmail.com
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00429.html>
2017-09-28 22:13:49 +02:00
Nicolas Goaziou fbf47cde94 Merge branch 'maint' 2017-09-26 20:05:07 +02:00
Nicolas Goaziou 226d2fcaa2 org-colview: Fix "wrong-type-argument markerp nil"
* lisp/org-colview.el (org-columns-remove-overlays): Fix
"wrong-type-argument markerp nil".

When calling `org-agenda-columns', `org-columns-top-level-marker' is
not set. Handle this situation.

Reported-by: Benjamin Beckwith <bnbeckwith@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00566.html>
2017-09-26 20:03:03 +02:00
Marco Wahl 193d5b5c7a Remove the overwrite of the C-c TAB binding
See also 44c46176e.
2017-09-26 12:28:14 +02:00
Kyle Meyer 48f3338057 org-agenda: Fix search view's display of command keys
* lisp/org-agenda.el (org-search-view): Specify the keymap for the
substitute-command-keys call because, as of b6c5a174d, this call is
made outside of the agenda buffer.
2017-09-25 11:55:10 -04:00
Jay Kamat 405555ec5c org-irc.el: Add proper export functions for irc
* lisp/org-irc.el (org-irc-export): Add a new function,
  org-irc-export, which properly exports irc links to html and markdown

* lisp/ox-md.el (org-md-link): Remove workaround to get irc links
  working properly in ox-md, and use org-irc's export functions instead
2017-09-24 18:33:55 +02:00
Nicolas Goaziou 3056abe781 Merge branch 'maint' 2017-09-24 10:58:43 +02:00
Nicolas Goaziou d40deb6967 ox-publish: Fix :base-extension any with :recursive t
* lisp/ox-publish.el (org-publish-get-base-files): Ensure MATCH regexp
  is always a string since `directory-files-recursively' requires it.
* testing/lisp/test-ox-publish.el (test-org-publish/get-project-from-filename):
  Add test.

Suggested-by: Jens Lechtenboerger <lechten@wi.uni-muenster.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00528.html>
2017-09-24 10:57:11 +02:00
Nicolas Goaziou ad0662bbe7 Revert "Table of contents ignore unnumbered headlines"
This reverts commit bd2378161e.
2017-09-21 21:14:41 +02:00
Nicolas Goaziou cf35109ad8 Merge branch 'maint' 2017-09-19 22:01:07 +02:00
N. Raghavendra db1dab8abe ox-html.el: Partially revert d5bbf36553
* lisp/ox-html.el (org-html-src-block): Unless klipse is used, export
source code blocks as content of `pre' elements, and not as content of
`code' children of `pre' elements.  Restores the previous way of
exporting source code blocks, and fixes the display of language
indicators while hovering over the blocks in the exported HTML file,
when klipse is not used.
(org-html-keep-old-src): Remove it.  Not needed because it is now the
default, unless klipse is used.
2017-09-19 22:00:32 +02:00
Nicolas Goaziou 6e7d152699 Move `org-get-at-bol' into "org-macs.el"
* lisp/org.el (org-get-at-bol): Move...
* lisp/org-macs.el: ... here.
2017-09-18 21:26:18 +02:00
Nicolas Goaziou 32890ea5a5 Move `org-uniquify' into "org-macs.el"
* lisp/org.el (org-uniquify): Move function...
* lisp/org-macs.el: ... here.
2017-09-18 21:25:15 +02:00
Nicolas Goaziou 794dfaa6e0 org-macs: Re-order functions and macros 2017-09-18 21:24:23 +02:00
Nicolas Goaziou 18ee77f62a Silence byte-compiler 2017-09-18 21:15:31 +02:00
Nicolas Goaziou 442a2b430d Move `org-trim' in "org-macs.el"
* lisp/org.el (org-trim): Move function...
* lisp/org-macs.el: ... here.
2017-09-18 21:07:13 +02:00
Nicolas Goaziou 44c46176ec Re-bind `org-show-children' to C-c TAB
* lisp/org.el (org-ctrl-c-tab): New function.
2017-09-18 20:20:35 +02:00
Kyle Meyer 5bcaa4dd13 Merge branch 'maint' 2017-09-18 13:10:32 -04:00
Kyle Meyer 753f3f2842 ob-hledger.el: Correct file name in header 2017-09-18 13:09:56 -04:00
Nicolas Goaziou ff6b380999 Merge branch 'maint' 2017-09-17 12:48:59 +02:00
Nicolas Goaziou 80cbf909ea Remove useless binding
* lisp/org.el (org-mode-map): Remove [(meta return)] binding, handled
  by (kbd "M-RET").

Suggested-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00411.html>
2017-09-17 12:48:17 +02:00
Kyle Meyer 297acd7517 Merge branch 'maint' 2017-09-17 01:17:10 -04:00
Kyle Meyer e4a0fd6b02 Adjust the license link in new lisp/*.el files
Emacs's bc511a64f6d made tree-wide changes to prefer https to http.
For Org, this resulted in the header of every lisp/*.el file being
changed.  Make the same changes in lisp/*.el files that were added
since Org version 9.0.10 (the last version that was synced with
Emacs).
2017-09-17 01:15:11 -04:00
Paul Eggert ff0dcf52a5 Backport commit bc511a64f from Emacs
Prefer HTTPS to FTP and HTTP in documentation
bc511a64f6da9ab51acc7c8865e80c4a4cb655c2
Paul Eggert
Wed Sep 13 15:54:37 2017 -0700
2017-09-17 00:28:38 -04:00
Paul Eggert d4d7cda57f Backport commit 5da53a019 from Emacs
* lisp/org-info.el (org-info-other-documents)
(org-info-map-html-url):
* lisp/ox-html.el (org-html-creator-string): Use HTTPS instead of
HTTP.

Prefer HTTPS to HTTP for gnu.org
5da53a01912c2f5d46f5df4ef8cc13a34b5017d4
Paul Eggert
Wed Sep 13 15:54:25 2017 -0700
2017-09-17 00:09:11 -04:00
Paul Eggert d3912e7f32 Backport commit 74b8615fc from Emacs
* lisp/ob-tangle.el (org-babel-tangle-publish): Port to new copy-file
behavior.

Adjust ob-tangle to new copy-file behavior
74b8615fcceba7b92c4938e1bcc92015f10ae899
Paul Eggert
Sun Sep 10 22:31:23 2017 -0700
2017-09-17 00:05:20 -04:00
Nicolas Goaziou 2021b98b83 Merge branch 'maint' 2017-09-16 17:19:55 +02:00
Nicolas Goaziou 9fb98f4c9c Add M-RET binding for terminal
* lisp/org.el (org-mode-map): Add M-RET binding.

Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00386.html>
2017-09-16 17:19:00 +02:00
Nicolas Goaziou 85acebdc2e Remove auto-repair of malformed property drawers
* lisp/org.el (org-buffer-property-keys): Remove optional argument
  IGNORE-MALFORMED.
* lisp/org-pcomplete.el (pcomplete/org-mode/prop): Update call to
  previous function.

* testing/lisp/test-org.el (test-org/buffer-property-keys): Remove
  a test.

More often than not, the question just gets in the way.  Use `M-x
org-lint' instead.
2017-09-16 14:15:57 +02:00
Nicolas Goaziou 9f863a695b ox-texinfo: Add missing autoload cookies
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo):
(org-texinfo-export-to-info): Add autoload cookie.
2017-09-15 21:11:55 +02:00
Nicolas Goaziou 9c4ee81a8b ox-texinfo: Add missing autoload cookies
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo):
(org-texinfo-export-to-info): Add autoload cookie.
2017-09-15 21:10:29 +02:00
Nicolas Goaziou 8383f7e08b Change emphasis regexp
* lisp/org.el (org-emphasis-regexp-components): Change emphasis
  regexp.

Reported-by: Reuben Thomas <rrt@sc3d.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00363.html>
2017-09-15 00:14:09 +02:00
Nicolas Goaziou 9e062df65d Merge branch 'maint' 2017-09-14 15:44:06 +02:00
Nicolas Goaziou 25f12218d2 Fix `org-auto-repeat-maybe'
* lisp/org.el (org-auto-repeat-maybe): Fix `org-auto-repeat-maybe'.

* testing/lisp/test-org.el (test-org/auto-repeat-maybe): Add test.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00298.html>
2017-09-14 15:40:28 +02:00
Nicolas Goaziou 04498a4fbd Merge branch 'maint' 2017-09-14 15:25:36 +02:00
Nicolas Goaziou 63f1ffac32 ob-scheme: Fix results error on unspecified and void values
* lisp/ob-scheme.el (org-babel-scheme-execute-with-geiser): Return
  "#<void>" or "#<unspecified>" when the REPL says so.

* testing/lisp/test-ob-scheme.el (test-ob-scheme/unspecified): New
  test.
(test-ob-scheme/prologue): Fix tests.

Reported-by: Lawrence Bottorff <borgauf@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00346.html>
2017-09-14 15:25:04 +02:00
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 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 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
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 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 ad1c0faa7e Merge branch 'maint' 2017-09-07 14:38:23 +02:00
Nicolas Goaziou ea4e3dac6d Use `split-string' instead of `org-split-string'
* contrib/lisp/org-depend.el (org-depend-trigger-todo):
(org-depend-block-todo):
* contrib/lisp/ox-bibtex.el (org-bibtex-get-arguments):
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template):
* contrib/lisp/ox-taskjuggler.el (org-taskjuggler--build-unique-id):
(org-taskjuggler-resolve-dependencies):
* lisp/ob-core.el (org-babel-insert-result):
* lisp/org-agenda.el (org-search-view):
* lisp/org-lint.el (org-lint-duplicate-target):
(org-lint-wrong-header-value):
* lisp/org.el (org--setup-collect-keywords):
(org-make-org-heading-search-string):
(org-search-radio-target):
(org-local-logging):
(org-entry-add-to-multivalued-property):
(org-entry-remove-from-multivalued-property):
(org-entry-member-in-multivalued-property):
(org-entry-get-multivalued-property):
(org-entry-put-multivalued-property):
(org-wrap):
* lisp/ox-beamer.el (org-beamer-allowed-property-values):
* lisp/ox.el (org-export--get-subtree-options):
(org-export--get-inbuffer-options): Use `split-string' instead of
`org-split-string'.
2017-09-07 14:36:50 +02:00
Nicolas Goaziou d1e03f59b8 org-agenda: Silence byte-compiler 2017-09-06 15:39:32 +02:00
Nicolas Goaziou 70d2b3c96f org-table: Obey <c> cookie when aligning a table
* lisp/org-table.el (org-table--align-field): New function.
(org-table-align): Use new function.  Refactor code.
(org-table-justify-field-maybe): Use new function.
(org-table-get-remote-range): Remove duplicate bindings.

* doc/org.texi (Column width and alignment): Remove footnote.

* testing/lisp/test-org-table.el (test-org-table/align): New test.
2017-09-06 15:21:20 +02:00
Nicolas Goaziou 8374e6f438 org-table: Implement org-table-expand
* lisp/org-table.el (org-table-expand): New function.
(org-table--expand-all-columns): Remove function.
(org-table-with-shrunk-columns):
(org-table-insert-column):
(org-table-delete-column):
(org-table-move-column):
(org-table-toggle-column-width): Use new function.
2017-09-06 15:18:37 +02:00
Nicolas Goaziou 882f3f3fc0 org-table: Change behavior of `org-table-toggle-column-width'
* lisp/org-table.el (org-table-toggle-column-width): Change behavior
  of `org-table-toggle-column-width'.
(org-table-shrink): Allow optional arguments.

* testing/lisp/test-org-table.el (test-org-table/toggle-column-width):
  Update tests.
2017-09-06 15:18:37 +02:00
Nicolas Goaziou 73bf9b8887 org-table: Allow to shrink tables upon opening a document
* lisp/org-table.el (org-table-shrink): New function.
* lisp/org.el (org-startup-align-all-tables): Update docstring.
(org-startup-shrink-all-tables): New variable.
(org-mode): Use new function and new variable.
2017-09-06 15:18:37 +02:00
Nicolas Goaziou 23a2fde6fe Remove visual effect of width cookies in tables
* lisp/org-colview.el (org-dblock-write:columnview): Remove :width
  parameter.

* lisp/org-table.el (org-narrow-column-arrow): Remove variable.
(org-table-cleanup-narrow-column-properties): Remove function.
(org-table-align): Ignore width cookies when aligning table.
(org-table-justify-field-maybe):
(org-table-finish-edit-field):
(org-table-follow-fields-with-editor):
(orgtbl-setup): Remove reference to `org-cwidth' property.

* lisp/org.el (org-mode):
(org-hide-wide-columns): Remove function.
(org-set-font-lock-defaults): Apply previous removal.
(org-shorten-string): Ignore `org-cwidth' property.

* testing/lisp/test-org-colview.el (test-org-colview/dblock): Remove
  a test.

Export back-ends may still use width cookie to alter table's output.
2017-09-06 15:18:37 +02:00
Nicolas Goaziou 6d6a30d4cd org-table: Implement shrunk columns
* lisp/org-table.el (org-table-shrunk-column-indicator): New variable.
(org-table-with-shrunk-columns): New macro.
(org-table--shrunk-field):
(org-table--list-shrunk-columns):
(org-table--shrink-field):
(org-table--read-column-selection):
(org-table--expand-all-columns):
(org-table-toggle-column-width): New functions.

(org-table-align):
(org-table-get-field):
(org-table-insert-column):
(org-table-delete-column):
(org-table-move-column):
(org-table-move-row):
(org-table-insert-row):
(org-table-insert-hline):
(org-table-kill-row):
(org-table-sort-lines): Use new functions.

(org-table-overlay-coordinates):
(org-table-toggle-coordinate-overlays): Tiny refactoring.

* testing/lisp/test-org-table.el (test-org-table/toggle-column-width):
(test-org-table/shrunk-columns): New tests.
2017-09-06 15:18:37 +02:00
Jay Kamat 331ba68495 org-archive.el: Update statistic cookies when archiving
* lisp/org-archive.el (org-archive-subtree): Update todo statistics
  when calling `org-archive-subtree'.
(org-archive-to-archive-sibling): Update cookie statistics when
calling `org-archive-to-archive-sibling'.

* testing/lisp/test-org-archive.el: New file.

This can be disabled by setting `org-provide-todo-statistics' to nil.
2017-09-06 14:31:01 +02:00
Nicolas Goaziou 7d08ff06bd Merge branch 'maint' 2017-09-06 13:19:37 +02:00
Eduardo Bellani 6edec1bef5 Fix table variable with commas in ob-sqlite
* lisp/ob-sqlite.el (org-babel-sqlite-expand-vars): Stop interfering
  with the 'orgtbl-to-csv' default formatting.

* testing/lisp/test-ob-sqlite.el: New file.

The problem here was that ob-sqlite was providing a format to the
`orgtbl-to-csv' that actually overwrote the default format in that
function, and in the case where there were commas in the content of
the table, broke the table as argument mechanism.

TINYCHANGE
2017-09-06 13:18:30 +02:00
Adam Porter fccfe56659 org-agenda: Minor refactoring and tiny bug fix
* lisp/org-agenda.el (org-agenda--insert-overriding-header): Use
propertize instead of org-add-props.
(org-agenda-list): Replace nested if with cond.
(org-todo-list): Replace mapc-lambda with dolist.
(org-todo-list): Fix bug by using window-width instead of frame-width.
2017-09-06 13:14:03 +02:00
Adam Porter b6c5a174da org-agenda: Refactor org-agenda-overriding-header code
* lisp/org-agenda.el (org-agenda--insert-overriding-header): Add macro.
(org-agenda-list)
(org-search-view)
(org-todo-list)
(org-tags-view): Use macro.
(org-agenda-overriding-header): Update docstring.

* etc/ORG-NEWS: Explain that header can be disabled with empty string.

Replace org-agenda-overriding-header tests in these four functions with
calls to a macro, eliminating the duplicate code.  Also, disable the
header when the variable is set to the empty string.
2017-09-06 13:13:59 +02:00
Nicolas Goaziou 845138473e Merge branch 'maint' 2017-09-05 22:34:38 +02:00
Nicolas Goaziou 0a77f042ea ox-odt: Small fix
* lisp/ox-odt.el (org-odt--translate-latex-fragments): Ignore blank
  lines before link to parse.

Reported-by: Alastair Burt <alastair.burt@gmail.com>
2017-09-05 22:33:29 +02:00
Nicolas Goaziou b792e28168 org-agenda: Fix `org-agenda-custom-command' customization
* lisp/org-agenda.el (org-agenda-custom-commands-local-options): Quote
  symbols.

Reported-by: Niall Dooley <dooleyn@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00659.html>
2017-09-03 14:19:05 +02:00
Nicolas Goaziou 8a0c89244d Merge branch 'maint' 2017-08-31 23:15:56 +02:00
Nicolas Goaziou 1654a5a98a Fix `:jump-to-captured' when refiling a capture target
* lisp/org-capture.el (org-capture-refile): Call
  `org-capture-goto-last-stored' at the appropriate time.

* testing/lisp/test-org-capture.el (test-org-capture/refile): Add
  test.

Reported-by: "Raymond Zeitler" <zeitra@yahoo.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00704.html>
2017-08-31 23:14:04 +02:00
Nicolas Goaziou ab6f43fcac ox-icalendar: release buffers less aggressively
* lisp/ox-icalendar.el (org-icalendar--combine-files): Release only
  newly created buffers.

Reported-by: Michaël Cadilhac <michael@cadilhac.name>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00691.html>
2017-08-31 15:58:51 +02:00
Nicolas Goaziou 23eba90e26 org-agenda: Remove unnecessary sentence
* lisp/org-agenda.el (org-agenda-entry-types): Remove a sentence.
2017-08-30 14:52:28 +02:00
Nicolas Goaziou 213c011505 org-agenda: Tiny clean-up
* lisp/org-agenda.el (org-agenda-to-appt): Remove obsolete code.
2017-08-30 14:30:30 +02:00
Nicolas Goaziou d1ff75f335 Remove "timeline" remnants
* doc/orgguide.texi (Timeline): Remove node.
(Top):
(Using TODO states):
(Clocking work time):
(Agenda dispatcher):
(Built-in agenda views):
(Matching tags and properties): Update.
* lisp/org-agenda.el (org-agenda-include-inactive-timestamps):
(org-agenda-format-date):
(org-agenda-format-date-aligned):
(org-agenda-weekend-days):
(org-agenda-prefix-format):
(org-agenda-show-inherited-tags):
(org-agenda-use-tag-inheritance):
(org-agenda-menu):
(org-agenda-max-entries):
(org-agenda-max-todos):
(org-agenda-max-tags):
(org-agenda-max-effort):
(org-agenda-check-type):
(org-agenda-manipulate-query):
(org-agenda-goto-today):
(org-agenda-view-mode-dispatch):
(org-agenda-next-date-line):
(org-agenda-previous-date-line):
(org-agenda-log-mode):
(org-agenda-date-later):
(org-agenda-date-prompt):
(org-agenda-schedule):
(org-agenda-deadline):
(org-agenda-execute-calendar-command):
(org-agenda-goto-calendar):
(org-agenda-convert-date):
(org-agenda-bulk-action):
* lisp/org-mouse.el (org-mouse-agenda-context-menu): Remove reference
  to "timeline".
2017-08-30 14:24:40 +02:00
Nicolas Goaziou c01b62305e Merge branch 'maint' 2017-08-30 08:12:29 +02:00
Nicolas Goaziou 18a48b5861 Fix ODT priority styling
* lisp/ox-odt.el (org-odt-format-headline-default-function): Fix style
  name for priority cookie.

Reported-by: Henry Todd <hjst@me.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00648.html>
2017-08-30 08:04:25 +02:00
Nicolas Goaziou 7d18632a73 Fix "Symbol’s function definition is void: org-clocking-buffer"
* lisp/org.el (org-sort-entries): Fix "Symbol’s function definition is
void: org-clocking-buffer".

Reported-by: Ian Garmaise <ian.g@phorixsol.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00647.html>

Reported-by: Allen Choong <allencch@hotmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00649.html>
2017-08-30 00:14:42 +02:00
Nicolas Goaziou 8b5b2cf49e Merge branch 'maint' 2017-08-28 09:15:54 +02:00
Nicolas Goaziou ab65bc13d6 Fix deleting a region in a table (part 2)
* lisp/org.el (org-delete-backward-char): Fix deleting a region in
  a table.
2017-08-28 09:14:57 +02:00
Nicolas Goaziou 750071accd Tiny refactoring
* lisp/ox.el (org-export-with-drawers): Tiny refactoring.
2017-08-26 11:27:51 +02:00
Nicolas Goaziou 64bfa2d931 Remove `inline-only' option for `org-export-use-babel'
* lisp/ob-exp.el (org-export-use-babel): Remove `inline-only' option.
(org-babel-exp-process-buffer): Ignore `inline-only' value.

* doc/org.texi (Exporting code blocks): Remove documentation.

* testing/lisp/test-ob-exp.el (ob-export/babel-evaluate): Remove tests.
2017-08-26 10:32:26 +02:00
Nicolas Goaziou e0682619dd Merge branch 'maint' 2017-08-26 00:12:46 +02:00
Nicolas Goaziou a6840598ed Fix `org-copy-visible'
* lisp/org.el (org-copy-visible): Rewrite function.  Do not use
  dubious `org-find-visible' and `org-find-invisible'.

* testing/lisp/test-org.el (test-org/copy-visible): New test.

Reported-by: Gary Cheng <garycheng12@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00568.html>
2017-08-26 00:09:51 +02:00
Nicolas Goaziou dd4a3d3b11 Merge branch 'maint' 2017-08-25 22:00:38 +02:00
Nicolas Goaziou 21a8ec1c0f ob-core: Fix going to a named block.
* lisp/ob-core.el (org-babel-find-named-block): Add missing argument.

Reported-by: Eric S Fraga <ucecesf@ucl.ac.uk>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00576.html>
2017-08-25 21:59:28 +02:00
Nicolas Goaziou 489346c1d5 Merge branch 'maint' 2017-08-25 21:51:56 +02:00
Nicolas Goaziou 51b431d013 org-capture: Fix "org-capture: Fix %^T and %^U placeholders"
* lisp/org-capture.el (org-capture-fill-template): Fix
  2ff3101c0e.
2017-08-25 21:51:04 +02:00
Nicolas Goaziou a68d117459 Merge branch 'maint' 2017-08-25 15:25:02 +02:00
Nicolas Goaziou c1b9d38c89 org-lint: Fix wrong warning with inline footnotes
* lisp/org-lint.el (org-lint-undefined-footnote-reference): Do not
  warn when definition is inline.

* testing/lisp/test-org-lint.el (test-org-lint/undefined-footnote-reference):
  Add tests.

Reported-by: Eric S Fraga <esflists@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00577.html>
2017-08-25 15:24:07 +02:00
Nicolas Goaziou bae41a277e org-table: Fix sorting with times > 100 hours
* lisp/org-table.el (org-table-sort-lines): Fix regexp.  Also test
  durations.

* testing/lisp/test-org-table.el (test-org-table/sort-lines): Update
  tests.  Add a new one.
2017-08-25 00:06:27 +02:00
Nicolas Goaziou b47de25062 Merge branch 'maint' 2017-08-23 10:30:33 +02:00
Nicolas Goaziou 2ff3101c0e org-capture: Fix %^T and %^U placeholders
* lisp/org-capture.el (org-capture-fill-template): Fix %^T and %^U
  placeholders.

Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00528.html>
2017-08-23 10:28:39 +02:00
Nicolas Goaziou d58837a5ea Merge branch 'maint' 2017-08-22 23:46:00 +02:00
Jay Kamat fc84ffee22 ox-md: Fix missing ':' in exported markdown image links
* lisp/ox-md.el (org-md-link): Append ':' to the type of non-file
  image links.
2017-08-22 23:44:23 +02:00
Nicolas Goaziou 526b3d4b98 Merge branch 'maint' 2017-08-21 21:27:06 +02:00
Nicolas Goaziou 6980b02b6f Revert "org-macro: Expand macros only within narrowed part of buffer"
This reverts commit 82db669de6.
2017-08-21 21:21:30 +02:00
Nicolas Goaziou e40d2df680 Merge branch 'maint' 2017-08-21 11:31:29 +02:00
Nicolas Goaziou 4df137420d org-src: Fix remote footnote edition
* lisp/org-src.el (org-src--edit-element): Ensure read-only overlay in
  source buffer is properly removed upon exiting the remote editing
  buffer.
2017-08-21 11:27:41 +02:00
Eric Abrahamsen 7973ec1057 Inherit TIMEZONE and LOCATION properties in iCalendar export
* lisp/ox-icalendar.el (org-icalendar-entry): Both properties now
optionally inherit, depending on value of
`org-use-property-inheritance'.
* doc/org.texi: Mention change.
2017-08-20 00:12:57 +02:00
Eric Abrahamsen 42458e682d Add per-entry timezone support for icalendar export
* lisp/ox-icalendar.el (org-icalendar-entry): Look for a "TIMEZONE"
  property.
(org-icalendar--vevent, org-icalendar--vtodo): Accept additional
timezone argument.
(org-icalendar-convert-timestamp): Change parameter name to "tz", and
accept a wider variety of values.

* doc/org.texi: Mention in manual.
2017-08-20 00:11:18 +02:00
Nicolas Goaziou 6a590738b1 Remove `org-enable-table-editor'
* doc/org.texi (Built-in table editor): Document removal.
* lisp/org-table.el (orgtbl-optimized):
(org-table-auto-blank-field): Ignore removed variable.
2017-08-19 23:39:22 +02:00
Nicolas Goaziou 9638de598c `org-enable-table-editor' does not affect syntax
* lisp/org-table.el (org-table-paste-rectangle):
* lisp/org.el (org-at-table-p):
(org-at-table.el-p):
(org-at-table-hline-p):
(org-ctrl-c-ctrl-c):
(org-tbl-menu): Ignore `org-enable-table-editor'.
2017-08-19 21:44:47 +02:00
Nicolas Goaziou a65ddb0228 org-table: Fix table alignment
* lisp/org-table.el (org-table-align): Fix table alignment.
2017-08-19 12:13:26 +02:00
Bastien d0ced98943 Delete htmlize.el from Org’s contrib directory
* lisp/ox-org.el (org-org-publish-to-org):
* lisp/ox-html.el (org-html-htmlize-generate-css):
(org-html-fontify-code):
* lisp/org-agenda.el (org-agenda-write): Throw an error
requesting the user to install htmlize.el.

* doc/org.texi (Exporting agenda views, Literal examples):
Don’t assume htmlize.el is available.

You need to install it from https://github.com/hniksic/emacs-htmlize

See https://github.com/hniksic/emacs-htmlize/issues/7 for this issue.
2017-08-18 09:54:19 +02:00
Bastien 90986a8e2f Remove ob-scala.el
See https://github.com/ensime/emacs-scala-mode/issues/114#issuecomment-323281255
2017-08-18 09:35:14 +02:00
Nicolas Goaziou ac6b6a45de Merge branch 'maint' 2017-08-17 18:17:39 +02:00
Nicolas Goaziou 91c68865c6 Fix deleting region in a table
* lisp/org.el (org-self-insert-command): Fix deleting region in
  a table.

Reported-by: Nick Helm <nick@tenpoint.co.nz>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00346.html>
2017-08-17 18:16:22 +02:00
Nicolas Goaziou 3fb025137b Fix previous commit
* lisp/org.el (org-display-inline-images): Fix thinko in previous
  commit.  Also remove code related to nested links as this is no
  longer possible in Org syntax.
2017-08-17 15:55:15 +02:00
Nicolas Goaziou 6ec148a263 Allow link abbreviations to be displayed as inline images
* lisp/org.el (org-display-inline-images): Also display link
  abbreviations when they point to a valid image file.

Reported-by: Fabrice Popineau <fabrice.popineau@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00395.html>
2017-08-17 15:45:47 +02:00
Nicolas Goaziou 2fb129b5c7 `org-scan-tags' retrieve all TODO keywords, not only not-done ones
* lisp/org.el (org-scan-tags): Retrieve all TODO keywords.  DONE
  keywords can be filtered using "/!" matcher syntax or equivalent.

Reported-by: Julien Cubizolles <j.cubizolles@free.fr>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00367.html>
2017-08-17 15:16:07 +02:00
Nicolas Goaziou db0ef4d06e Revert "org-agenda: `tags-todo' command type includes DONE keywords"
This reverts commit 942b6267a0.
2017-08-17 14:51:11 +02:00
Kyle Meyer 4890801242 Merge branch 'maint' 2017-08-14 22:04:35 -04:00
Paul Eggert 731f59f965 Backport commit 5bdc97d55 from Emacs
Be consistent in spelling 'ok-if-already-exists'.
5bdc97d55df30f6af107ddd136901983a7e2706a
Paul Eggert
Sun Aug 13 11:55:12 2017 -0700
2017-08-14 22:03:29 -04:00
Kyle Meyer b900a85fe9 org-agenda: Fix prefix argument handling for bulk actions
* lisp/org-agenda.el (org-agenda-bulk-action): Fix the prefix argument
  checks introduced by 4f578a3f7 to avoid inadvertently setting
  org-agenda-schedule or org-agenda-deadline's time argument to ARG's
  value when ARG is non-nil.

Reported-by: Julien Cubizolles <j.cubizolles@free.fr>
<https://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00263.html>
2017-08-14 16:27:46 -04:00
Kaushal Modi c8ade76ca2 Fix blank titles resulting in export of invalid HTML
* lisp/ox-html.el (org-html--build-meta-info): Use an invisible
  character "&lrm;" (left-to-right mark) in the HTML title tags
  instead of removing the title altogether (invalid HTML) or setting
  the content of title tag to nothing (invalid HTML).

Discussion:
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00021.html>
2017-08-14 16:11:32 -04:00
Galen Menzel f3abb514a3 Implement `org-decode-time' for backward compatibility
* lisp/org-compat.el (org-decode-time): New function.
* lisp/org-clock.el (org-clock-get-sum-start): Use new function.

Emacs 24's `decode-time' doesn't accept two arguments.
2017-08-14 13:02:43 +02:00
Nicolas Goaziou 748bfee34a org-clock: Remove interactive from `org-clock-select-task'
* lisp/org-clock.el (org-clock-select-task): Remove `interactive'.

This function is not meant to be called interactively.  Use
`org-clock-goto' with a prefix argument instead.
2017-08-14 11:17:44 +02:00
Nicolas Goaziou 548b07741b Merge branch 'maint' 2017-08-13 19:02:27 +02:00
Nicolas Goaziou b862c24b9f ob-core: Fix `org-babel-goto-named-src-block' at point-min
* lisp/ob-core.el (org-babel-find-named-block):
(org-babel-src-block-names): Fix behaviour when match is at point-min.

Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00324.html>
2017-08-13 19:02:10 +02:00
Nicolas Goaziou 15e992c6da Merge branch 'maint' 2017-08-13 16:21:21 +02:00
Nicolas Goaziou 24a76fbe57 ob-core: Fix improper results indentation
* lisp/ob-core.el (org-babel-insert-result): Fix improper results
  indentation.
* testing/lisp/test-ob.el (test-ob/preserve-results-indentation): Add
  test.

Reported-by: Chunyang Xu <mail@xuchunyang.me>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00308.html>
2017-08-13 16:20:20 +02:00
Nicolas Goaziou 5f410132b5 Merge branch 'maint' 2017-08-13 15:13:47 +02:00
Nicolas Goaziou 5bf7730674 Fix exporting LaTeX fragments within inline footnotes
* lisp/ox.el (org-export--prune-tree): Do not change parent by side
  effect. It affects footnote references already in the tree.

Reported-by: Paul Stansell <paulstansell@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00302.html>
2017-08-13 15:11:48 +02:00
Galen Menzel 3359e05e82 Implement `org-decode-time' for backward compatibility
* lisp/org-compat.el (org-decode-time): New function.
* lisp/org-clock.el (org-clock-get-sum-start): Use new function.

Emacs 24's `decode-time' doesn't accept two arguments.
2017-08-11 15:07:45 +02:00
Galen Menzel 10b1cfb031 Fix `org-toggle-tag
* lisp/org.el (org-toggle-tag): Fix
  d777d5e0b7.

Reported-by: Josh Moller-Mara <jmm@cns.nyu.edu>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00278.html>
2017-08-11 11:02:01 +02:00
Rasmus 323fc95b4f ox-beamer: Fix bug related to frame options
* lisp/ox-beamer.el (org-beamer--format-frame): Remove empty options
  explicitly.

Reported-by: Jarmo Hurri <jarmo.hurri@iki.fi>
<http://permalink.gmane.org/gmane.emacs.orgmode/115190>
2017-08-10 20:31:07 +02:00
Grant Rettke 33e0dc6155 Add Easy Template for COMMENT (C)
* lisp/org.el: (org-structure-template-alist): Added `COMMENT' block template
  bound to `C'

* doc/org.texi: Add documentation for `COMMENT' Easy Template.

* contrib/orgmanual.org: Add documentation for `COMMENT' Easy
  Template.

* etc/ORG-NEWS: Added note for 9.1 release under Miscellaneous
2017-08-10 12:45:02 +02:00
Nicolas Goaziou 829ffa977c Merge branch 'maint' 2017-08-10 12:42:51 +02:00
Nicolas Goaziou 313d22dec6 org.el: Fix org-open-at-point for tags.
lisp/org.el (org-open-at-point): Move case for tags up so that it's
not shortcutted by the case for no valid context.

TINYCHANGE
2017-08-10 12:41:35 +02:00
Rasmus 8ab9a82be2 ox-html: Respect the "title" option
* lisp/ox-html.el (org-html-template): Respect :with-title.

Reported-by: lists@wilkesley.net
<http://permalink.gmane.org/gmane.emacs.orgmode/114942>
2017-08-09 11:39:56 +02:00
Adam Porter 7e46af419c org-agenda.el: Add option to automatically align tags in agenda
* lisp/org-agenda.el (org-agenda-tags-column): Add 'auto setting.
(org-agenda-align-tags): Handle automatic alignment.

TINYCHANGE
2017-08-08 15:18:50 -04:00
Nicolas Goaziou f1b2a95bee Merge branch 'maint' 2017-08-07 23:27:51 +02:00
Nicolas Goaziou 1876514e26 Fix customize interface
* lisp/org.el (org-tag-alist, org-tag-persistent-alist): Add non-keyed
tag type.
2017-08-07 23:27:10 +02:00
Nicolas Goaziou bfbaf1caa4 Merge branch 'maint' 2017-08-07 14:47:14 +02:00
Nicolas Goaziou ec129f8e10 Silence byte-compiler 2017-08-07 14:46:59 +02:00
Nicolas Goaziou e805aba972 Add "vala" to org-babel-load-languages
* lisp/org.el (org-babel-load-languages): Add "vala".
2017-08-07 14:44:38 +02:00
Nicolas Goaziou 2bc39af847 Merge branch 'maint' 2017-08-07 13:30:19 +02:00
Nicolas Goaziou b561c8b7ef org-clock: Fix typo in last commit
* lisp/org-clock.el (org-clock-get-sum-start): Fix typo.
2017-08-07 13:29:52 +02:00
Nicolas Goaziou 5c1d9c53f0 Merge branch 'maint' 2017-08-07 13:27:39 +02:00
Nicolas Goaziou 43a1d5e920 org-clock: Fix `org-clock-get-sum-start'
* lisp/org-clock.el (org-clock-get-sum-start): Return time as UTC.

Reported-by: Josh Moller-Mara <jmm@CNS.NYU.EDU>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00128.html>
2017-08-07 13:25:20 +02:00
Nicolas Goaziou d777d5e0b7 Fix thinko
* lisp/org.el (org-toggle-tag): Do not call `match-string' after
  `replace-match'.
2017-08-07 13:13:56 +02:00
Nicolas Goaziou 7d21349dbe Merge branch 'maint' 2017-08-07 13:12:32 +02:00
Nicolas Goaziou f6a28ba1c2 Tiny refactoring
* lisp/org.el (org-sort-entries): Use keyword instead of symbol.
2017-08-07 13:11:54 +02:00
Nicolas Goaziou c8f3833e9b Merge branch 'maint' 2017-08-07 12:56:20 +02:00
Nicolas Goaziou 6a9fc48097 Fix `org-sort-entries' loosing clock marker
* lisp/org.el (org-sort-entries): Properly restore clock marker, when
  appropriate.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00177.html>
2017-08-07 12:51:35 +02:00
Nicolas Goaziou e83255c993 Silence byte-compiler 2017-08-07 11:43:50 +02:00
Christian Garbs 4d2c8354ee ob-vala.el: Add Vala support to Babel
* lisp/ob-vala.el: Add support for the Vala language to Babel.

* testing/lisp/test-ob-vala.el: Add tests for ob-vala.el.

* doc/org.texi (Working with source code): Add Vala to the list of
  supported languages.
2017-08-07 11:40:25 +02:00
Nicolas Goaziou 15f112259b Fix spurious colons next to TODO keywords
* lisp/org.el (org-toggle-tag): Fix spurious colons next to TODO
  keywords.

Reported-by: Colin Baxter <m43cap@yandex.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00075.html>
2017-08-07 11:32:39 +02:00
Yuri D. Lensky e28714c3f2 org-agenda: Properly return all entries from blocked marking
* lisp/org-agenda.el (org-agenda--mark-blocked-entry): Always return
  the entry passed to `org-agenda--mark-blocked-entry' (previously
  returned nil if entry did not have todo-state text property).
2017-08-07 10:54:11 +02:00
Nicolas Goaziou bd9f63a22a Merge branch 'maint' 2017-08-07 10:53:22 +02:00
Nicolas Goaziou e8fe579a17 Silence byte-compiler
* lisp/org-macs.el (org-unique-local-variables):
(org-get-local-variables):
(org-clone-local-variables): Moved from "org.el".
2017-08-07 10:52:37 +02:00
Nicolas Goaziou a7e11643a9 Merge branch 'maint' 2017-08-06 10:31:06 +02:00
Nicolas Goaziou 9974ed39b2 org-src: Fix remote footnote edition
* lisp/org-src.el (org-edit-footnote-reference): Clone local variables
  in remote editing buffer.

* testing/lisp/test-org-src.el (test-org-src/footnote-references): Add
  test.
2017-08-06 10:30:48 +02:00
Nicolas Goaziou fca0dbcc61 Fix `org-clone-local-variables'
* lisp/org.el (org-clone-local-variables): Prevent errors that could
  happen when trying to set local variables that cannot be set,
  e.g. `enable-multibyte-characters'.
2017-08-06 10:26:01 +02:00
Nicolas Goaziou b4032ed597 Merge branch 'maint' 2017-08-06 09:13:49 +02:00
Nicolas Goaziou f3d7284ebd ox-md: Fix non-"file" image links
* lisp/ox-md.el (org-md-link): Handle non-"file" image links.

Reported-by: Jay Kamat <jaygkamat@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00147.html>
2017-08-06 09:11:59 +02:00
Nicolas Goaziou 9d7f8a71a9 Merge branch 'maint' 2017-08-06 02:17:25 +02:00
Nicolas Goaziou 62b4edb263 Fix `org-refile' with prefix argument
* lisp/org.el (org-refile): Handle special file targets.

Reported-by: Michaël Cadilhac <michael@cadilhac.name>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00045.html>
2017-08-06 02:16:15 +02:00
Nicolas Goaziou 71aabd9db7 Merge branch 'maint' 2017-08-06 01:55:26 +02:00
Michaël Cadilhac 1f6f46aa69 org-capture.el: Document what the time stamp is in capture templates
* lisp/org-capture.el (org-capture-templates): Make explicit that the time
stamp aware %-escapes are influenced by `org-capture-use-agenda-date'.

TINYCHANGE
2017-08-06 01:44:23 +02:00
Nicolas Goaziou 411c603516 Merge branch 'maint' 2017-08-06 01:20:36 +02:00
Nicolas Goaziou 4b89f5c0e4 ox-icalendar: Fix thinko
* lisp/ox-icalendar.el (org-icalendar-export-current-agenda): Use
  `member' instead of `memq'.
2017-08-06 01:19:49 +02:00
Nicolas Goaziou 569b7d105c Merge branch 'maint' 2017-08-05 15:38:13 +02:00
Nicolas Goaziou 7e241af591 org-clock: Fix regression in `org-clock-sum'
* lisp/org-clock.el (org-clock-sum): Fix regression introduced in
  112c5ba479.  Small refactoring.

Reported-by: Josh Moller-Mara <jmm@cns.nyu.edu>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00117.html
2017-08-05 15:35:37 +02:00
Nicolas Goaziou d5690b6206 Merge branch 'maint' 2017-08-05 11:05:45 +02:00
Nicolas Goaziou e67f0f29de ox-icalendar: Prevent duplicates when writing agenda view
* lisp/ox-icalendar.el (org-icalendar-export-current-agenda): Prevent
  duplicates when writing agenda view.

Reported-by: Nicolae Cindea <ncindea@gmail.com>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00116.html
2017-08-05 11:02:14 +02:00
Nicolas Goaziou dd6be5d161 Allow emphasis markers after an hyphen
* lisp/org.el (org-emphasis-regexp-components): Allow emphasis markers
  after an hyphen.
(org-do-emphasis-faces): Do not strike-through table hlines.

Hypen is already allowed after emphasis markers.  This allows one to
write, e.g., 2017-*09*-27.
2017-08-04 18:40:28 +02:00
Nicolas Goaziou b0776e39b5 org-table: Small refactoring
* lisp/org-table.el (org-table-previous-field): Small refactoring.

* testing/lisp/test-org-table.el (test-org-table/previous-field): New
  test.
2017-08-02 10:35:57 +02:00
Nicolas Goaziou 80d7025770 Fix `org-store-log-note'
* lisp/org.el (org-store-log-note): Ignore empty log buffers.

The regression was introduced in
f776e65373. From then, (org-split-string
"") no longer returns nil.

Suggested-by: Dale Sedivec <dale@codefu.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00013.html>
2017-08-01 20:14:23 +02:00
Jay Kamat 0c1b4da1f6 ob-C.el: Add support for specifying namespaces in C/C++
* lisp/ob-C.el (org-babel-C-expand-C): Add a :namespaces export option
  to C++ org babel blocks. Namespaces specified here will be added to
  the file in the format 'using namespace %s;'. Multiple namespaces
  can be specified, separated by spaces.

TINYCHANGE
2017-08-01 10:20:15 +02:00
Nicolas Goaziou 27e5beaa64 org-clock: Do not inhibit logging with `org-clock-out-switch-to-state'
* lisp/org-clock.el (org-clock-out): Do not inhibit logging.

Logging is not inhibited when using `org-clock-in-switch-to-state'.

Reported-by: Рома Рудаков <phentagram@gmail.com>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00473.html
2017-07-28 14:50:36 +02:00
Nicolas Goaziou 90f606d9c2 org-macs: Fix `org-string-width' with `display' property
* lisp/org-macs.el (org-string-display): New function.
(org-string-width): Use new function.

* testing/lisp/test-org-macs.el: New file.
2017-07-28 12:15:47 +02:00
Nicolas Goaziou e79b0bd9f3 Merge branch 'maint' 2017-07-28 10:15:35 +02:00
Nicolas Goaziou 808089ee04 `org-forward/backward-paragraph' do not error at buffer boundaries
* lisp/org.el (org-forward-paragraph):
(org-backward-paragraph): Do not error at buffer boundaries.

Reported-by: Omar Antolín Camarena <omar.antolin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00478.html>
2017-07-28 10:07:53 +02:00
Nicolas Goaziou 648b12d57d Remove `org-dwidth' and `org-dwidth-n' properties
* lisp/org.el (org-raise-scripts):
(org-display-custom-time): Remove `org-dwidth' and `org-dwidth-n'
properties.
2017-07-27 15:32:06 +02:00
Nicolas Goaziou 9a60db0ec3 Move `org-string-width' to "org-macs.el"
* lisp/org.el (org-string-width): Move from here...
* lisp/org-macs.el (org-string-width): ... to here.
2017-07-27 15:23:31 +02:00
Nicolas Goaziou 27466a38bc Fix `org-string-width'
* lisp/org.el (org-string-width): Better handle various invisible
  characters.
2017-07-27 15:22:45 +02:00
Nicolas Goaziou 720b213a35 ox-texinfo: Default process includes "--no-split" option
* lisp/ox-texinfo.el (org-texinfo-info-process): Add "--no-split"
  option.

Reported-by: Jonas Bernoulli <jonas@bernoul.li>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00458.html>
2017-07-27 13:52:12 +02:00
Nicolas Goaziou abc4bb26ba ox-ascii: Fix docstring
* lisp/ox-ascii.el (org-ascii-table-use-ascii-art): Fix docstring.
2017-07-27 13:45:32 +02:00
Nicolas Goaziou f776e65373 Move `org-split-string' to "org-macs.el"
* lisp/org.el (org-split-string): Move the function...
* lisp/org-macs.el (org-split-string): ... here.  Also clarify
  docstring with regards to `split-string'.
2017-07-27 13:39:52 +02:00
Nicolas Goaziou ed6849d18d ox-texinfo: Insert blank line between sectioning command and contents
* lisp/ox-texinfo.el (org-texinfo-headline): Insert blank line between
  sectioning command and contents.
2017-07-25 20:44:35 +02:00
Nicolas Goaziou 8112629d37 ox-texinfo: Fix code typo
* lisp/ox-texinfo.el (org-texinfo--menu-entries): Only collect direct
  children.

The regression was introduced in
1b415735ea.
2017-07-25 19:24:47 +02:00
Nicolas Goaziou 0623c1c753 org-colview: Allow simultaneous columns views
* lisp/org-colview.el (org-columns-overlays):
(org-columns-begin-marker):
(org-columns-top-level-marker): Make variables buffer local.

(org-columns-remove-overlays): Assume columns view are to be removed
in current buffer.

(org-columns-edit-allowed): Small refactoring.  Raise an error when
called although no columns view is active in current buffer.

(org-columns-goto-top-level):
(org-columns):
(org-agenda-columns): Do not assume `org-columns-begin-marker' and
`org-columns-top-level-marker' are markers.

(org-columns-store-format):
(org-columns-redo): Skip if no columns view is current active.

(org-agenda-colview-compute): Do not let-bind
`org-columns-begin-marker' and `org-columns-top-level-marker'.
2017-07-25 09:54:06 +02:00
Nicolas Goaziou 6bfe8728e3 Merge branch 'maint' 2017-07-25 09:09:37 +02:00
Jeff Larson f203d378bd org-mobile: Specify message digest for OpenSSL commands
* lisp/org-mobile.el (org-mobile-encrypt-file):
(org-mobile-decrypt-file): Fix the message digest as MD5 for
compatibility across OpenSSL versions.

OpenSSL switched to using SHA256 by default for symmetric encryption
in version 1.1.  Unfortunately that means that newer versions of the
openssl command line tool can not decrypt encrypted org-mobile files
without the '-md md5' option.  This commit changes the shell commands
in org-mobile-encrypt-file and org-mobile-decrypt-file to explicitly
specify MD5 as the hash digest.

TINYCHANGE
2017-07-25 09:07:59 +02:00
Nicolas Goaziou fe48b23448 ob-scheme: Tiny refactoring
* lisp/ob-scheme.el (org-babel-scheme-repl-map):
(org-babel-scheme-cleanse-repl-map):
(org-babel-scheme-make-session-name): Tiny refactoring.
2017-07-24 13:57:12 +02:00
Nicolas Goaziou 9adab7ff90 ob-scheme: Fix :prologue handling
* lisp/ob-scheme.el (org-babel-expand-body:scheme): Handle :prologue
  handling without any :var parameter.
* testing/lisp/test-ob-scheme.el: New file.
2017-07-24 13:55:20 +02:00
José L. Doménech bb6e40b086 ob-scheme: Handle tables and :prologue params
* lisp/ob-scheme.el (org-babel-scheme-null-to): New variable.
(org-babel-scheme--table-or-string): New function.
(org-babel-execute-src-block): Changed to allow the return of a table
  for the output.
(org-babel-expand-body:scheme) Add :prologue param support.

TINYCHANGE
2017-07-24 12:01:03 +02:00
Nicolas Goaziou 6b9f9e9aff Merge branch 'maint' 2017-07-24 09:42:50 +02:00
Nicolas Goaziou d9713fe3ca org-clock: Fix :tend with a time zone
* lisp/org-clock.el (org-clocktable-steps): Do not force UTC
  for :tend.

Reported-by: Dale Sedivec <dale@codefu.org>
2017-07-24 09:40:58 +02:00
Nicolas Goaziou f6109d355e Merge branch 'maint' 2017-07-23 22:42:50 +02:00
Nicolas Goaziou 5e0db07988 ob-emacs-lisp: Fix pp results
* lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): Move "pp" handling...
(org-babel-execute:emacs-lisp): ... here.

* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/commented-last-block-line):
  Small refactoring.

Reported-by: Chunyang Xu <mail@xuchunyang.me>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00355.html>
2017-07-23 22:41:27 +02:00
Rasmus 3650c980d8 ox-html: Use correct "br" tag for subtitle
* lisp/ox-html.el (org-html-template): Use correct "br" tag depending
  on :html-doctype.

Reported-by: Olivier Berger <olivier.berger@telecom-sudparis.eu>
<http://permalink.gmane.org/gmane.emacs.orgmode/114546>
2017-07-22 14:07:39 +02:00
Marco Wahl 534678382f org: User interface message at tag edit slightly more legible 2017-07-19 00:16:23 +02:00
Kyle Meyer 5e4bb2627c Merge branch 'maint' 2017-07-18 13:32:38 -04:00
Kyle Meyer 52e0966fd4 Document STATE parameter for org-cycle-hide-* functions
* lisp/org.el (org-cycle-hide-archived-subtrees):
(org-cycle-hide-drawers): Mention STATE parameter in docstring.
2017-07-18 13:31:07 -04:00
Kyle Meyer 8ed27480aa org-cycle-hide-drawers: Remove an unnecessary state check
* lisp/org.el (org-cycle-hide-drawers): Don't check whether STATE is
`contents' within the `when' body because the `when' condition will
not pass in this case.
2017-07-18 13:24:32 -04:00
Kyle Meyer 4214211675 Merge branch 'maint' 2017-07-16 16:59:53 -04:00
Nathaniel Flath 404ac42ee5 org-agenda-filter-by-tag: Only accept existing tags
* org-agenda.el (org-agenda-filter-by-tag): Pass t for the
require-match argument of completing-read because the collection
includes all valid tags.

In addition to preventing a user from filtering on a value that
doesn't match any entries, this makes the default Emacs completion
more convenient because a tag can be selected by entering its unique
prefix.
2017-07-16 16:58:35 -04:00
Yuri D. Lensky 912a385518 org-agenda: Support for dimming local to each agenda.
Composite agenda views could not separately specify whether to dim
blocked tasks.

* lisp/org-agenda.el (org-agenda--mark-blocked-entry): New function.
(org-agenda-dim-blocked-tasks): Modified to work with text properties
set by org-agenda--marked-blocked-entry.
2017-07-14 14:16:40 +02:00
Nicolas Goaziou e59718e9c3 Merge branch 'maint' 2017-07-14 10:40:47 +02:00
Nicolas Goaziou 8d9854ca8a org-capture: Fix last commit
* lisp/org-capture.el (org-capture-fill-template): %K link
  specifically targets a headline.  Also provide a description.
2017-07-14 10:40:03 +02:00
Nicolas Goaziou 0fe685f119 org-duration: Fix copyright 2017-07-14 10:30:02 +02:00
Nicolas Goaziou 0c9feb660a Merge branch 'maint' 2017-07-13 14:26:12 +02:00
Nicolas Goaziou 3315bd1118 org-capture: Fix %k and %K in capture template
* lisp/org-capture.el (org-capture-fill-template): Fix link returned
  by %K.  Also, both %k and %K should be expanded as strings even when
  there is no clocking data.

Reported-by: Michal Politowski <mpol@meep.pl>
2017-07-13 14:08:20 +02:00
Alex Branham f88f913c35 org-agenda: change order of items, support custom time grid string
* lisp/org-agenda.el (org-agenda-time-grid): Users may now customize
the string to display after the time in the agenda.  The order of
items was updated to reflect the order that they are displayed in the
agenda.

TINYCHANGE
2017-07-11 10:02:45 +02:00
Nicolas Goaziou 163c84f2ee Merge branch 'maint' 2017-07-10 10:58:42 +02:00
Nicolas Goaziou 60eda8e4ec org-clock: Fix :tstart :tend parsing with time zones
* lisp/org-clock (org-clocktable-steps): Fix :tstart :tend parsing
  with time zones.

The regression was introduced in 112c5ba479.

Reported-by: Dale Sedivec <dale@codefu.org>
2017-07-10 10:56:56 +02:00
Nicolas Goaziou f8d0ef1b52 Merge branch 'maint' 2017-07-10 10:23:26 +02:00
Jay Kamat a8ee8e1e50 ox-md.el: Fix export of irc and mailto links
* lisp/ox-md.el (org-md-link): Add mailto and irc to links that pass
their types through to markdown export

See: https://github.com/larstvei/ox-gfm/issues/17  for an external
bug report

TINYCHANGE
2017-07-10 10:07:58 +02:00
Kyle Meyer d39ccc17d4 Merge branch 'maint' 2017-07-09 11:28:54 -04:00
Paul Eggert b7fdc30388 Backport commit 20e9a00fb from Emacs
* lisp/org-table.el (org-table-sort-lines): Fix misspelling in prompt.
* lisp/ox-ascii.el (org-ascii--describe-datum): Fix misspelling in
call to org-element-lineage.

Spelling fixes
20e9a00fb5d12ad408f9dd15adcfcd205783c1b0
Paul Eggert
Thu Jul 6 00:24:56 2017 -0700
2017-07-09 11:27:12 -04:00
Glenn Morris 4abe197403 Backport commit 0fda6d53e from Emacs
; Standardize some copyright and license notices
0fda6d53e38cc7073186fed0bd862221d21500ab
Glenn Morris
Wed Jul 5 14:08:35 2017 -0400
2017-07-09 11:27:12 -04:00
Glenn Morris ef742df8b5 Backport commit 26a308ea1 from Emacs
* lisp/ox-html.el (org-html-infojs-template): Update copyright.

26a308ea112637911fd3870139ba0e2d98e58aa0
Glenn Morris
Wed Jul 5 14:07:14 2017 -0400
2017-07-09 11:27:10 -04:00
Florian Lindner da99ee0fa6 org-attach: Make org-attach move directories, when attachment dir changes
* lisp/org-attach.el (org-attach-set-directory): Make org-attach move
  directories, when attachment dir changes.
(org-attach): Update docstring.
2017-07-09 17:16:24 +02:00
Kaushal Modi 73907bee5b Merge branch 'maint' 2017-07-07 17:35:41 -04:00
Kaushal Modi 21df3a3c2f Fix curved quotes in error message
* lisp/org.el (org-create-formula-image): Use back-quote + single
  quote to get the correct rendering of curved quotes.

Message displayed before this fix: "Please adjust ’imagemagick’ .."

Message displayed after this fix:  "Please adjust ‘imagemagick’ .."

The effect of this fix is visible on emacs 25.1 and newer (See Emacs
NEWS).
2017-07-07 17:18:22 -04:00
Nicolas Goaziou 97a1a49895 Fix failing tests in non-daylight saving time zones
* lisp/org.el (org-time-string-to-time): Remove optional POS and
  BUFFER arguments.  Accept new optional ZONE argument.
(org-time-string-to-seconds): Accept optional ZONE argument.
(org-check-before-date):
(org-check-after-date):
(org-check-dates-range):
(org-goto-calendar):
* lisp/ob-gnuplot.el (org-time-string-to-time):
* lisp/org-agenda.el (org-agenda-get-blocks):
* lisp/org-clock.el (org-clock-timestamps-change):
* lisp/org-list.el (org-time-string-to-seconds): Use UTC for time
  difference and time comparison.

* testing/lisp/test-org-clock.el (org-test-clock-create-clock): Use
  UTC for time differences.
2017-07-07 18:23:10 +02:00
Nicolas Goaziou fd6a6b5cb4 Merge branch 'maint' 2017-07-06 19:21:48 +02:00
Jan Seeger 1849f391bc org.el: Fix custom timestamps for date ranges
* org.el (org-activate-dates): Change `org-activate-dates' to activate
custom timestamps for both dates in date ranges. Formerly, only the
second date would be activated. The reason was a misplaced
`if'. Replaced it with `when'. Also added doc comments.

TINYCHANGE
2017-07-06 19:21:06 +02:00
Nicolas Goaziou c3bc1d2592 Merge branch 'maint' 2017-07-06 19:14:16 +02:00
Nicolas Goaziou 61ffe97885 ob-comint: Remove unnecessary (require 'tramp)
* lisp/ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  Remove unnecessary cache flush.
2017-07-06 19:10:28 +02:00
Marco Wahl 6a64c34863 Merge branch 'timer-stop-binding-for-agenda' 2017-07-05 12:36:18 +02:00
Marco Wahl 2b5ce91b35 org-timer: Fix timer setting from effort property
Testcase included.
2017-07-05 12:33:47 +02:00
Marco Wahl f70832333b org-agenda:added binding to stop timer 2017-07-05 11:05:36 +02:00
Rasmus acabacaa56 ox-html: Use correct "br" tag for subtitle
* lisp/ox-html.el (org-html-template): Use correct "br" tag depending
  on :html-doctype.

Reported-by: Olivier Berger <olivier.berger@telecom-sudparis.eu>
<http://permalink.gmane.org/gmane.emacs.orgmode/114546>
2017-07-04 18:50:39 +02:00
Nicolas Goaziou 8c548b81b9 Merge branch 'maint' 2017-07-04 01:13:03 +02:00
Nicolas Goaziou a3d02c49a0 Do not cancel note when `org-add-log-note' is called with a prefix argument
* lisp/org.el (org-add-log-note):
(org-store-log-note): Ignore prefix argument.

The behaviour is undocumented and can lead to data loss.

Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-07/msg00024.html>
2017-07-04 01:11:57 +02:00
Nicolas Goaziou a20c17fa51 Merge branch 'maint' 2017-07-04 00:20:12 +02:00
Nicolas Goaziou cc5a9bf538 Fix wrong data in clock table using :block
* lisp/org.el (org-2ft): Use new signature for
  `org-parse-time-string'.
2017-07-04 00:19:47 +02:00
Rasmus 2e02581cbf Merge branch 'maint' 2017-07-03 12:05:47 +02:00
Rasmus ad8e508e93 Fix bug in org-inside-LaTeX-fragment-p
* lisp/org.el (org-inside-LaTeX-fragment-p): Also work correctly in
  first paragraph.
2017-07-03 12:05:36 +02:00
Nicolas Goaziou dd757f14f0 Merge branch 'maint' 2017-07-02 09:20:35 +02:00
Nicolas Goaziou 796a78222a Move an obsolete declaration in "org-compat.el"
* lisp/org-compat.el (org-capture-import-remember-templates): Moved
  from "org-capture.el".
2017-07-02 09:19:09 +02:00
Nicolas Goaziou f4f921ce5a Merge branch 'maint' 2017-07-01 14:24:29 +02:00
Nicolas Goaziou 4f372457f2 Fix `org-check-before-invisible-edit', part 2
* lisp/org.el (org-check-before-invisible-edit): Fix error before
  first headline.  Handle nested overlays.
2017-07-01 14:23:41 +02:00
Nicolas Goaziou 64cbcb1bff Merge branch 'maint' 2017-07-01 10:34:01 +02:00
Nicolas Goaziou 969daf41ac org-table: Fix `org-table-move-row-down' without final newline
* lisp/org-table.el (org-table-move-row): Fix
  `org-table-move-row-down' without final newline.
2017-07-01 10:30:45 +02:00
Nicolas Goaziou 40e03973f3 org-table: Fix checks for impossible row moves
* lisp/org-table.el (org-table-move-row): Fix checks.
2017-07-01 10:18:17 +02:00
Nicolas Goaziou 4ea393e562 org-table: Fix infloop
* lisp/org-table.el (org-table-current-dline): Fix infloop when point
  is at the end of of buffer.
2017-07-01 09:57:20 +02:00
Nicolas Goaziou 602a1a21fc Merge branch 'maint' 2017-06-30 14:36:30 +02:00
Nicolas Goaziou 4f90f44af3 org-capture: Fix blank lines in `item' target type
* lisp/org-capture.el (org-capture-place-item): Fix blank lines in
  `item' target type.
2017-06-30 13:50:39 +02:00
Nicolas Goaziou 04403b446a org-capture: Fix regression in item templates
* lisp/org-capture.el (org-capture-place-item):

Fix regression introduced in d6f096546.

Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00591.html>

Reported-by: Florian Lindner <mailinglists@xgm.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00606.html>
2017-06-30 13:27:38 +02:00
Nicolas Goaziou 9ed5674dcb Merge branch 'maint' 2017-06-29 16:32:08 +02:00
Nicolas Goaziou f409c13be1 Fix `org-check-before-invisible-edit' before first headline
* lisp/org.el (org-check-before-invisible-edit): Fix "Before first
  heading" error.

Invisible characters can come from overlays and text properties.  The
current implementation tries to remove outline overlays, even though
it may be something else.

Reported-by: John Kitchin <jkitchin@andrew.cmu.edu>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00365.html>
2017-06-29 16:29:20 +02:00
Nicolas Goaziou 379a22c9c6 Revert "ox-texinfo: Move menu handling from sections to headlines"
This reverts commit 988e8802a6.
2017-06-28 22:51:26 +02:00
Mario Martelli 37bba84a5e org-protocol: Sources with date URL are supported
lisp/org-protocol.el (org-protocol-project-alist): Date-URL is added
as example.
(org-protocol-open-source): First match is processed in rewrite.

testing/lisp/test-org-protocol.el (test-org-protocol/org-protocol-open-source):
Configuration displaying a date-style URL is added.

TINYCHANGE
2017-06-28 17:44:27 +02:00
Nicolas Goaziou a9e53e6172 Merge branch 'maint' 2017-06-28 15:55:28 +02:00
Nicolas Goaziou 582fc12d0e org-agenda: Prevent icon from leaking on white space after TODO
* lisp/org-agenda.el (org-agenda-highlight-todo): Prevent icon from
  leaking on white space after TODO.

Reported-by: Keith David Bershatsky
2017-06-28 15:54:20 +02:00
Nicolas Goaziou 52a5375861 Merge branch 'maint' 2017-06-28 14:47:35 +02:00
Nicolas Goaziou 1385dea0b9 org-irc: Fix port handling
* lisp/org-irc.el (org-irc-visit-erc): Fix "stringp, nil".

Reported-by: "numbchild@gmail.com" <numbchild@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00541.html>
2017-06-28 14:44:21 +02:00
Nicolas Goaziou 82ff5277ff Merge branch 'maint' 2017-06-28 11:22:43 +02:00
Mario Martelli cbcd714b23 org-protocol: Fix for silently failing open-source subprotocol
* (org-protocol-open-source): Tests URL against base-url and not the
  filename.

TINYCHANGE
2017-06-28 11:19:46 +02:00
Mario Martelli 5748615c48 org-protocol: Fix for failing open-source subprotocol
* (org-protocol-open-source): Make sure url is sanitised before
   processing.

TINYCHANGE
2017-06-28 11:19:44 +02:00
Nicolas Goaziou 87a6e3970a Merge branch 'maint' 2017-06-26 23:40:35 +02:00
Nicolas Goaziou 6c498f1337 Forbid empty string as org-ellipsis value
* lisp/org.el (org-ellipsis): Harden :safe value.
(org-display-table): Fix typo.
(org-mode): Only change ellipsis if `org-ellipsis' is a non-empty
string.  Remove obsolete checks.

Reported-by: Michael Ax <michaelax@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/114283>
2017-06-26 23:38:23 +02:00
Nicolas Goaziou 9389563356 org-entities: Add \dollar and \USD
* lisp/org-entities.el (org-entities): Add \dollar and \USD.
2017-06-26 22:13:01 +02:00
Nicolas Goaziou df0c345eac Merge branch 'maint' 2017-06-26 22:08:46 +02:00
Nicolas Goaziou bc1d6aadfd org-element: Fix $...$ parser error
* lisp/org-element.el (org-element-latex-fragment-parser): Also check
  border character right after opening "$" sign.
* testing/lisp/test-org-element.el (test-org-element/latex-fragment-parser):
Add tests.

Reported-by: thomas <thomas@friendlyvillagers.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/114285>
2017-06-26 22:07:05 +02:00
Nicolas Goaziou 09e61233ed Merge branch 'maint' 2017-06-25 23:09:41 +02:00
Nicolas Goaziou 7b065b1d0a ox-odt: Include #+latex_header when converting LaTeX to PNG
* lisp/ox-odt.el (org-odt--translate-latex-fragments): Include
  #+latex_header when converting LaTeX to PNG.

Reported-by: edgar@openmail.cc
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00480.html>
2017-06-25 23:09:21 +02:00
Nicolas Goaziou 6fac813a52 Merge branch 'maint' 2017-06-25 09:40:54 +02:00
Nicolas Goaziou e903288e50 ox-latex: Fix LATEX_HEADER_EXTRA keyword
* lisp/ox-latex.el (org-latex-make-preamble): Do not include
  LATEX_HEADER_EXTRA keywords' contents when previewing a LaTeX
  fragment.

Reported-by: Mario Román <mromang08@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00477.html>
2017-06-25 09:39:32 +02:00
Nicolas Goaziou cc631078ad Merge branch 'maint' 2017-06-23 13:53:08 +02:00
Nicolas Goaziou 7ca34d2aef org-indent: Fix indentation of inline tasks
* lisp/org-indent.el (org-indent--compute-prefixes): Fix indentation
  of inline tasks when `org-inlinetask-show-first-star is non-nil.

Reported-by: Rasmus <rasmus@gmx.us>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00452.html>
2017-06-23 13:52:16 +02:00
Kyle Meyer 3741196060 Merge branch 'maint' 2017-06-22 21:33:24 -04:00
Kyle Meyer 1930a8f05a org-todo: Display state change message when headline is not visible
* lisp/org.el (org-todo): Display state change message when headline
is not visible, reversing unintentional modification from dd17e9d29.

Prior to dd17e9d29 (2014-05-31), a message was displayed when changing
the state of a headline that was *not* visible, helping the user know
what the new state was even though the headline was off the screen.
While extending this code, dd17e9d29 unintentionally reversed the
visibility check, resulting in the message only being shown when the
headline is visible.

Reported-by: Russell Adams <RLAdams@AdamsInfoServ.Com>
<https://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00442.html>
2017-06-22 21:29:43 -04:00
Nicolas Goaziou 1b415735ea ox-texinfo: Small menu refactoring
* lisp/ox-texinfo.el (org-texinfo--menu-entries): Use
  `org-export-collect-headlines'.
2017-06-22 19:01:28 +02:00
Nicolas Goaziou 988e8802a6 ox-texinfo: Move menu handling from sections to headlines
* lisp/ox-texinfo.el (org-texinfo-headline): Move menu handling from
  sections to headlines.
2017-06-22 19:01:23 +02:00
Nicolas Goaziou 20795aae27 ox-texinfo: Change Texinfo class definition
* lisp/ox-texinfo.el (org-texinfo-classes): Change default value and
  structure.
(org-texinfo--structuring-command): New function.
(org-texinfo-headline): Use new function.

The new structure handles properly appendices at sub-levels.
2017-06-22 18:46:44 +02:00
Nicolas Goaziou a0d1ad325d Merge branch 'maint' 2017-06-22 18:32:38 +02:00
Nicolas Goaziou 5d99560ddf Fix open-at-point in example blocks and diary-sexps
* lisp/org.el (org-open-at-point): Also open links in example blocks
  and diary-sexps.

* testing/lisp/test-org.el (test-org/open-at-point/keyword):
(test-org/open-at-point/property):
(test-org/open-at-point/comment): Add tests.

Reported-by: Dieter Faulbaum <Dieter.Faulbaum@helmholtz-berlin.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00277.html>
2017-06-22 18:30:58 +02:00
Nicolas Goaziou 92e8c85381 Merge branch 'maint' 2017-06-21 22:57:44 +02:00
Nicolas Goaziou 521734d51f Fix link fontification
* lisp/org.el (org-activate-links): Fix link fontification.

Reported-by: John Kitchin <jkitchin@andrew.cmu.edu>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00381.html>
2017-06-21 22:55:10 +02:00
Nicolas Goaziou e90b643b05 Merge branch 'maint' 2017-06-21 22:35:28 +02:00
Nicolas Goaziou 112c5ba479 org-clock: Remove daylight saving time offset in duration
* lisp/org-clock.el (org-clock-out):
(org-clock-sum):
(org-clocktable-steps):
(org-clock-update-time-maybe): Use UTC to compute time differences.

* testing/lisp/test-org-clock.el (test-org-clock/clocktable/scope):
  Update test.
2017-06-21 22:32:57 +02:00
Nicolas Goaziou dbed60d6bd Merge branch 'maint' 2017-06-20 21:21:35 +02:00
Nicolas Goaziou 7fe9ae6bd2 org-element: Fix babel call parser
* lisp/org-element.el (org-element-babel-call-parser): Handle complex
  arguments.
* testing/lisp/test-org-element.el (test-org-element/babel-call-parser):
Add test.

Reported-by: Eric S Fraga <e.fraga@ucl.ac.uk>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00366.html>
2017-06-20 21:20:30 +02:00
Nicolas Goaziou 15c9e91bf3 Merge branch 'maint' 2017-06-20 09:54:35 +02:00
Nicolas Goaziou 97fa95cbc3 org-indent: Fix "Fix line and wrap prefixes"
* lisp/org-indent.el (org-indent-set-line-properties): Fix
  wrap-prefix.

Reported-by: William Denton <wtd@pobox.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00360.html>
2017-06-20 09:53:26 +02:00
Nicolas Goaziou 03d43ee6c6 Merge branch 'maint' 2017-06-20 09:30:25 +02:00
Nicolas Goaziou 5d6325ffa3 ox-texinfo: Remove spurious "@insertcopying"
* lisp/ox-texinfo.el (org-texinfo-template): Remove "@insertcopying"
  command outside title page.

See (info "(texinfo) Copyright") for details.
2017-06-20 09:28:40 +02:00
Nicolas Goaziou 5e439d41f8 Merge branch 'maint' 2017-06-20 09:25:05 +02:00
Nicolas Goaziou fa6b7bf25c ox-texinfo: Fix location of text before first headline
* doc/org.texi (Info directory file): Fix node name.
(Headings and sectioning structure): Document location of text before
  first headline.
(A Texinfo example): Update example.

* lisp/ox-texinfo.el (org-texinfo-template): Handle contents of very
  first section.
(org-texinfo-section): Ignore very first section.

According to Texinfo specifications, Top node contents should not
appear in printed output.  Move it near "@top" command, within
"@ifnottex".
2017-06-20 09:24:34 +02:00
Mark Oteiza f7d2639701 org-agenda.el: New command to rebuild all agenda buffers
* lisp/org-agenda.el (org-agenda-redo-all): New command to
rebuild all agenda buffers.
(org-agenda-mode-map): Bind this new command to `g'.
2017-06-20 08:09:31 +02:00
Nicolas Goaziou 566794e98e Merge branch 'maint' 2017-06-19 12:35:51 +02:00
Nicolas Goaziou 002e2a072c org-indent: Fix line and wrap prefixes
* lisp/org-indent.el (org-indent--text-line-prefixes):
(org-indent--heading-line-prefixes):
(org-indent--inlinetask-line-prefixes): New variables.
(org-indent--compute-prefixes): New function.
(org-indent-mode): Use new function.
(org-indent-set-line-properties): Use new variables.  Also prevent
regular lines from being prefixed with stars.

Reported-by: Forrest Sedgwick <fgsedgwick@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00341.html>
2017-06-19 12:24:16 +02:00
Nicolas Goaziou 1a6bf9c5f9 Merge branch 'maint' 2017-06-18 11:03:43 +02:00
Nicolas Goaziou 8769cfc91c Revert "ox-texinfo: Escape @ { } in index"
* lisp/ox-texinfo.el (org-texinfo-keyword): Index keywords are
  specific to Texinfo back-end, so they expect regular Texinfo code.
* doc/org.texi (Indices): Update documentation.
2017-06-18 11:00:56 +02:00
Kaushal Modi d48cfdf68b Add hold 'action' to the "n" macro and ws-trim all "n" macro args
* lisp/org-macro.el (org-macro--counter-increment): Rename the
optional arg RESET to ACTION, as now that action can mean setting,
resetting or even holding the specified counter.  ACTION set to
"-" will hold the previous value of the counter.  White-space is
now trimmed from the NAME arg too.

* doc/org.texi (Macro replacement): Document the new hold action.

* testing/lisp/test-org-macro.el (test-org-macro/n): Add new tests for
the hold action.
2017-06-17 23:46:24 -04:00
Nicolas Goaziou 27c2ae47fc Merge branch 'maint' 2017-06-17 16:18:01 +02:00
Allen Li b9b921716b org-attach: Respect org-attach-commit everywhere
* lisp/org-attach.el (org-attach-delete-one): Respect org-attach-commit
(org-attach-delete-all): Respect org-attach-commit
(org-attach-sync): Respect org-attach-commit

TINYCHANGE
2017-06-17 16:16:27 +02:00
Nicolas Goaziou 4295d1b949 Merge branch 'maint' 2017-06-17 12:07:09 +02:00
Nicolas Goaziou 39351d0d14 ox-texinfo: Add missing entities
* lisp/ox-texinfo.el (org-texinfo-entity): Add "@textdegree{}" and
  "@registeredsymbol".
2017-06-17 12:04:36 +02:00
Nicolas Goaziou 080dc4b445 Merge branch 'maint' 2017-06-16 07:59:18 +02:00
Nicolas Goaziou 673fe87b05 Fix compilation warning
* lisp/org.el (org-parse-time-string): Fix compilation warning.
2017-06-16 07:58:18 +02:00
Kaushal Modi 62ce814130 Merge branch 'maint' 2017-06-15 09:03:35 -04:00
Kaushal Modi 3bcfed071d Fix breakage due to outline-invisible-p defn change in emacs 26+
* lisp/org.el (org-invisible-p): New function.  Restore the behavior
of outline-invisible-p prior to the following commint on emacs master
<http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=9cc59ffbbb2f20fbbf1c72d2e0c9dc47c7906a99>.

* lisp/org.el (org-cycle-internal-local)
(org-clean-visibility-after-subtree-move, org-goto)
(org-get-location, org-move-subtree-down, org-copy-subtree)
(org-paste-subtree, org-next-link, org-mark-ring-goto)
(org-todo, org-deadline, org-schedule, org-set-tags)
(org-truely-invisible-p, org-invisible-p2)
(org-forward-heading-same-level, org-forward-paragraph)
(org-backward-paragraph, org-down-element)
(org-bookmark-jump-unhide, org-mark-jump-unhide):
* lisp/org-list.el (org-insert-item):
* lisp/org-crypt.el (org-encrypt-entry, org-decrypt-entry):
* lisp/org-clock.el (org-clock-load):
* lisp/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling, org-toggle-archive-tag)
(org-archive-set-tag):
* contrib/lisp/org-drill.el (org-drill-hide-subheadings-if): Use
org-invisible-p instead of outline-invisible-p.

Reference:
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00230.html>
2017-06-15 08:10:47 -04:00
Nicolas Goaziou ad0312cde2 Merge branch 'maint' 2017-06-14 23:07:44 +02:00
Nicolas Goaziou 17382722db ox-texinfo: Fix last commit
* lisp/ox-texinfo.el (org-texinfo-keyword): Fix last commit.

Do not escape raw #+TEXINFO value.
2017-06-14 23:07:04 +02:00
Nicolas Goaziou e5396c189a Merge branch 'maint' 2017-06-14 21:27:37 +02:00
Nicolas Goaziou a621289953 ox-texinfo: Escape @ { } in index
* lisp/ox-texinfo.el (org-texinfo-keyword): Escape @ { } in index.
2017-06-14 21:27:02 +02:00
Nicolas Goaziou be30c8b126 ox-texinfo: Change default table markup
* lisp/ox-texinfo.el (org-texinfo-table-default-markup): Rename from
  `org-texinfo-def-table-markup'.  Set default value to the neutral
  "@asis".
(org-texinfo-plain-list): Use new name.
* lisp/org-compat.el (org-texinfo-def-table-markup): Mark as obsolete.
* doc/org.texi (Publishing options): Document change.
2017-06-14 19:11:33 +02:00
Nicolas Goaziou 1c7cf61bd7 Merge branch 'maint' 2017-06-14 11:03:40 +02:00
Nicolas Goaziou b47920ed20 org-colview: Fix failing test
* lisp/org.el (org-parse-time-string): Allow to specify zone as an
  optional argument.
* lisp/org-colview.el (org-columns--age-to-seconds): Apply change
  above.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Update tests.
2017-06-14 11:00:01 +02:00
Nicolas Goaziou dac9ae16ea org-macro: Silence byte-compiler 2017-06-14 10:01:26 +02:00
Nicolas Goaziou 2371548c2a org-duration: Limit rounding errors when computing a duration
* lisp/org-duration.el (org-duration-from-minutes): Limit rounding
  errors.
2017-06-14 09:59:14 +02:00
Nicolas Goaziou ce21e0a8db org-table: Add missing keywords to a defcustom
* lisp/org-table.el (org-table-duration-hour-zero-padding):
  Add :package-version and :safe. Fix :version and docstring.
2017-06-14 09:48:13 +02:00
Carsten Dominik feed16e1ed Merge branch 'master' of orgmode.org:org-mode 2017-06-14 05:46:17 +02:00
Carsten Dominik daff9c93f2 Implement new `U' mode switch for table formulas to omit seconds in durations
* lisp/org-table.el (org-table-duration-custom-format): Add new
	HH:MM format.
	(org-table-duration-hour-zero-padding): New option.
	(org-table-eval-formula): Select second-less format if
	requested.
	(org-table-time-seconds-to-string): Implement formats without
	seconds and without zero-padding for hours.

	* testing/lisp/test-org-table.el (test-org-table/duration):
	New test for second-less durations.

	* doc/org.texi (Formula syntax for Calc)
	(Durations and time values): Document the U mode switch.
2017-06-14 05:43:12 +02:00
Kaushal Modi 1e92f5ed39 Allow org-file-contents to fetch file contents from a URL
* lisp/org.el (org--file-cache): New variable.
(org-reset-file-cache):
(org-file-url-p): New function.
(org-mode-restart): Use new function.

* lisp/org.el (org-file-contents): Allow the FILE argument to be a
URL.  If the URL contents are already cached, return the cache
contents, else download the file and return contents of that.  The
file is automatically cached each time it is downloaded.  Add a new
optional argument NOCACHE.  If this is non-nil, the URL is always
downloaded afresh.  Use `org--file-cache' and `org-file-url-p'.

* lisp/org.el (org-edit-special): Do not allow editing the "file" if a
URL is specified for the "#+SETUPFILE".

* lisp/ox.el (org-export--list-bound-variables)
(org-export--prepare-file-contents):
* lisp/org-macro.el (org-macro--collect-macros) : Adapt to the
possibility that the input to `org-file-contents' can be a URL too.

* doc/org.texi (Export settings, In-buffer settings)
(The very busy C-c C-c key): Mention that #+SETUPFILE keyword can now
take a URL as a value, and that C-c C-c on the #+SETUPFILE line will
clear the org file cache.

* testing/lisp/test-org.el (test-org/org-file-contents-url)
(test-org/org-file-contents-file): Add tests for org-file-contents.

* testing/lisp/test-ox.el (test-org-export/get-inbuffer-options): Add
test for reading setupfile specified via a URL.
2017-06-13 11:41:58 -04:00
Nicolas Goaziou 49dc91c55e Merge branch 'maint' 2017-06-13 10:41:41 +02:00
Nicolas Goaziou 2040b61391 org-element: Remove outdated comments 2017-06-13 10:41:13 +02:00
Nicolas Goaziou 5e35bc1807 Merge branch 'maint' 2017-06-11 11:39:37 +02:00
Nicolas Goaziou 62dc27dc75 ox-texinfo: Fix spurious "nil" in "special block export
* lisp/ox-texinfo.el (org-texinfo-special-block): Remove spurious
  "nil" when no option is defined.
2017-06-11 11:38:45 +02:00
Nicolas Goaziou 8ebfbc1d2a Merge branch 'maint' 2017-06-10 00:14:30 +02:00
Nicolas Goaziou b8df40eccc ob-shell: Fix handling list variables
* lisp/ob-shell.el (org-babel--variable-assignments:bash): Do not
  error when value is a list.

* testing/lisp/test-ob-shell.el (ob-shell/simple-list): New test.

Reported-by: Keith Amidon <camalot@picnicpark.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/113920>
2017-06-10 00:06:24 +02:00
Nicolas Goaziou cf505d2ebb ox-texinfo: Export example blocks as @example
* lisp/ox-texinfo.el (org-texinfo-example-block): Export as @example.

Escape @, {, }, however, so as to get proper verbatim contents.
2017-06-09 22:03:08 +02:00
Nicolas Goaziou 28bb7777b4 Merge branch 'maint' 2017-06-09 21:23:17 +02:00
Nicolas Goaziou 4bdf11a967 org-macro: Silence byte-compiler 2017-06-09 21:22:53 +02:00
Nicolas Goaziou 657ed58eac org-macro: Fix incomplete docstring
* lisp/org-macro.el (org-macro--counter-increment): Fix incomplete
  docstring.  Small refactoring.
2017-06-09 10:22:51 +02:00
Nicolas Goaziou 54344574c6 Merge branch 'maint' 2017-06-09 09:45:08 +02:00
Nicolas Goaziou 9a8506b7af org-footnote: Fix footnote deletion
* lisp/org-footnote.el (org-footnote-delete-definitions): Preserve
  blank lines after the definition.
* testing/lisp/test-org-footnote.el (test-org-footnote/delete): Add
  test.
2017-06-09 09:43:49 +02:00
Nicolas Goaziou c24c07c810 Merge branch 'maint' 2017-06-08 23:28:03 +02:00
Nicolas Goaziou 9fdc77a3cd ox-texinfo: Improve entities handling
* lisp/ox-texinfo.el (org-texinfo-entity): Use Texinfo specific
  commands whenever possible.
2017-06-08 23:26:26 +02:00
Nicolas Goaziou feb34a1fbf Merge branch 'maint' 2017-06-08 21:17:09 +02:00