org-mode.git
2 hours ago* etc/ORG-NEWS: Header arguments support for PlantUML source blocks master
thibault [Sat, 10 Dec 2016 14:27:48 +0000 (08:27 -0600)]
* etc/ORG-NEWS: Header arguments support for PlantUML source blocks

7 hours agoob-plantuml: Add support for prologue and header variables
thibault [Sat, 10 Dec 2016 04:43:32 +0000 (22:43 -0600)]
ob-plantuml: Add support for prologue and header variables

* lisp/ob-plantuml.el (org-babel-execute:plantuml) Include prologue and
  header variables to temporary file body.
(org-babel-plantuml-make-body): New function.
(org-babel-variable-assignments:plantuml): New function.

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

9 hours agoob-tangle: Remove useless declarations
Nicolas Goaziou [Sat, 10 Dec 2016 08:54:55 +0000 (09:54 +0100)]
ob-tangle: Remove useless declarations

18 hours agoMerge branch 'maint'
Nicolas Goaziou [Sat, 10 Dec 2016 00:02:06 +0000 (01:02 +0100)]
Merge branch 'maint'

18 hours agoob-tangle: Fix last commit maint
Nicolas Goaziou [Fri, 9 Dec 2016 23:59:08 +0000 (00:59 +0100)]
ob-tangle: Fix last commit

* lisp/ob-tangle.el (org-babel-tangle-single-block):
  `org-babel-expand-noweb-references' specifically needs to be run in
  the Org document so as to resolve references.
* testing/lisp/test-ob-tangle.el (ob-tangle/continued-code-blocks-w-noweb-ref):
  Make sure a failing test doesn't leave a file behind it.

18 hours ago`org-insert-heading' doesn't create items anymore
Nicolas Goaziou [Fri, 28 Oct 2016 17:48:47 +0000 (19:48 +0200)]
`org-insert-heading' doesn't create items anymore

* lisp/org.el (org-insert-heading): Specialize function for headlines,
  not items.
(org-meta-return): Update according to new specifications above.
* lisp/org-list.el (org-insert-item): Add interactive spec.
* doc/org.texi (Structure editing): Update documentation.

* testing/lisp/test-org.el (test-org/insert-heading): Remove tests.
* testing/lisp/test-org-list.el (test-org-list/insert-item): Add test.

18 hours agoImprove blank line handling in `org-insert-heading'
Nicolas Goaziou [Thu, 27 Oct 2016 22:35:01 +0000 (00:35 +0200)]
Improve blank line handling in `org-insert-heading'

* lisp/org.el (org--blank-before-heading-p): New function.
(org-insert-heading): Use previous function.  Major refactoring.

* testing/lisp/test-org.el (test-org/insert-heading):
(test-org/insert-todo-heading-respect-content): Update tests.

19 hours agoMerge branch 'maint'
Nicolas Goaziou [Fri, 9 Dec 2016 23:21:40 +0000 (00:21 +0100)]
Merge branch 'maint'

19 hours agoob-tangle: Respect buffer local variables
Nicolas Goaziou [Fri, 9 Dec 2016 23:20:11 +0000 (00:20 +0100)]
ob-tangle: Respect buffer local variables

* lisp/ob-tangle.el (org-babel-spec-to-string): Move some processing...
(org-babel-tangle-single-block): ... there.  This function is called
with the Org buffer as its original buffer whereas the previous one is
not.

This is a follow-up to 026fb75, which was reverted.

Reported-by: David Dynerman <emperordali@block-party.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/110670>

19 hours agoRevert "ob-tangle: Respect buffer local variables"
Nicolas Goaziou [Fri, 9 Dec 2016 23:19:45 +0000 (00:19 +0100)]
Revert "ob-tangle: Respect buffer local variables"

This reverts commit 026fb75ddbddb8b8965c40b82a381ff5b8e92516.

20 hours agoorg-agenda: Remove reference to Timeline
Nicolas Goaziou [Fri, 9 Dec 2016 21:33:52 +0000 (22:33 +0100)]
org-agenda: Remove reference to Timeline

* lisp/org-agenda.el (org-agenda-get-restriction-and-command): Remove
  reference to Timeline.

21 hours agoRemove Org Timeline
Nicolas Goaziou [Fri, 9 Dec 2016 21:19:13 +0000 (22:19 +0100)]
Remove Org Timeline

* lisp/org-agenda.el (org-timeline-show-empty-dates):
(org-agenda-only-exact-dates): Remove variables.
(org-timeline):
(org-get-all-dates): Remove functions.

(org-agenda): Remove reference to `org-timeline'

* lisp/org-mouse.el (org-mouse-popup-global-menu): Remove reference to
  `org-timeline'.
* lisp/org.el (org-org-menu): Likewise.

21 hours agoNew `org-bibtex-headline-format-function'
Eric Danan [Fri, 9 Dec 2016 20:44:06 +0000 (21:44 +0100)]
New `org-bibtex-headline-format-function'

* lisp/org-bibtex.el (org-bibtex-write): Make this function read the
headline format from the newly created variable
`org-bibtex-headline-format-function' instead of systematically using
the entry title.
(org-bibtex-headline-format-function): Create this variable to hold
a function of one argument, the entry alist, and return the string to
be inserted as headline.  The default value replicates the current
behavior of returning the entry title.

TINYCHANGE

21 hours agoox-confluence.el: Add support for ordered list
Lungang Fang [Wed, 7 Dec 2016 06:26:04 +0000 (17:26 +1100)]
ox-confluence.el: Add support for ordered list

* contrib/lisp/ox-confluence.el (org-confluence-item): Support ordered
list

When converting a bullet item, examine the type of it and convert
accordingly.

TINYCHANGE

44 hours agoMerge branch 'maint'
Nicolas Goaziou [Thu, 8 Dec 2016 21:42:44 +0000 (22:42 +0100)]
Merge branch 'maint'

44 hours agoSimplify matching headlines in `org-link-search'
Nicolas Goaziou [Thu, 8 Dec 2016 21:40:18 +0000 (22:40 +0100)]
Simplify matching headlines in `org-link-search'

* lisp/org.el (org-link-search): Simplify matching headlines.

2 days agoMerge branch 'maint'
Kyle Meyer [Thu, 8 Dec 2016 03:36:28 +0000 (22:36 -0500)]
Merge branch 'maint'

2 days agoBackport commit eeecac7 from Emacs
Paul Eggert [Wed, 7 Dec 2016 19:29:54 +0000 (11:29 -0800)]
Backport commit eeecac7 from Emacs

Fix minor quoting problems in doc strings
eeecac7ab9d1f8c3a29cffe4586e5fd2414dd671
Paul Eggert
Wed Dec 7 11:31:16 2016 -0800

2 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 7 Dec 2016 22:14:50 +0000 (23:14 +0100)]
Merge branch 'maint'

2 days agoAllow coderef on otherwise empty lines
Nicolas Goaziou [Wed, 7 Dec 2016 22:11:10 +0000 (23:11 +0100)]
Allow coderef on otherwise empty lines

* lisp/org-src.el (org-src-coderef-regexp): Update regexp.
* lisp/ox.el (org-export-resolve-coderef): Use function above.

Reported-by: D M German <dmg@turingmachine.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110656>

3 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 6 Dec 2016 23:47:45 +0000 (00:47 +0100)]
Merge branch 'maint'

3 days agoox-latex: Do not generate nested sub/superscripts
Nicolas Goaziou [Tue, 6 Dec 2016 23:45:52 +0000 (00:45 +0100)]
ox-latex: Do not generate nested sub/superscripts

* lisp/ox-latex.el (org-latex--wrap-latex-math-block): Do not wrap
  consecutive sub or super-scripts within the same block.

Reported-by: Scott Otterson <scotto@sharpleaf.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110589>

3 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 6 Dec 2016 23:16:05 +0000 (00:16 +0100)]
Merge branch 'maint'

3 days agoFix SCHEDULED removal when repeating a task
Nicolas Goaziou [Tue, 6 Dec 2016 23:10:29 +0000 (00:10 +0100)]
Fix SCHEDULED removal when repeating a task

* lisp/org.el (org-auto-repeat-maybe): Fix bug where repeating a task
  containing a timestamp without a repeater would remove the scheduled
  date.

Reported-by: 毛晓伟 <maoweirm@126.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110633>

4 days agoFixed link to Carsten's Tools page
Carsten Dominik [Tue, 6 Dec 2016 12:18:19 +0000 (13:18 +0100)]
Fixed link to Carsten's Tools page

4 days agoFixed link to the home of CDLaTeX
Carsten Dominik [Tue, 6 Dec 2016 12:00:14 +0000 (13:00 +0100)]
Fixed link to the home of CDLaTeX

4 days agoob-sql: Add sqsh engine
MaDhAt2r [Mon, 5 Dec 2016 21:45:25 +0000 (22:45 +0100)]
ob-sql: Add sqsh engine

* lisp/ob-sql.el (org-babel-sql-dbstring-sqsh): New function.
(org-babel-execute:sql): Add `sqsh' engine.

4 days agoox-confluence.el: Add support for verbatim & code
Charles Durst [Mon, 5 Dec 2016 21:22:53 +0000 (22:22 +0100)]
ox-confluence.el: Add support for verbatim & code

* contrib/lisp/ox-confluence.el (org-confluence-verbatim,
org-confluence-code): New functions.

Convert org-mode =verbatim= and ~code~ into Confluence {{monospace}}.

TINYCHANGE

5 days agoorg-agenda: Fix typo in docstring
Nicolas Goaziou [Sun, 4 Dec 2016 22:47:10 +0000 (23:47 +0100)]
org-agenda: Fix typo in docstring

* lisp/org-agenda.el (org-agenda-prefer-last-repeat): Fix typo.

6 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 3 Dec 2016 23:45:12 +0000 (00:45 +0100)]
Merge branch 'maint'

6 days agodoc/org.texi: Editorial revisions to the manual
Lambda Coder [Fri, 2 Dec 2016 18:27:54 +0000 (10:27 -0800)]
doc/org.texi: Editorial revisions to the manual

Chapters edited in this revision:
* From Working with source code chapter to end of manual

6 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 3 Dec 2016 22:58:22 +0000 (23:58 +0100)]
Merge branch 'maint'

6 days agoob-tangle: Respect buffer local variables
Nicolas Goaziou [Sat, 3 Dec 2016 22:55:28 +0000 (23:55 +0100)]
ob-tangle: Respect buffer local variables

* lisp/ob-tangle.el (org-babel-tangle): Make sure buffer local
  variables from Org document are taken into consideration in tangled
  document.

Reported-by: David Dynerman <emperordali@block-party.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/110577>

6 days agoImprove repeated entries handling
Nicolas Goaziou [Sat, 3 Dec 2016 08:04:42 +0000 (09:04 +0100)]
Improve repeated entries handling

* lisp/org-agenda.el (org-agenda-show-future-repeats):
(org-agenda-prefer-last-repeat): New variables.
(org-agenda-repeating-timestamp-show-all): Remove variable.
(org-agenda-get-timestamps):
(org-agenda-get-deadlines):
(org-agenda-get-scheduled): Use new variables.

7 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 2 Dec 2016 22:25:26 +0000 (23:25 +0100)]
Merge branch 'maint'

7 days agoorg-agenda: Fix face for past scheduled time stamps
Nicolas Goaziou [Fri, 2 Dec 2016 22:24:38 +0000 (23:24 +0100)]
org-agenda: Fix face for past scheduled time stamps

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

8 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 2 Dec 2016 12:01:48 +0000 (13:01 +0100)]
Merge branch 'maint'

8 days agoorg-agenda: Fix repeats with nil `org-agenda-repeating-timestamp-show-all'
Nicolas Goaziou [Fri, 2 Dec 2016 09:55:49 +0000 (10:55 +0100)]
org-agenda: Fix repeats with nil `org-agenda-repeating-timestamp-show-all'

* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-deadlines):
(org-agenda-get-scheduled): When
`org-agenda-repeating-timestamp-show-all' is nil, only display repeat
before and repeat after today (or only repeat at today if those
coincide).  Also, computations of warnings are done with last repeat
before today instead of base date.

8 days agoorg-agenda: Small refactoring
Nicolas Goaziou [Fri, 2 Dec 2016 09:36:32 +0000 (10:36 +0100)]
org-agenda: Small refactoring

* lisp/org-agenda.el (org-agenda-deadline-face): Small refactoring.

8 days agoorg-compat.el: org-export-babel-evaluate is an obsolete variable
Charles Berry [Fri, 2 Dec 2016 02:31:08 +0000 (18:31 -0800)]
org-compat.el: org-export-babel-evaluate is an obsolete variable

* lisp/org-compat.el (org-export-babel-evaluate) is marked as an
  obsolete variable.  It was marked as a function.

9 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 30 Nov 2016 20:56:42 +0000 (21:56 +0100)]
Merge branch 'maint'

9 days agoFix dpi calculation when previewing LaTeX snippets
Nicolas Goaziou [Wed, 30 Nov 2016 20:55:45 +0000 (21:55 +0100)]
Fix dpi calculation when previewing LaTeX snippets

* lisp/org.el (org--get-display-dpi): Fix docstring.
(org-create-formula-image): Use function above.

Reported-by: Scott Otterson <scotto@sharpleaf.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110526>

10 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 29 Nov 2016 23:17:49 +0000 (00:17 +0100)]
Merge branch 'maint'

10 days agoorg-agenda: Fix priority for deadlines
Nicolas Goaziou [Tue, 29 Nov 2016 23:16:56 +0000 (00:16 +0100)]
org-agenda: Fix priority for deadlines

* lisp/org-agenda.el (org-agenda-get-deadlines): Fix priority
  computation.

Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110519>

10 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 29 Nov 2016 22:56:50 +0000 (23:56 +0100)]
Merge branch 'maint'

10 days agoorg-agenda: Fix time of day presence
Nicolas Goaziou [Tue, 29 Nov 2016 22:55:15 +0000 (23:55 +0100)]
org-agenda: Fix time of day presence

* lisp/org-agenda.el (org-agenda-get-deadlines): Small refactoring.
(org-agenda-get-scheduled): Do no insert a time of day when current
entry is only a reminder of a previously scheduled task.

Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110517>

11 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 29 Nov 2016 08:30:10 +0000 (09:30 +0100)]
Merge branch 'maint'

11 days agoRelax the match criteria for MathML header line
Lixin Chin [Tue, 29 Nov 2016 08:28:06 +0000 (09:28 +0100)]
Relax the match criteria for MathML header line

* lisp/org.el (org-create-math-formula): Allow the xmlns attribute to
  be preceded by any other mathml header attribute.

The problem here was that the match criteria for MathML assumed that
the xmlns attribute is the first listed in the top level MathML <math>
element.  Some LaTeX -> MathML converters (e.g., pandoc) will add
attributes before xmlns, which is still valid MathML.

11 days agoox-odt.el: Fix LaTeX formulae in opendocument exports
Lixin Chin [Tue, 29 Nov 2016 08:24:11 +0000 (09:24 +0100)]
ox-odt.el: Fix LaTeX formulae in opendocument exports

* lisp/ox-odt.el (org-odt--translate-latex-fragments): Apply signature
  change for `org-format-latex'.

Commit a24f339f58a5a97a813514b8768faf9131c83dd0 changed the signature
for `org-format-latex' (lisp/org.el) to add `beg' and `end' optional
parameters.  This led to an error in ox-odt.el when exporting an
odt document containing LaTeX formulae.

11 days agoMerge branch 'maint'
Kyle Meyer [Mon, 28 Nov 2016 23:56:17 +0000 (18:56 -0500)]
Merge branch 'maint'

11 days agoIssue user-error when trying to drag before first element
Kyle Meyer [Mon, 28 Nov 2016 23:30:16 +0000 (18:30 -0500)]
Issue user-error when trying to drag before first element

* lisp/org.el (org-drag-element-backward):
(org-drag-element-forward): Check that org-element-at-point returns a
non-nil value to avoid a type-error when called before first element.

* testing/lisp/test-org.el (test-org/drag-element-backward):
(test-org/drag-element-forward): Add test for when point is before
first element.  Adjust existing should-error calls to specify
user-error.

12 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 28 Nov 2016 00:37:01 +0000 (01:37 +0100)]
Merge branch 'maint'

12 days agoorg-agenda: Fix deadlines
Nicolas Goaziou [Mon, 28 Nov 2016 00:35:21 +0000 (01:35 +0100)]
org-agenda: Fix deadlines

* lisp/org-agenda.el (org-agenda-get-deadlines): Fix deadlines
  display.  Also improve priority adjustment.

12 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 27 Nov 2016 22:46:13 +0000 (23:46 +0100)]
Merge branch 'maint'

12 days agoorg-agenda: Fix docstrings
Nicolas Goaziou [Sun, 27 Nov 2016 22:45:35 +0000 (23:45 +0100)]
org-agenda: Fix docstrings

* lisp/org-agenda.el (org-agenda-skip-scheduled-if-done): Tiny rewording.
(org-agenda-skip-deadline-if-done): Fix typo.

12 days agoorg-agenda: Fix done scheduled display
Nicolas Goaziou [Sun, 27 Nov 2016 22:43:00 +0000 (23:43 +0100)]
org-agenda: Fix done scheduled display

* lisp/org-agenda.el (org-agenda-get-scheduled): Skip done scheduled
  unconditionally whenever the base date is not the one currently
  considered.

12 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 27 Nov 2016 22:09:48 +0000 (23:09 +0100)]
Merge branch 'maint'

12 days agoorg-agenda: Fix repeated time stamps
Nicolas Goaziou [Sun, 27 Nov 2016 22:08:34 +0000 (23:08 +0100)]
org-agenda: Fix repeated time stamps

* lisp/org-agenda.el (org-agenda-get-timestamps): Properly handle
  repeated time stamps.  Refactor code.  Improve docstring.

12 days agoTiny fix
Nicolas Goaziou [Sun, 27 Nov 2016 22:07:49 +0000 (23:07 +0100)]
Tiny fix

* lisp/org.el (org-at-clock-log-p): Use `beginning-of-line' instead of
  `move-beginning-of-line'.

13 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 27 Nov 2016 11:20:30 +0000 (12:20 +0100)]
Merge branch 'maint'

13 days agoTiny docstring fix
Nicolas Goaziou [Sun, 27 Nov 2016 11:20:01 +0000 (12:20 +0100)]
Tiny docstring fix

* lisp/org.el (org-compile-file): Fix docstring.

13 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 27 Nov 2016 11:09:23 +0000 (12:09 +0100)]
Merge branch 'maint'

13 days agoFix LaTeX preview
Nicolas Goaziou [Sun, 27 Nov 2016 11:07:11 +0000 (12:07 +0100)]
Fix LaTeX preview

* lisp/org.el (org-compile-file): Introduce new %O placeholder.
(org-preview-latex-process-alist): Use it.

* lisp/ox-latex.el (org-latex-pdf-process):
* lisp/ox-man.el (org-man-pdf-process):
* lisp/ox-texinfo.el (org-texinfo-info-process): Document it.

Reported-by: Scott Otterson <scotto@sharpleaf.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110464>

2 weeks agoorg-mac-link: Add autoload cookies for all commands
Chunyang Xu [Wed, 16 Nov 2016 14:18:51 +0000 (22:18 +0800)]
org-mac-link: Add autoload cookies for all commands

* contrib/lisp/org-mac-link.el (org-mac-grab-link):
(org-mac-firefox-get-frontmost-url):
(org-mac-firefox-insert-frontmost-url):
(org-mac-vimperator-get-frontmost-url):
(org-mac-vimperator-insert-frontmost-url):
(org-mac-chrome-get-frontmost-url):
(org-mac-chrome-insert-frontmost-url):
(org-mac-safari-get-frontmost-url):
(org-mac-safari-insert-frontmost-url):
(org-mac-together-get-selected):
(org-mac-together-insert-selected):
(org-mac-finder-item-get-selected):
(org-mac-finder-insert-selected):
(org-mac-addressbook-item-get-selected):
(org-mac-addressbook-insert-selected):
(org-mac-skim-get-page):
(org-mac-skim-insert-page):
(org-mac-acrobat-get-page):
(org-mac-acrobat-insert-page):
(org-mac-outlook-message-get-links):
(org-mac-outlook-message-insert-selected):
(org-mac-outlook-message-insert-flagged):
(org-mac-evernote-note-insert-selected):
(org-mac-devonthink-item-insert-selected):
(org-mac-message-get-links):
(org-mac-message-insert-selected):
(org-mac-message-insert-flagged): Add autoload cookie.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Nov 2016 23:18:28 +0000 (00:18 +0100)]
Merge branch 'maint'

2 weeks agoorg-clock: Fix clock tables with file list scope
Nicolas Goaziou [Fri, 25 Nov 2016 23:15:44 +0000 (00:15 +0100)]
org-clock: Fix clock tables with file list scope

* lisp/org-clock.el (org-dblock-write:clocktable): Handle scope as
  a list of files.

Reported-by: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110452>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Nov 2016 17:02:11 +0000 (18:02 +0100)]
Merge branch 'maint'

2 weeks agoorg-agenda: Fix "no-catch --cl-block-nil--"
Nicolas Goaziou [Fri, 25 Nov 2016 16:49:13 +0000 (17:49 +0100)]
org-agenda: Fix "no-catch --cl-block-nil--"

* lisp/org-agenda.el (org-agenda-get-category-icon): Use `cl-dolist'
  instead of `dolist'.

Reported-by: Karl Voit <devnull@Karl-Voit.at>
<http://permalink.gmane.org/gmane.emacs.orgmode/110443>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Nov 2016 11:23:24 +0000 (12:23 +0100)]
Merge branch 'maint'

2 weeks agoox-latex: Fix error when compiling in a different than source file
Nicolas Goaziou [Fri, 25 Nov 2016 09:25:35 +0000 (10:25 +0100)]
ox-latex: Fix error when compiling in a different than source file

* lisp/ox-latex.el (org-latex-compile): List logfiles with their full
  name instead of relative ones.

Reported-by: Éric Würbel <eric.wurbel@univ-amu.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/110402>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Nov 2016 01:08:46 +0000 (02:08 +0100)]
Merge branch 'maint'

2 weeks agoorg-agenda: Fix previous commit
Nicolas Goaziou [Fri, 25 Nov 2016 01:07:54 +0000 (02:07 +0100)]
org-agenda: Fix previous commit

* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-deadlines): Apply `org-agenda--timestamp-to-absolute'
signature change.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Nov 2016 00:54:14 +0000 (01:54 +0100)]
Merge branch 'maint'

2 weeks agoorg-agenda: Fix scheduled dates display
Nicolas Goaziou [Fri, 25 Nov 2016 00:51:42 +0000 (01:51 +0100)]
org-agenda: Fix scheduled dates display

* lisp/org.el (org-time-string-to-absolute): Change signature.
* lisp/org-agenda.el (org-agenda-get-scheduled): Fix various glitches
  in scheduled dates display.  Also fix such dates when
  `org-agenda-repeating-timestamp-show-all' is nil.  Apply signature
  change.

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

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 21 Nov 2016 22:25:51 +0000 (23:25 +0100)]
Merge branch 'maint'

2 weeks agoob-js: Fix error when code block ends with a comment
Nicolas Goaziou [Mon, 21 Nov 2016 22:21:23 +0000 (23:21 +0100)]
ob-js: Fix error when code block ends with a comment

* lisp/ob-js.el (org-babel-js-function-wrapper): Isolate body within
  wrapper.

Reported-by: Compro Prasad <comproprasad@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110390>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 20 Nov 2016 08:38:13 +0000 (09:38 +0100)]
Merge branch 'maint'

2 weeks agotest-ob: Fix failing test on MacOS
Nicolas Goaziou [Sun, 20 Nov 2016 08:36:42 +0000 (09:36 +0100)]
test-ob: Fix failing test on MacOS

* testing/lisp/test-ob.el (test-ob/indented-cached-org-bracket-link):
  Use `expand-file-name' to prevent introducing "//" patterns in file
  name.

Reported-by: David Talmage <david.talmage@shoutpoint.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110285>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 19 Nov 2016 22:18:38 +0000 (23:18 +0100)]
Merge branch 'maint'

2 weeks agoox-html: Fix %d placeholder in pre/postamble string
Nicolas Goaziou [Sat, 19 Nov 2016 22:17:32 +0000 (23:17 +0100)]
ox-html: Fix %d placeholder in pre/postamble string

* lisp/ox-html.el (org-html-format-spec): Correctly apply
  `org-html-metadata-timestamp-format' on %d placeholder.

Reported-by: Pavel Panchekha <me@pavpanchekha.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110374>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 19 Nov 2016 22:09:33 +0000 (23:09 +0100)]
Merge branch 'maint'

2 weeks agoMerge branch 'maint' of orgmode.org:org-mode into maint
Nicolas Goaziou [Sat, 19 Nov 2016 22:08:33 +0000 (23:08 +0100)]
Merge branch 'maint' of orgmode.org:org-mode into maint

2 weeks agoFix error when exporting body only of an empty buffer
Nicolas Goaziou [Sat, 19 Nov 2016 22:06:17 +0000 (23:06 +0100)]
Fix error when exporting body only of an empty buffer

* lisp/ox.el (org-export-filter-apply-functions): Return empty string
  instead of nil when a filter returns the empty string.

* testing/lisp/test-ox.el (test-org-export/export-scope): Add test.
(test-org-export/filter-apply-functions): New test.

Reported-by: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/110371>

2 weeks agoMerge branch 'maint'
Kyle Meyer [Sat, 19 Nov 2016 21:50:37 +0000 (16:50 -0500)]
Merge branch 'maint'

2 weeks agoBackport commit 5b0cddd from Emacs
Eli Zaretskii [Tue, 15 Nov 2016 17:01:07 +0000 (19:01 +0200)]
Backport commit 5b0cddd from Emacs

* doc/orgcard.tex: Change "GNU Emacs" to "this document" in copyright
notices.  (Bug#24520)

More fixes in copyright notices in etc/refcards/
5b0cddd91535025bbf0c69d17e2d4e470dd350c5
Eli Zaretskii
Tue Nov 15 19:01:07 2016 +0200

2 weeks agoBackport commit f994c20 from Emacs
Eli Zaretskii [Sun, 13 Nov 2016 16:20:59 +0000 (18:20 +0200)]
Backport commit f994c20 from Emacs

* doc/orgcard.tex: Update the copyright blurb.  (Bug#24520)

Update copyright text in refcards
f994c2046588b168c1a4a900879cdffaf9d02f01
Eli Zaretskii
Sun Nov 13 18:20:59 2016 +0200

2 weeks agoBackport commit dc152c5 from Emacs
Paul Eggert [Sun, 6 Nov 2016 07:33:43 +0000 (00:33 -0700)]
Backport commit dc152c5 from Emacs

Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20).  Change Emacs
documentation and comments to match this.  Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.

Modernize usage of 'macOS' in doc and comments
dc152c54f4e44f5f2040883b03f71ff6aa66c893
Paul Eggert
Sun Nov 6 00:42:03 2016 -0700

3 weeks agoob-clojure: Normalize :show-process syntax
Nicolas Goaziou [Sat, 19 Nov 2016 06:39:05 +0000 (07:39 +0100)]
ob-clojure: Normalize :show-process syntax

* lisp/ob-clojure.el (org-babel-execute:clojure): :show-process
  requires a non-nil (and non "no") value.

3 weeks agoob-clojure: Small refactoring
Nicolas Goaziou [Sat, 19 Nov 2016 06:35:23 +0000 (07:35 +0100)]
ob-clojure: Small refactoring

* lisp/ob-clojure.el (org-babel-execute:clojure): Small refactoring.

3 weeks agoob-clojure: Add :show-process
Frederick Giasson [Fri, 18 Nov 2016 17:01:02 +0000 (12:01 -0500)]
ob-clojure: Add :show-process

* lisp/ob-clojure.el (org-babel-clojure-sync-nrepl-timeout): New variable.
(org-babel-execute:clojure): Implement :show-process.  Better error
handling.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 18 Nov 2016 22:04:15 +0000 (23:04 +0100)]
Merge branch 'maint'

3 weeks agoox-icalendar: Use \r\n instead of \n as line breaks
Nicolas Goaziou [Fri, 18 Nov 2016 22:03:01 +0000 (23:03 +0100)]
ox-icalendar: Use \r\n instead of \n as line breaks

* lisp/ox-icalendar.el (org-icalendar-fold-string): Break lines with
  \r\n instead of \n, per RFC 5545.

Reported-by: Stephen Eglen <sje30@cam.ac.uk>
<http://permalink.gmane.org/gmane.emacs.orgmode/110306>

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 18 Nov 2016 08:37:53 +0000 (09:37 +0100)]
Merge branch 'maint'

3 weeks agoorg.texi: Small fixes release_9.0.1
Nicolas Goaziou [Fri, 18 Nov 2016 08:36:47 +0000 (09:36 +0100)]
org.texi: Small fixes

* doc/org.texi (Structure of code blocks): Remove too recent
  @indentedblock structure and fix some @ref, @xref, @pxref uses.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 17 Nov 2016 22:54:57 +0000 (23:54 +0100)]
Merge branch 'maint'

3 weeks agoorg.texi: Reword Babel chapter
Lambda Coder [Thu, 17 Nov 2016 22:28:37 +0000 (23:28 +0100)]
org.texi: Reword Babel chapter

* doc/org.texi (Template elements):
(Tables in @LaTeX{} export):
(Working with source code):
(Structure of code blocks):
(Editing source code):
(Exporting code blocks):
(Extracting source code):
(Evaluating code blocks):
(Library of Babel):
(Languages):
(Header arguments):
(Using header arguments):
(System-wide header arguments):
(Language-specific header arguments):
(Header arguments in Org mode properties):
(Language-specific header arguments in Org mode properties):
(Code block specific header arguments):
(Header arguments in function calls):
(Specific header arguments):
(var):
(results):
(file-desc):
(file):
(output-dir):
(dir):
(exports):
(comments):
(padline):
(no-expand):
(session):
(noweb):
(noweb-ref):
(noweb-sep):
(cache):
(sep):
(hlines):
(colnames):
(rownames):
(shebang):
(tangle-mode):
(eval):
(wrap):
(post):
(prologue):
(Results of evaluation):
(Noweb reference syntax):
(Key bindings and useful functions):
(Batch execution): Improve wording.

3 weeks agoorg.texi: Fix typo
Nicolas Goaziou [Mon, 14 Nov 2016 07:43:08 +0000 (08:43 +0100)]
org.texi: Fix typo

* doc/org.texi (Exporting code blocks): Fix typo.

3 weeks agoReplace `org-export-babel-evaluate' with `org-export-use-babel'
Charles Berry [Sun, 13 Nov 2016 02:54:20 +0000 (18:54 -0800)]
Replace `org-export-babel-evaluate' with `org-export-use-babel'

* lisp/ob-exp.el (org-babel-exp-process-buffer): Change variable
  name `org-export-babel-evaluate' to `org-export-use-babel'.  Also
  change the name in its `defcustom' and set the `:safe' key.

* lisp/ox-icalendar.el (org-icalendar-export-current-agenda): Change
  variable name.

* lisp/ox.el (org-export-as): Change variable name.

* doc/org.texi (Exporting code blocks): Change variable name.  Amplify
   the explanation of what the variable does.  Add variable index entry.

* testing/lisp/test-ob-exp.el: Change variable name.

* testing/lisp/test-ob-lob.el: Change variable name.

* testing/lisp/test-ox.el: Change variable name.

Users were often confused that setting this variable to `nil' will
cause header arguments to be ignored in addition to preventing code
from being evaluated.  It is hoped that the documentation changes and
the name `org-export-use-babel' will better convey that everything
babel does can be switched off with this variable.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 13 Nov 2016 17:10:53 +0000 (18:10 +0100)]
Merge branch 'maint'

3 weeks agoorg.texi: Fix typo
Nicolas Goaziou [Sun, 13 Nov 2016 17:10:25 +0000 (18:10 +0100)]
org.texi: Fix typo

* doc/org.texi (External links): Fix typo.