org-mode.git
5 hours agoox-latex: Support caption for latex-environment master
Rasmus [Thu, 16 Mar 2017 11:45:10 +0000 (12:45 +0100)]
ox-latex: Support caption for latex-environment

* lisp/ox-latex.el (org-latex--environment-type): New function
  determining type of a latex-environment.
  (org-latex-latex-environment): Add support for caption.
  (org-latex--caption/label-string): Use correct type for non-floating
  latex-environments.
* etc/ORG-NEWS: Add entry.

23 hours agoMerge branch 'maint'
Bastien [Thu, 23 Mar 2017 22:49:11 +0000 (23:49 +0100)]
Merge branch 'maint'

23 hours agoox-html.el (org-html-scripts): Fix copyright years maint
Bastien [Thu, 23 Mar 2017 22:46:13 +0000 (23:46 +0100)]
ox-html.el (org-html-scripts): Fix copyright years

* lisp/ox-html.el (org-html-scripts): Fix copyright years.

23 hours agoox-html: Allow displaying source code block using klipse
Matt Price [Thu, 23 Mar 2017 22:22:30 +0000 (23:22 +0100)]
ox-html: Allow displaying source code block using klipse

* lisp/ox-html.el (html, org-html-template)
(org-html-src-block): Allow to display source code block using
the klipse javascript plugin.

Thanks to Nicolas Goaziou for reviewing the patch.

30 hours agoMerge branch 'maint'
Nicolas Goaziou [Thu, 23 Mar 2017 15:46:52 +0000 (16:46 +0100)]
Merge branch 'maint'

30 hours agoox: Fix "Fix :filter-options"
Nicolas Goaziou [Thu, 23 Mar 2017 15:41:26 +0000 (16:41 +0100)]
ox: Fix "Fix :filter-options"

* lisp/ox.el (org-export-as): Remove uninterpreted data from back-end
  specific parsed keywords.

* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add test.

This fixes 6cd42b08f9347a8d6084ec23548b754f9e02b2a1.

30 hours agoox: Clarify a docstring
Nicolas Goaziou [Thu, 23 Mar 2017 15:38:59 +0000 (16:38 +0100)]
ox: Clarify a docstring

* lisp/ox.el (org-export-get-all-options): Specify return value for
  unknown back-ends.
(org-export--parse-option-keyword):
(org-export--get-subtree-options):
(org-export--get-inbuffer-options):
(org-export--get-global-options): Remove useless check.

35 hours agoorg: Liberate org-property-action
Marco Wahl [Wed, 22 Mar 2017 23:28:53 +0000 (00:28 +0100)]
org: Liberate org-property-action

* lisp/org.el (org-property-action): Remove unnecessary restriction
  for property action.

3 days agoMerge branch 'maint'
Marco Wahl [Tue, 21 Mar 2017 19:53:02 +0000 (20:53 +0100)]
Merge branch 'maint'

3 days agoorg-agenda: Fix agenda buffer name after reload sticky agenda
Marco Wahl [Tue, 21 Mar 2017 19:47:30 +0000 (20:47 +0100)]
org-agenda: Fix agenda buffer name after reload sticky agenda

* lisp/org-agenda.el (org-agenda-list): Don't rename the buffer when
  redoing sticky.

This fix has been proposed by Ian Dunn.

<http://permalink.gmane.org/gmane.emacs.orgmode/112833>

TINYCHANGE

3 days agotest-org-agenda: Test agenda buffername when reload sticky agenda
Marco Wahl [Tue, 21 Mar 2017 19:42:08 +0000 (20:42 +0100)]
test-org-agenda: Test agenda buffername when reload sticky agenda

* testing/lisp/test-org-agenda.el: One additional test to Check that
  buffer name remains the same after reload.  (BTW some cleanup.)

4 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 19 Mar 2017 22:56:56 +0000 (23:56 +0100)]
Merge branch 'maint'

4 days agoorg-src: Fix fontification error
Aaron Jensen [Sun, 19 Mar 2017 22:55:51 +0000 (23:55 +0100)]
org-src: Fix fontification error

* lisp/org-src.el (org-src-font-lock-fontify-block): Fix fontification
error introduced in commit f2a5104e45b6f44a08960ae49ba20c124a8fa9d8.

TINYCHANGE

5 days agoMerge branch 'maint'
Kyle Meyer [Sun, 19 Mar 2017 17:32:19 +0000 (13:32 -0400)]
Merge branch 'maint'

5 days agoBackport commit 265a5d979 from Emacs
Michael Albinus [Thu, 16 Mar 2017 15:23:07 +0000 (16:23 +0100)]
Backport commit 265a5d979 from Emacs

* doc/org.texi (dir): Change example to use a method.

Document remote file name syntax change
265a5d9791bf42da0bab7bdbef4352e8d734ef31
Michael Albinus
Thu Mar 16 16:23:07 2017 +0100

5 days agoorg-clock: Add test
Nicolas Goaziou [Sun, 19 Mar 2017 09:59:52 +0000 (10:59 +0100)]
org-clock: Add test

* testing/lisp/test-org-clock.el (test-org-clock/clocktable/formula):
  Add test.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 19 Mar 2017 09:57:11 +0000 (10:57 +0100)]
Merge branch 'maint'

5 days agoorg-clock: Fix percent formula column in clock table
Yasushi SHOJI [Sun, 19 Mar 2017 09:55:44 +0000 (10:55 +0100)]
org-clock: Fix percent formula column in clock table

* lisp/org-clock.el (org-clocktable-write-default): Fix percent
  formula column in clock table.

6 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 18 Mar 2017 09:29:33 +0000 (10:29 +0100)]
Merge branch 'maint'

6 days agoob-exp: Fix export of src blocks with pathological name
Nicolas Goaziou [Sat, 18 Mar 2017 09:28:15 +0000 (10:28 +0100)]
ob-exp: Fix export of src blocks with pathological name

* lisp/ob-exp.el (org-babel-exp-process-buffer): Discard false
  positives.
* testing/lisp/test-ob-exp.el (ob-exp/src-block-with-affiliated-keyword):
  New test.

Reported-by: Skip Collins <skip.collins@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112797>

7 days agoMerge branch 'maint'
Marco Wahl [Fri, 17 Mar 2017 18:54:48 +0000 (19:54 +0100)]
Merge branch 'maint'

7 days agoorg-agenda: Fix agenda standard name when going unsticky
Marco Wahl [Fri, 17 Mar 2017 18:44:56 +0000 (19:44 +0100)]
org-agenda: Fix agenda standard name when going unsticky

* lisp/org-agenda.el (org-agenda-list): Reset `org-agenda-buffer-name'
  to the original name.
* testing/lisp/test-org-agenda.el: Pertaining unit test.  + 2 basic
  agenda tests.
* testing/examples/agenda-file.org: File to produce content for an
  agenda to test.

7 days agoox-publish: Raise an error on undefined components (take 2)
Nicolas Goaziou [Fri, 17 Mar 2017 08:32:21 +0000 (09:32 +0100)]
ox-publish: Raise an error on undefined components (take 2)

* lisp/ox-publish.el (org-publish-expand-projects): Raise an error on
  undefined components.

7 days agoRevert "ox-publish: Raise an error when encountering undefined component"
Nicolas Goaziou [Fri, 17 Mar 2017 08:30:38 +0000 (09:30 +0100)]
Revert "ox-publish: Raise an error when encountering undefined component"

This reverts commit 6e1d174d0a5564f3c18570025a439cbd201290cb.

7 days agoorg-duration: Clarify a docstring
Nicolas Goaziou [Fri, 17 Mar 2017 07:59:09 +0000 (08:59 +0100)]
org-duration: Clarify a docstring

* lisp/org-duration.el (org-duration-format): Clarify `h:mm:ss' and
  `h:mm' values.

Reported-by: Malcolm Purvis <malcolm@purvis.id.au>
<http://permalink.gmane.org/gmane.emacs.orgmode/112280>

7 days agoox-publish: Raise an error when encountering undefined component
Nicolas Goaziou [Fri, 17 Mar 2017 07:53:46 +0000 (08:53 +0100)]
ox-publish: Raise an error when encountering undefined component

* lisp/ox-publish.el (org-publish-expand-projects): Raise an error
  when encountering undefined component.  Refactor code.  Fix
  docstring.

Reported-by: Bob Newell <bobnewell@bobnewell.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/112712>

7 days agoorg-agenda: Fix scheduled repeats
Nicolas Goaziou [Fri, 17 Mar 2017 07:39:43 +0000 (08:39 +0100)]
org-agenda: Fix scheduled repeats

* lisp/org-agenda.el (org-agenda-get-scheduled): Fix scheduled
  repeats.

This is a follow-up to b5c19643d2347e4e1f4d76634b458380a46e39c4.

7 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 17 Mar 2017 07:38:16 +0000 (08:38 +0100)]
Merge branch 'maint'

7 days agoorg-agenda: Fix off-by-one scheduled repeat
Nicolas Goaziou [Fri, 17 Mar 2017 07:35:47 +0000 (08:35 +0100)]
org-agenda: Fix off-by-one scheduled repeat

* lisp/org-agenda.el (org-agenda-get-scheduled): Make the second
  repeat appear as "Sched. 1x".

Reported-by: Eric S Fraga <e.fraga@ucl.ac.uk>
<http://permalink.gmane.org/gmane.emacs.orgmode/112755>

7 days agoORG-NEWS: Update changes
Nicolas Goaziou [Fri, 17 Mar 2017 07:28:50 +0000 (08:28 +0100)]
ORG-NEWS: Update changes

7 days agoorg-capture: Tiny refactoring
Nicolas Goaziou [Fri, 17 Mar 2017 07:26:29 +0000 (08:26 +0100)]
org-capture: Tiny refactoring

* lisp/org-capture.el (org-capture-set-target-location): Use
  `point-marker'.  Also remove trailing space.

8 days agoMerge branch 'maint'
Bastien [Thu, 16 Mar 2017 21:15:24 +0000 (22:15 +0100)]
Merge branch 'maint'

8 days agolisp/org-table.el: Bugfix: correctly handle increment of -/+ numbers
Bastien [Thu, 16 Mar 2017 21:15:11 +0000 (22:15 +0100)]
lisp/org-table.el: Bugfix: correctly handle increment of -/+ numbers

* lisp/org-table.el (org-table-copy-down): Bugfix: correctly
handle increment of numbers with a -/+ sign.

8 days agoMerge branch 'maint'
Nicolas Goaziou [Thu, 16 Mar 2017 12:08:12 +0000 (13:08 +0100)]
Merge branch 'maint'

8 days agoFix custom timestamps during export (ox-groff)
Robert Klein [Mon, 13 Mar 2017 06:29:27 +0000 (07:29 +0100)]
Fix custom timestamps during export (ox-groff)

* contrib/lisp/ox-groff.el (org-groff-clock, org-groff-planning): Use
  org-translate-time'.

(propagate changes introduced to other export backends in commit
e1adb17ba509a43e9a03a5b367a98b8bc8de8b02.)

8 days agoFix display bug when inserting a heading
Nicolas Goaziou [Thu, 16 Mar 2017 12:01:39 +0000 (13:01 +0100)]
Fix display bug when inserting a heading

* lisp/org.el (org-N-empty-lines-before-current): Do not hide newline
  character before current headline.

* testing/lisp/test-org.el (test-org/insert-heading): Add test.

Reported-by: Rick Frankel <rick@rickster.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112751>

8 days agoMerge branch 'maint'
Nicolas Goaziou [Thu, 16 Mar 2017 12:01:24 +0000 (13:01 +0100)]
Merge branch 'maint'

8 days agoorg.texi: Fix link
Nicolas Goaziou [Thu, 16 Mar 2017 12:00:39 +0000 (13:00 +0100)]
org.texi: Fix link

* doc/org.texi (Hooks): Fix link.

8 days agoConsolidate capture targets and allow outline path in datetree targets
Carsten Dominik [Wed, 1 Feb 2017 05:44:00 +0000 (06:44 +0100)]
Consolidate capture targets and allow outline path in datetree targets

* doc/org.texi: Document the new capture templates target.
* lisp/org-capture.el (org-capture-upgrade-templates): New function.
(org-capture-templates): Implement the new file+olp+datetree target.
(org-capture): Document the C-1 prefix.
(org-capture-sanitize-olp): New function.
(org-capture-select-template): Make sure upgraded version of templates
variable is used.
* lisp/org-datetree.el (org-datetree-find-date-create): Accept
`subtree-at-point' as a value for the KEEP-RESTRICTION argument.
(org-datetree-find-iso-week-create): Accept `subtree-at-point'
as a value for the KEEP-RESTRICTION argument.
* lisp/org.el (org-find-olp): Throw an error when called in a
buffer that is not in Org mode.
* lisp/org-capture.el (org-capture-fill-template): Use overriding time
also in `?<>' escapes.

9 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 15 Mar 2017 13:32:24 +0000 (14:32 +0100)]
Merge branch 'maint'

9 days agoox-org: Fix footnotes export, part 2
Nicolas Goaziou [Wed, 15 Mar 2017 13:30:52 +0000 (14:30 +0100)]
ox-org: Fix footnotes export, part 2

* lisp/ox-org.el (org-org--add-missing-sections): New function.
(org-org-section): Small refactoring.

Since footnote definitions are inserted in the section of the
headline, make sure those are not being skipped.

9 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 15 Mar 2017 11:31:42 +0000 (12:31 +0100)]
Merge branch 'maint'

9 days agoox-org: Correctly export footnote references in headlines
Nicolas Goaziou [Wed, 15 Mar 2017 10:51:16 +0000 (11:51 +0100)]
ox-org: Correctly export footnote references in headlines

* lisp/ox-org.el (org-org-section): Also include references found in
  headlines when inserting footnote definitions at the end of
  a section.

Reported-by: WY H <jcjuly@outlook.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112678>

10 days agoBabel support for hledger accounting tool
Simon Michael [Fri, 24 Feb 2017 01:55:02 +0000 (01:55 +0000)]
Babel support for hledger accounting tool

* lisp/ob-hledger.el: New file.
* lisp/org.el (org-babel-load-languages):
* lisp/ox-html.el (org-html-style-default): Allow calling hledger from
  Babel.

10 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 14 Mar 2017 17:14:32 +0000 (18:14 +0100)]
Merge branch 'maint'

10 days agoox: Fix :filter-options
Nicolas Goaziou [Tue, 14 Mar 2017 17:10:07 +0000 (18:10 +0100)]
ox: Fix :filter-options

* lisp/ox.el (org-export--remove-uninterpreted-data): Do not modify
  communication channel.  Change "blob" to "datum".
(org-export--remove-uninterpreted-data-1): Remove function.
(org-export-as): Remove uninterpreted data from parsed keyword before
applying filters.

* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add test.

Reported-by: Rasmus <rasmus@gmx.us>
<http://permalink.gmane.org/gmane.emacs.orgmode/112730>

10 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 14 Mar 2017 08:07:55 +0000 (09:07 +0100)]
Merge branch 'maint'

10 days agoorg-capture: Fix escaping characters in template embedded S-exps
Nicolas Goaziou [Mon, 13 Mar 2017 21:45:54 +0000 (22:45 +0100)]
org-capture: Fix escaping characters in template embedded S-exps

* lisp/org-capture.el (org-capture-fill-template): Escape backslash
  characters in %i contents when those are inserted within a S-exp.
  Also prevent adding any prefix to %i contents spanning over multiple
  lines when they are inserted within a S-exp.

* testing/lisp/test-org-capture.el (test-org-capture/fill-template):
  Add tests.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112232>

12 days agoMake anniversaries' time span information more descriptive in agenda.
Michael Welle [Tue, 7 Mar 2017 09:19:32 +0000 (10:19 +0100)]
Make anniversaries' time span information more descriptive in agenda.

* lisp/org-bbdb.el (org-bbdb-anniversary-description): New function.
(org-bbdb-general-anniversary-description-after): New variable.
(org-bbdb-anniversaries-future): Incorporate calculation of the description.

12 days agoorg-lint: Report invalid durations in effort properties
Nicolas Goaziou [Sun, 12 Mar 2017 08:08:28 +0000 (09:08 +0100)]
org-lint: Report invalid durations in effort properties

* lisp/org-lint.el (org-lint-invalid-effort-property): New checker.
* testing/lisp/test-org-lint.el (test-org-lint/invalid-effort-property):
New test.

13 days agoORG-NEWS: Update latest change to `org-attach'
Nicolas Goaziou [Sat, 11 Mar 2017 14:31:00 +0000 (15:31 +0100)]
ORG-NEWS: Update latest change to `org-attach'

13 days agoox-md: Implement native table of contents
Nicolas Goaziou [Sat, 11 Mar 2017 14:21:27 +0000 (15:21 +0100)]
ox-md: Implement native table of contents

* lisp/ox-md.el (org-md--headline-referred-p): Try hard to limit
  anchors for headlines really referred to, either globally, or
  locally, in a table of contents.
(org-md-keyword): Add support for "TOC" keyword.
(org-md--build-toc): New function.
(org-md-inner-template): Use new function.

13 days agoorg-attach.el: Add functionality to attach from URL
Wojciech Gac [Sat, 11 Mar 2017 00:54:05 +0000 (01:54 +0100)]
org-attach.el: Add functionality to attach from URL

* lisp/org-attach.el (org-attach): Create a binding under 'u' to
  attach a file from URL
  (org-attach-url): Prompt user for URL
  (org-attach-attach): Update method list

* doc/org.texi (Attachments): Document attaching from URL

TINYCHANGE

13 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 11 Mar 2017 10:21:50 +0000 (11:21 +0100)]
Merge branch 'maint'

13 days agoRevert "ox-ascii: Remove useless brackets in sub/super script"
Nicolas Goaziou [Sat, 11 Mar 2017 10:21:26 +0000 (11:21 +0100)]
Revert "ox-ascii: Remove useless brackets in sub/super script"

This reverts commit 5b4215eb166554a2a358be457318c4dab5a5b55d.

13 days agoorg-agenda: Fix infloop in `org-find-top-headline'
Nicolas Goaziou [Sat, 11 Mar 2017 10:17:52 +0000 (11:17 +0100)]
org-agenda: Fix infloop in `org-find-top-headline'

* lisp/org-agenda.el (org-find-top-headline): Prevent infloop when top
  headline has not level 1.

Reported-by: Adrian Bradd <adrian.bradd@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112623>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 10 Mar 2017 17:52:43 +0000 (18:52 +0100)]
Merge branch 'maint'

2 weeks agoox-md: Fix internal links
Nicolas Goaziou [Fri, 10 Mar 2017 17:52:06 +0000 (18:52 +0100)]
ox-md: Fix internal links

* lisp/ox-md.el (org-md-headline): Add an anchor when a link is
  referring to the headline.
(org-md--headline-referred-p): New function.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 8 Mar 2017 11:29:45 +0000 (12:29 +0100)]
Merge branch 'maint'

2 weeks agoox-ascii: Remove useless brackets in sub/super script
Nicolas Goaziou [Wed, 8 Mar 2017 11:28:28 +0000 (12:28 +0100)]
ox-ascii: Remove useless brackets in sub/super script

* lisp/ox-ascii.el (org-ascii-subscript):
(org-ascii-superscript): Only use brackets when there are multiple
words.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 8 Mar 2017 10:48:56 +0000 (11:48 +0100)]
Merge branch 'maint'

2 weeks agoFix LaTeX and Beamer publishing processes
Nicolas Goaziou [Wed, 8 Mar 2017 08:33:09 +0000 (09:33 +0100)]
Fix LaTeX and Beamer publishing processes

* lisp/ox-beamer.el (org-beamer-publish-to-pdf):
* lisp/ox-latex.el (org-latex-publish-to-pdf): Set default directory
  prior to compiling the generated tex file.

Reported-by: Robert Klein <roklein@roklein.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/112388>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 7 Mar 2017 23:15:26 +0000 (00:15 +0100)]
Merge branch 'maint'

2 weeks agoox-html: Fix verse blocks
Nicolas Goaziou [Tue, 7 Mar 2017 23:12:55 +0000 (00:12 +0100)]
ox-html: Fix verse blocks

* lisp/ox-html.el (org-html-verse-block): Add missing line break at
  the end of each line in verse environments.

Reported-by: Skip Collins <skip.collins@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112537>

2 weeks agoMerge branch 'maint'
Marco Wahl [Tue, 7 Mar 2017 16:54:54 +0000 (17:54 +0100)]
Merge branch 'maint'

2 weeks agotest-org-list.el: Fix visibility tests
Marco Wahl [Tue, 7 Mar 2017 15:37:25 +0000 (16:37 +0100)]
test-org-list.el: Fix visibility tests

* testing/lisp/test-org-list.el (test-org-list/move-item-down):
  Replace several calls of `org-invisible-p2' with calls on a lower
  level.

2 weeks agotesting/README: Added hint to 'test-dirty'
Marco Wahl [Tue, 7 Mar 2017 10:23:57 +0000 (11:23 +0100)]
testing/README: Added hint to 'test-dirty'

2 weeks agoFix incorrect argument call in ob-clojure.el
Tim Cross [Tue, 7 Mar 2017 08:00:27 +0000 (09:00 +0100)]
Fix incorrect argument call in ob-clojure.el

* lisp/ob-clojure.el (org-babel-execute:clojure): Use
  `cider-current-ns' instead of `cider-current-session'.

org-babel-execute-clojure was calling nrepl-sync-request:eval and
nrepl-request:eval with the session ID as the 3rd argument when the
functions expected a clojure namespace.

TINYCHANGE

2 weeks agoorg-agenda: Implement `org-deadline-past-days'
Nicolas Goaziou [Tue, 7 Mar 2017 00:06:33 +0000 (01:06 +0100)]
org-agenda: Implement `org-deadline-past-days'

* lisp/org-agenda.el (org-deadline-past-days): New variable.
(org-scheduled-past-days): Set :safe keyword.
(org-agenda-get-deadlines): Use new variable.

2 weeks agoorg-clock: Fix failing test
Nicolas Goaziou [Mon, 6 Mar 2017 18:31:54 +0000 (19:31 +0100)]
org-clock: Fix failing test

* testing/lisp/test-org-clock.el (test-org-clock/clocktable/scope):
  Fix failing test.

2 weeks agoorg-clock.el: Add nullary function evaluation as a clocktable scope parameter
Eduardo Bellani [Mon, 6 Mar 2017 16:57:31 +0000 (17:57 +0100)]
org-clock.el: Add nullary function evaluation as a clocktable scope parameter

* lisp/org-clock.el (org-dblock-write:clocktable): Funcall the scope
  argument if it is a function.

* doc/org.texi: Document the feature of using a nullary function as the
  scope for the clocktable.

* testing/lisp/test-org-clock.el: Adds a test for the above
  feature.  Also, fix the number of hours of a test that seemed to be
  broken.

TINYCHANGE

2 weeks agoorg-element: Fix code comment
Nicolas Goaziou [Mon, 6 Mar 2017 16:38:05 +0000 (17:38 +0100)]
org-element: Fix code comment

* lisp/org-element.el (org-element-object-restrictions): Fix code
  comment.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 5 Mar 2017 17:39:22 +0000 (18:39 +0100)]
Merge branch 'maint'

2 weeks agoox-confluence: Handle checkboxes and inactive timestamps correctly
Marc Ihm [Sun, 5 Mar 2017 17:36:30 +0000 (18:36 +0100)]
ox-confluence: Handle checkboxes and inactive timestamps correctly

* contrib/lisp/ox-confluence.el (org-confluence-timestamp): New
  function.
(org-confluence-headline): Use new function.
(org-confluence-table-cell): Add missing space.

Fix handling of square brackets from timestamps and checkboxes; avoid
invalid confluence markup for empty table headers.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 5 Mar 2017 17:05:33 +0000 (18:05 +0100)]
Merge branch 'maint'

2 weeks agoFix failing tests
Nicolas Goaziou [Sun, 5 Mar 2017 17:05:02 +0000 (18:05 +0100)]
Fix failing tests

* testing/lisp/test-ob.el (test-ob/org-babel-insert-result): Fix
  failing tests.

Reported-by: "Charles C. Berry" <ccberry@ucsd.edu>
<http://permalink.gmane.org/gmane.emacs.orgmode/112475>

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 2 Mar 2017 21:01:13 +0000 (22:01 +0100)]
Merge branch 'maint'

3 weeks agoorg.texi: Document alternatives to M-TAB
Th. Rikl [Tue, 28 Feb 2017 15:11:43 +0000 (16:11 +0100)]
org.texi: Document alternatives to M-TAB

* doc/org.texi (Drawers):
(Editing and debugging formulas):
(Export settings):
(Completion): Document alternatives to M-TAB

(Built-in table editor): Change <TAB> into TAB.

TINYCHANGE

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 1 Mar 2017 21:19:29 +0000 (22:19 +0100)]
Merge branch 'maint'

3 weeks agoob-core: Properly escape Org syntax when inserting results
Nicolas Goaziou [Wed, 1 Mar 2017 21:19:04 +0000 (22:19 +0100)]
ob-core: Properly escape Org syntax when inserting results

* lisp/ob-core.el (org-babel-examplify-region): Escape Org syntax
  before wrapping it.

* testing/lisp/test-ob.el (test-ob/org-babel-insert-result): Add test.
  Renamed from `test-ob/org-babel-insert-result--improper-lists'.

Reported-by: D M German <dmg@turingmachine.org>
3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 28 Feb 2017 12:38:57 +0000 (13:38 +0100)]
Merge branch 'maint'

3 weeks agoorg-protocol: Fix library name
Nicolas Goaziou [Tue, 28 Feb 2017 12:37:48 +0000 (13:37 +0100)]
org-protocol: Fix library name

* lisp/org-protocol.el (org-protocol-create-for-org): Use `ox-publish'
  instead of outdated `org-publish'.  Improve warning message.

Reported-by: Jonas Bernoulli <jonasbernoulli@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112386>

3 weeks agoMerge branch 'maint'
Kyle Meyer [Mon, 27 Feb 2017 16:13:47 +0000 (11:13 -0500)]
Merge branch 'maint'

3 weeks agoorg-agenda-menu: Correct key for fortnight view
Kyle Meyer [Mon, 27 Feb 2017 16:10:02 +0000 (11:10 -0500)]
org-agenda-menu: Correct key for fortnight view

* lisp/org-agenda.el (org-agenda-menu): Correct key for fortnight
  view.

Reported-by: J. David Boyd <dboyd2@mmm.com>
4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 23 Feb 2017 19:49:43 +0000 (20:49 +0100)]
Merge branch 'maint'

4 weeks agoorg.texi: Fix example
Nicolas Goaziou [Thu, 23 Feb 2017 18:15:22 +0000 (19:15 +0100)]
org.texi: Fix example

* doc/org.texi (noweb-ref): Update Babel parameter syntax in example.

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 23 Feb 2017 13:19:06 +0000 (14:19 +0100)]
Merge branch 'maint'

4 weeks agoorg.el: Make faces org-quote and org-verse be appended
Anders Johansson [Thu, 23 Feb 2017 13:14:50 +0000 (14:14 +0100)]
org.el: Make faces org-quote and org-verse be appended

* lisp/org.el (org-fontify-quote-and-verse-blocks): Append faces.  Use
  `add-face-text-property'.

This means fontification of emphasis, links etc. is kept in quote and
verse blocks even with org-fontify-quote-and-verse-blocks non-nil.

TINYCHANGE

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 23 Feb 2017 11:59:45 +0000 (12:59 +0100)]
Merge branch 'maint'

4 weeks agoorg-capture: Tiny refactoring
Nicolas Goaziou [Thu, 23 Feb 2017 11:59:24 +0000 (12:59 +0100)]
org-capture: Tiny refactoring

* lisp/org-capture.el (org-capture-refile): Tiny refactoring.

4 weeks agoorg-duration: `org-duration-to-minutes' accepts plain numbers
Nicolas Goaziou [Thu, 23 Feb 2017 11:46:37 +0000 (12:46 +0100)]
org-duration: `org-duration-to-minutes' accepts plain numbers

* lisp/org-duration.el (org-duration-to-minutes): Accept plain numbers
  for backward compatibility with `org-hh:mm-string-to-minutes'.

* testing/lisp/test-org-duration.el (test-org-duration/to-minutes):
  Add test.

Reported-by: Dale <dale@codefu.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/112290>

4 weeks agoorg-duration: Fix bug with decimal units
Nicolas Goaziou [Wed, 22 Feb 2017 18:34:44 +0000 (19:34 +0100)]
org-duration: Fix bug with decimal units

* lisp/org-duration.el (org-duration-to-minutes): Fix bug where the
  same unit with a decimal unit would be matched multiple times.
* testing/lisp/test-org-duration.el (test-org-duration/to-minutes):
  Fix test.

4 weeks agoorg-duration: Improve docstring
Nicolas Goaziou [Wed, 22 Feb 2017 10:51:44 +0000 (11:51 +0100)]
org-duration: Improve docstring

* lisp/org-duration.el (org-duration-format): Clarify docstring.

4 weeks agoorg-agenda: Display all past repeated events for plain timestamps
Nicolas Goaziou [Tue, 21 Feb 2017 18:20:17 +0000 (19:20 +0100)]
org-agenda: Display all past repeated events for plain timestamps

* lisp/org-agenda.el (org-agenda-prefer-last-repeat): Document special
  behaviour for bare timestamps.
(org-agenda-get-timestamps): Show every past repeated event when
`org-agenda-prefer-last-repeat' is non-nil.

Reported-by: Jarmo Hurri <jarmo.hurri@iki.fi>
<http://permalink.gmane.org/gmane.emacs.orgmode/111731>

4 weeks agoorg-compat: Fix migration to `org-duration-format'
Nicolas Goaziou [Tue, 21 Feb 2017 17:44:55 +0000 (18:44 +0100)]
org-compat: Fix migration to `org-duration-format'

* lisp/org-compat.el (org-time-clocksum-format):
(org-time-clocksum-use-fractional):
(org-time-clocksum-fractional-format):
(org-time-clocksum-use-effort-durations): Do not make an alias to
a variable with an incompatible value.

Reported-by: Achim Gratz <Stromeko@nexgo.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/112266>

4 weeks agoMerge branch 'maint'
Bastien [Tue, 21 Feb 2017 14:42:12 +0000 (15:42 +0100)]
Merge branch 'maint'

4 weeks agoorg-capture: Fix commit 7d7c38
Bastien [Tue, 21 Feb 2017 14:41:15 +0000 (15:41 +0100)]
org-capture: Fix commit 7d7c38

4 weeks agonew version 5.2.3 with more performance and customizations
U-IHM-NOTEBOOK\Olli [Mon, 20 Feb 2017 19:38:29 +0000 (20:38 +0100)]
new version 5.2.3 with more performance and customizations

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 19 Feb 2017 14:37:41 +0000 (15:37 +0100)]
Merge branch 'maint'

4 weeks agoorg-capture: Fix `org-capture-refile'
Nicolas Goaziou [Sun, 19 Feb 2017 14:27:09 +0000 (15:27 +0100)]
org-capture: Fix `org-capture-refile'

* lisp/org-capture.el (org-capture-refile): Preserve location of point
  when refiling.

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

Reported-by: Liu Hui <liuhui1610@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/112202>