org-mode.git
8 hours agoob-scheme: Tiny refactoring master
Nicolas Goaziou [Mon, 24 Jul 2017 11:57:12 +0000 (13:57 +0200)]
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.

8 hours agoob-scheme: Fix :prologue handling
Nicolas Goaziou [Mon, 24 Jul 2017 11:53:16 +0000 (13:53 +0200)]
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.

10 hours agoob-scheme: Handle tables and :prologue params
José L. Doménech [Mon, 24 Jul 2017 09:56:52 +0000 (11:56 +0200)]
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

13 hours agoMerge branch 'maint'
Nicolas Goaziou [Mon, 24 Jul 2017 07:42:50 +0000 (09:42 +0200)]
Merge branch 'maint'

13 hours agoorg-clock: Fix :tend with a time zone maint
Nicolas Goaziou [Mon, 24 Jul 2017 07:40:58 +0000 (09:40 +0200)]
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>
13 hours agoorg.texi: Fix last commit
Nicolas Goaziou [Mon, 24 Jul 2017 07:34:57 +0000 (09:34 +0200)]
org.texi: Fix last commit

23 hours agoMerge branch 'maint'
Nicolas Goaziou [Sun, 23 Jul 2017 20:49:11 +0000 (22:49 +0200)]
Merge branch 'maint'

23 hours agoorg.texi: Document Org Protocol
Nicolas Goaziou [Tue, 4 Jul 2017 12:48:41 +0000 (14:48 +0200)]
org.texi: Document Org Protocol

* doc/org.texi (Protocols): Document feature.

24 hours agoMerge branch 'maint'
Nicolas Goaziou [Sun, 23 Jul 2017 20:42:50 +0000 (22:42 +0200)]
Merge branch 'maint'

24 hours agoob-emacs-lisp: Fix pp results
Nicolas Goaziou [Sun, 23 Jul 2017 20:41:27 +0000 (22:41 +0200)]
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>

35 hours agoUse cl-lib rather than cl variants in org-drill
Stig Brautaset [Fri, 14 Jul 2017 19:57:39 +0000 (20:57 +0100)]
Use cl-lib rather than cl variants in org-drill

org-drill requires only cl-lib rather than cl, so should use cl-gensym
rather than gensym I believe.

From 1eef99d550e467bf4a3eaf6bdbe4d3a482f6c187 Mon Sep 17 00:00:00 2001
From: Stig Brautaset <stig@brautaset.org>
Date: Fri, 14 Jul 2017 20:45:37 +0100
Subject: [PATCH 2/3] org-drill.el: use cl-gensym rather than gensym

cl-lib is already required by this file, but cl is not.

35 hours agouse cl-lib functions rather than cl ones in org-test
Stig Brautaset [Fri, 14 Jul 2017 19:55:17 +0000 (20:55 +0100)]
use cl-lib functions rather than cl ones in org-test

From ead36e862d150e3a83d363bdead850a2e3ec281d Mon Sep 17 00:00:00 2001
From: Stig Brautaset <stig@brautaset.org>
Date: Fri, 14 Jul 2017 20:43:11 +0100
Subject: [PATCH 1/3] org-test.el: use prefixed functions from cl-lib.el rather
 than cl.el

2 days agoMerge branch 'maint'
Rasmus [Sat, 22 Jul 2017 12:08:08 +0000 (14:08 +0200)]
Merge branch 'maint'

2 days agoox-html: Use correct "br" tag for subtitle
Rasmus [Tue, 4 Jul 2017 16:43:18 +0000 (18:43 +0200)]
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>

2 days agoUpdate README_maintainer with upstream synchronization instructions
Rasmus [Mon, 3 Jul 2017 09:48:58 +0000 (11:48 +0200)]
Update README_maintainer with upstream synchronization instructions

* README_maintainer: Update with upstream synchronization
  instructions.

5 days agoMerge branch 'check-agenda'
Marco Wahl [Wed, 19 Jul 2017 15:46:29 +0000 (17:46 +0200)]
Merge branch 'check-agenda'

5 days agotest-org-agenda: Non-todo-kwd scheduled item must appear in agenda
Marco Wahl [Wed, 19 Jul 2017 15:43:50 +0000 (17:43 +0200)]
test-org-agenda: Non-todo-kwd scheduled item must appear in agenda

5 days agoorg: User interface message at tag edit slightly more legible
Marco Wahl [Tue, 18 Jul 2017 22:16:23 +0000 (00:16 +0200)]
org: User interface message at tag edit slightly more legible

6 days agoMerge branch 'maint'
Kyle Meyer [Tue, 18 Jul 2017 17:32:38 +0000 (13:32 -0400)]
Merge branch 'maint'

6 days agoDocument STATE parameter for org-cycle-hide-* functions
Kyle Meyer [Tue, 18 Jul 2017 17:31:07 +0000 (13:31 -0400)]
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.

6 days agoorg-cycle-hide-drawers: Remove an unnecessary state check
Kyle Meyer [Tue, 18 Jul 2017 17:24:32 +0000 (13:24 -0400)]
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.

7 days agoMerge branch 'maint'
Kyle Meyer [Sun, 16 Jul 2017 20:59:53 +0000 (16:59 -0400)]
Merge branch 'maint'

7 days agoorg-agenda-filter-by-tag: Only accept existing tags
Nathaniel Flath [Thu, 13 Jul 2017 00:15:04 +0000 (17:15 -0700)]
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.

10 days agoorg-agenda: Support for dimming local to each agenda.
Yuri D. Lensky [Tue, 11 Jul 2017 02:21:39 +0000 (19:21 -0700)]
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.

10 days agoox-koma-letter: Add support for url variable
Grant Rettke [Fri, 14 Jul 2017 01:14:52 +0000 (20:14 -0500)]
ox-koma-letter: Add support for url variable

* contrib/lisp/ox-koma-letter.el (org-koma-letter-url,
  org-koma-letter-use-url): New variables.
(org-koma-letter--build-settings): Use new variables.

Copied phone-number variable code, pasted it and changed references from phone-number to url.

Tested "url" with "#+URL: url", and "use-url" using "#+OPTIONS url:[nil|t]".

TINYCHANGE

10 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 14 Jul 2017 08:40:47 +0000 (10:40 +0200)]
Merge branch 'maint'

10 days agoorg-capture: Fix last commit
Nicolas Goaziou [Fri, 14 Jul 2017 08:40:03 +0000 (10:40 +0200)]
org-capture: Fix last commit

* lisp/org-capture.el (org-capture-fill-template): %K link
  specifically targets a headline.  Also provide a description.

10 days agoorg-duration: Fix copyright
Nicolas Goaziou [Fri, 14 Jul 2017 08:30:02 +0000 (10:30 +0200)]
org-duration: Fix copyright

11 days agoMerge branch 'maint'
Nicolas Goaziou [Thu, 13 Jul 2017 12:26:12 +0000 (14:26 +0200)]
Merge branch 'maint'

11 days agoorg-capture: Fix %k and %K in capture template
Nicolas Goaziou [Thu, 13 Jul 2017 12:08:20 +0000 (14:08 +0200)]
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>
11 days agoMerge branch 'maint'
Nicolas Goaziou [Thu, 13 Jul 2017 09:00:17 +0000 (11:00 +0200)]
Merge branch 'maint'

11 days agolibrary-of-babel: Fix typo
Chunyang Xu [Thu, 13 Jul 2017 07:40:13 +0000 (15:40 +0800)]
library-of-babel: Fix typo

* doc/library-of-babel.org: Replace non-existent with-temp-filebuffer.

TINYCHANGE

12 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 12 Jul 2017 12:12:32 +0000 (14:12 +0200)]
Merge branch 'maint'

12 days agoorg-depend.el: Fix check for previous-sibling blocker
Yuri D. Lensky [Mon, 10 Jul 2017 23:21:52 +0000 (16:21 -0700)]
org-depend.el: Fix check for previous-sibling blocker

* contrib/lisp/org-depend.el (org-depend-block-todo): Fix check for
  previous-sibling blocker.

The "previous-sibling" blocker checked the previous visible heading,
instead of the true previous sibling.

13 days agoorg-agenda: change order of items, support custom time grid string
Alex Branham [Tue, 11 Jul 2017 06:08:58 +0000 (08:08 +0200)]
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

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 10 Jul 2017 08:58:42 +0000 (10:58 +0200)]
Merge branch 'maint'

2 weeks agoorg-clock: Fix :tstart :tend parsing with time zones
Nicolas Goaziou [Mon, 10 Jul 2017 08:56:05 +0000 (10:56 +0200)]
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 112c5ba479d52c3c36de5c7aafd14ab6bc075005.

Reported-by: Dale Sedivec <dale@codefu.org>
2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 10 Jul 2017 08:23:26 +0000 (10:23 +0200)]
Merge branch 'maint'

2 weeks agoox-md.el: Fix export of irc and mailto links
Jay Kamat [Mon, 10 Jul 2017 00:50:09 +0000 (17:50 -0700)]
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

2 weeks agoMerge branch 'maint'
Kyle Meyer [Sun, 9 Jul 2017 15:28:54 +0000 (11:28 -0400)]
Merge branch 'maint'

2 weeks agoBackport commit 20e9a00fb from Emacs
Paul Eggert [Thu, 6 Jul 2017 07:23:30 +0000 (00:23 -0700)]
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

2 weeks agoBackport commit 0fda6d53e from Emacs
Glenn Morris [Wed, 5 Jul 2017 18:08:35 +0000 (14:08 -0400)]
Backport commit 0fda6d53e from Emacs

; Standardize some copyright and license notices
0fda6d53e38cc7073186fed0bd862221d21500ab
Glenn Morris
Wed Jul 5 14:08:35 2017 -0400

2 weeks agoBackport commit 26a308ea1 from Emacs
Glenn Morris [Wed, 5 Jul 2017 18:07:14 +0000 (14:07 -0400)]
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

2 weeks agoorg-attach: Make org-attach move directories, when attachment dir changes
Florian Lindner [Sun, 9 Jul 2017 15:16:24 +0000 (17:16 +0200)]
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.

2 weeks agoMerge branch 'maint'
Marco Wahl [Sat, 8 Jul 2017 21:32:10 +0000 (23:32 +0200)]
Merge branch 'maint'

2 weeks agodoc/org.texi (Easy templates): unified the notation.
Marco Wahl [Sat, 8 Jul 2017 21:29:49 +0000 (23:29 +0200)]
doc/org.texi (Easy templates): unified the notation.

2 weeks agoMerge branch 'maint'
Kaushal Modi [Fri, 7 Jul 2017 21:35:41 +0000 (17:35 -0400)]
Merge branch 'maint'

2 weeks agoFix curved quotes in error message
Kaushal Modi [Fri, 7 Jul 2017 21:18:22 +0000 (17:18 -0400)]
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).

2 weeks agoFix failing tests in non-daylight saving time zones
Nicolas Goaziou [Fri, 7 Jul 2017 16:23:10 +0000 (18:23 +0200)]
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.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 6 Jul 2017 17:21:48 +0000 (19:21 +0200)]
Merge branch 'maint'

2 weeks agoorg.el: Fix custom timestamps for date ranges
Jan Seeger [Thu, 6 Jul 2017 15:19:10 +0000 (17:19 +0200)]
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

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 6 Jul 2017 17:14:16 +0000 (19:14 +0200)]
Merge branch 'maint'

2 weeks agoob-comint: Remove unnecessary (require 'tramp)
Nicolas Goaziou [Thu, 6 Jul 2017 17:10:28 +0000 (19:10 +0200)]
ob-comint: Remove unnecessary (require 'tramp)

* lisp/ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  Remove unnecessary cache flush.

2 weeks agoMerge branch 'timer-stop-binding-for-agenda'
Marco Wahl [Wed, 5 Jul 2017 10:36:18 +0000 (12:36 +0200)]
Merge branch 'timer-stop-binding-for-agenda'

2 weeks agoorg-timer: Fix timer setting from effort property
Marco Wahl [Wed, 5 Jul 2017 10:33:47 +0000 (12:33 +0200)]
org-timer: Fix timer setting from effort property

Testcase included.

2 weeks agoorg-agenda:added binding to stop timer
Marco Wahl [Wed, 5 Jul 2017 09:05:36 +0000 (11:05 +0200)]
org-agenda:added binding to stop timer

2 weeks agoox-html: Use correct "br" tag for subtitle
Rasmus [Tue, 4 Jul 2017 16:43:18 +0000 (18:43 +0200)]
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>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 3 Jul 2017 23:13:03 +0000 (01:13 +0200)]
Merge branch 'maint'

2 weeks agoDo not cancel note when `org-add-log-note' is called with a prefix argument
Nicolas Goaziou [Mon, 3 Jul 2017 23:10:03 +0000 (01:10 +0200)]
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>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 3 Jul 2017 22:20:12 +0000 (00:20 +0200)]
Merge branch 'maint'

2 weeks agoFix wrong data in clock table using :block
Nicolas Goaziou [Mon, 3 Jul 2017 22:18:05 +0000 (00:18 +0200)]
Fix wrong data in clock table using :block

* lisp/org.el (org-2ft): Use new signature for
  `org-parse-time-string'.

3 weeks agoMerge branch 'maint'
Rasmus [Mon, 3 Jul 2017 10:05:47 +0000 (12:05 +0200)]
Merge branch 'maint'

3 weeks agoFix bug in org-inside-LaTeX-fragment-p
Rasmus [Mon, 3 Jul 2017 09:57:05 +0000 (11:57 +0200)]
Fix bug in org-inside-LaTeX-fragment-p

* lisp/org.el (org-inside-LaTeX-fragment-p): Also work correctly in
  first paragraph.

3 weeks agomk/eldo.el: Fix links
Bastien [Mon, 3 Jul 2017 06:36:19 +0000 (08:36 +0200)]
mk/eldo.el: Fix links

* mk/eldo.el (eldo-git-raw-file, eldo-git-search-string): Fix links.

3 weeks agodoc/org.texi (Global and local cycling): Add an online label
Bastien [Mon, 3 Jul 2017 06:35:25 +0000 (08:35 +0200)]
doc/org.texi (Global and local cycling): Add an online label

* doc/org.texi (Global and local cycling): Add an online label
to a reference.

Thanks to HyungSuk Ryu for reporting this.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 2 Jul 2017 07:20:35 +0000 (09:20 +0200)]
Merge branch 'maint'

3 weeks agoMove an obsolete declaration in "org-compat.el"
Nicolas Goaziou [Sun, 2 Jul 2017 07:19:09 +0000 (09:19 +0200)]
Move an obsolete declaration in "org-compat.el"

* lisp/org-compat.el (org-capture-import-remember-templates): Moved
  from "org-capture.el".

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 1 Jul 2017 16:27:21 +0000 (18:27 +0200)]
Merge branch 'maint'

3 weeks agoorg.texi: Fixes missing space after dot.
Mario Martelli [Sat, 1 Jul 2017 12:44:45 +0000 (14:44 +0200)]
org.texi: Fixes missing space after dot.

* doc/org.texi (Summary):
(Weekly/daily agenda): Fixes missing space after dot.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 1 Jul 2017 12:34:19 +0000 (14:34 +0200)]
Merge branch 'maint'

3 weeks agoorg.texi: Small change to Copying example in Texinfo export
Nicolas Goaziou [Sat, 1 Jul 2017 12:32:54 +0000 (14:32 +0200)]
org.texi: Small change to Copying example in Texinfo export

* doc/org.texi (Texinfo title and copyright page): Clarify that the
  headline needs to be named Copying, as pointed out above.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 1 Jul 2017 12:24:29 +0000 (14:24 +0200)]
Merge branch 'maint'

3 weeks agoFix `org-check-before-invisible-edit', part 2
Nicolas Goaziou [Sat, 1 Jul 2017 12:23:41 +0000 (14:23 +0200)]
Fix `org-check-before-invisible-edit', part 2

* lisp/org.el (org-check-before-invisible-edit): Fix error before
  first headline.  Handle nested overlays.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 1 Jul 2017 08:34:01 +0000 (10:34 +0200)]
Merge branch 'maint'

3 weeks agoorg-table: Add tests
Nicolas Goaziou [Sat, 1 Jul 2017 08:17:51 +0000 (10:17 +0200)]
org-table: Add tests

* testing/lisp/test-org-table.el (test-org-table/move-row-down):
(test-org-table/move-row-up): New tests.

3 weeks agoorg-table: Fix `org-table-move-row-down' without final newline
Nicolas Goaziou [Sat, 1 Jul 2017 08:07:29 +0000 (10:07 +0200)]
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.

3 weeks agoorg-table: Fix checks for impossible row moves
Nicolas Goaziou [Sat, 1 Jul 2017 07:57:45 +0000 (09:57 +0200)]
org-table: Fix checks for impossible row moves

* lisp/org-table.el (org-table-move-row): Fix checks.

3 weeks agoorg-table: Fix infloop
Nicolas Goaziou [Sat, 1 Jul 2017 07:57:20 +0000 (09:57 +0200)]
org-table: Fix infloop

* lisp/org-table.el (org-table-current-dline): Fix infloop when point
  is at the end of of buffer.

3 weeks agoMerge branch 'maint'
Kyle Meyer [Sat, 1 Jul 2017 04:18:15 +0000 (00:18 -0400)]
Merge branch 'maint'

3 weeks agodoc/Makefile: Use printf to generate org-version.tex
Kyle Meyer [Fri, 30 Jun 2017 17:06:18 +0000 (13:06 -0400)]
doc/Makefile: Use printf to generate org-version.tex

* doc/Makefile (org-version.tex): Use printf instead of echo to
increase portability.

By default GNU coreutil's echo disables the interpretation of
backslash escapes (-E option), but this isn't the case for some echo
variants.

Reported-by: Dale <dale@codefu.org>
<https://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00619.html>

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 30 Jun 2017 12:36:30 +0000 (14:36 +0200)]
Merge branch 'maint'

3 weeks agoorg-capture: Fix blank lines in `item' target type
Nicolas Goaziou [Fri, 30 Jun 2017 11:50:39 +0000 (13:50 +0200)]
org-capture: Fix blank lines in `item' target type

* lisp/org-capture.el (org-capture-place-item): Fix blank lines in
  `item' target type.

3 weeks agoorg-capture: Fix regression in item templates
Nicolas Goaziou [Fri, 30 Jun 2017 11:27:38 +0000 (13:27 +0200)]
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>

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 29 Jun 2017 14:32:08 +0000 (16:32 +0200)]
Merge branch 'maint'

3 weeks agoFix `org-check-before-invisible-edit' before first headline
Nicolas Goaziou [Thu, 29 Jun 2017 14:29:20 +0000 (16:29 +0200)]
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>

3 weeks agoORG-NEWS: org-protocol's date style URL support is mentioned
Mario Martelli [Thu, 29 Jun 2017 08:16:30 +0000 (10:16 +0200)]
ORG-NEWS: org-protocol's date style URL support is mentioned

3 weeks agoRevert "ox-texinfo: Move menu handling from sections to headlines"
Nicolas Goaziou [Wed, 28 Jun 2017 20:51:26 +0000 (22:51 +0200)]
Revert "ox-texinfo: Move menu handling from sections to headlines"

This reverts commit 988e8802a6f8638b8e57d146cd38282169346e0e.

3 weeks agoorg-protocol: Sources with date URL are supported
Mario Martelli [Wed, 28 Jun 2017 14:36:45 +0000 (16:36 +0200)]
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

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 28 Jun 2017 13:55:28 +0000 (15:55 +0200)]
Merge branch 'maint'

3 weeks agoorg-agenda: Prevent icon from leaking on white space after TODO
Nicolas Goaziou [Wed, 28 Jun 2017 13:54:20 +0000 (15:54 +0200)]
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
3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 28 Jun 2017 12:47:35 +0000 (14:47 +0200)]
Merge branch 'maint'

3 weeks agoorg-irc: Fix port handling
Nicolas Goaziou [Wed, 28 Jun 2017 12:44:21 +0000 (14:44 +0200)]
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>

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Wed, 28 Jun 2017 09:22:43 +0000 (11:22 +0200)]
Merge branch 'maint'

3 weeks agoorg-protocol: Fix for silently failing open-source subprotocol
Mario Martelli [Sat, 24 Jun 2017 14:01:20 +0000 (16:01 +0200)]
org-protocol: Fix for silently failing open-source subprotocol

* (org-protocol-open-source): Tests URL against base-url and not the
  filename.

TINYCHANGE

3 weeks agoorg-protocol: Fix for failing open-source subprotocol
Mario Martelli [Fri, 23 Jun 2017 16:32:49 +0000 (18:32 +0200)]
org-protocol: Fix for failing open-source subprotocol

* (org-protocol-open-source): Make sure url is sanitised before
   processing.

TINYCHANGE

3 weeks agoMerge branch 'maint'
Kyle Meyer [Wed, 28 Jun 2017 05:00:26 +0000 (01:00 -0400)]
Merge branch 'maint'

3 weeks agodoc/Makefile: Auto-generate org-version.tex for orgcard
Kyle Meyer [Fri, 23 Jun 2017 18:54:02 +0000 (14:54 -0400)]
doc/Makefile: Auto-generate org-version.tex for orgcard

* doc/Makefile: Add rule to generate org-version.tex.
* doc/orgcard.tex: Include org-version.tex rather than explicitly
setting version and year.

This removes the only instance in the repo where the Org version is
hardcoded.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 26 Jun 2017 21:40:35 +0000 (23:40 +0200)]
Merge branch 'maint'

3 weeks agoForbid empty string as org-ellipsis value
Nicolas Goaziou [Mon, 26 Jun 2017 21:38:23 +0000 (23:38 +0200)]
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>

4 weeks agoorg-entities: Add \dollar and \USD
Nicolas Goaziou [Mon, 26 Jun 2017 20:13:01 +0000 (22:13 +0200)]
org-entities: Add \dollar and \USD

* lisp/org-entities.el (org-entities): Add \dollar and \USD.