org-mode.git
88 min agoMerge branch 'maint' master
Nicolas Goaziou [Fri, 26 May 2017 09:58:25 +0000 (11:58 +0200)]
Merge branch 'maint'

90 min agoFix link fontification maint
Nicolas Goaziou [Fri, 26 May 2017 09:56:53 +0000 (11:56 +0200)]
Fix link fontification

* lisp/org.el (org-activate-links): New function.
(org-set-font-lock-defaults): Use new function.
(org-activate-angle-links):
(org-activate-bracket-links):
(org-activate-plain-links): Remove functions.
* lisp/org-agenda.el (org-agenda-get-some-entry-text):
(org-agenda-finalize): Use new function.

Reported-by: 林镇国 <mistkafka@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113485>

7 hours agoMerge branch 'maint'
Kyle Meyer [Fri, 26 May 2017 04:21:14 +0000 (00:21 -0400)]
Merge branch 'maint'

7 hours agoSilence byte-compiler under "make single"
Kyle Meyer [Fri, 26 May 2017 04:00:29 +0000 (00:00 -0400)]
Silence byte-compiler under "make single"

16 hours agoMerge branch 'maint'
Nicolas Goaziou [Thu, 25 May 2017 18:56:52 +0000 (20:56 +0200)]
Merge branch 'maint'

16 hours agoorg-colview: Silence byte-compiler
Nicolas Goaziou [Thu, 25 May 2017 18:54:39 +0000 (20:54 +0200)]
org-colview: Silence byte-compiler

* lisp/org-colview.el (org-columns--displayed-value): Silence
  byte-compiler.

24 hours agoPrevent filling before a "n" macro where it could create list items
Nicolas Goaziou [Mon, 22 May 2017 13:36:28 +0000 (15:36 +0200)]
Prevent filling before a "n" macro where it could create list items

* lisp/org.el (org-fill-n-macro-as-item-nobreak-p): New function.
(org-setup-filling): Use new function.

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

Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113587>

25 hours agoorg-macro: Implement the "n" macro
Nicolas Goaziou [Mon, 8 May 2017 10:38:38 +0000 (12:38 +0200)]
org-macro: Implement the "n" macro

* lisp/org-macro.el (org-macro--counter-table): New variable.
(org-macro--counter-initialize):
(org-macro--counter-increment): New functions.
(org-macro-initialize-templates): Use new functions.

* doc/org.texi (Macro replacement): Document new macro.

* testing/lisp/test-org-macro.el (test-org-macro/n):
(test-org-macro/property): New tests.

26 hours agoMerge branch 'maint'
Nicolas Goaziou [Thu, 25 May 2017 09:10:19 +0000 (11:10 +0200)]
Merge branch 'maint'

26 hours agoox-publish: Fix symlink publishing
Nicolas Goaziou [Thu, 25 May 2017 09:08:02 +0000 (11:08 +0200)]
ox-publish: Fix symlink publishing

* lisp/ox-publish.el (org-publish-file): Do not expand symlinks so as
  to get proper publishing directory.

Reported-by: Julien Cubizolles <j.cubizolles@free.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/113611>

2 days agoMerge branch 'maint'
Bastien [Tue, 23 May 2017 18:46:54 +0000 (20:46 +0200)]
Merge branch 'maint'

2 days agoorg-list.el (org-sort-list): Fix typo in prompt string
Bastien [Tue, 23 May 2017 18:46:42 +0000 (20:46 +0200)]
org-list.el (org-sort-list): Fix typo in prompt string

* lisp/org-list.el (org-sort-list): Fix typo in prompt string.

2 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 23 May 2017 16:15:42 +0000 (18:15 +0200)]
Merge branch 'maint'

2 days agoorg-capture: Fix number of blank lines with :unnarrowed option
Nicolas Goaziou [Tue, 23 May 2017 16:10:06 +0000 (18:10 +0200)]
org-capture: Fix number of blank lines with :unnarrowed option

* lisp/org-capture.el (org-capture-finalize): Remove blank lines
  number fix, which only applies to narrowed capture buffers.
(org-capture-insert-template-here):
(org-capture-place-plain-text):
(org-capture-place-item):
(org-capture-place-entry): Do not hard-code number of blank lines
after entry.

Reported-by: Igor Perepelytsya <igorquail@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113093>

Reported-by: Jay Dresser <jay@jaydresser.us>
<http://permalink.gmane.org/gmane.emacs.orgmode/113449>

3 days agoversion 5.4 of org-index.el: better focus-commands
U-IHM-NOTEBOOK\Olli [Mon, 22 May 2017 19:10:03 +0000 (21:10 +0200)]
version 5.4 of org-index.el: better focus-commands

3 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 22 May 2017 13:28:48 +0000 (15:28 +0200)]
Merge branch 'maint'

3 days agoorg-colview: Remove error upon summarizing non-numbers with a format string
Nicolas Goaziou [Mon, 22 May 2017 13:27:17 +0000 (15:27 +0200)]
org-colview: Remove error upon summarizing non-numbers with a format string

* lisp/org-colview.el (org-columns--displayed-value): Remove check.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Remove a test.

Reported-by: Hendrik Tews <hendrik@askra.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/113600>

3 days ago`org-fill-paragraph' handles region
Nicolas Goaziou [Mon, 22 May 2017 13:01:25 +0000 (15:01 +0200)]
`org-fill-paragraph' handles region

* lisp/org.el (org-fill-element): New function.
(org-fill-paragraph): Use new function.  Also handle region, when
called interactively.

* testing/lisp/test-org.el (test-org/fill-element): Renamed from
  test-org/fill-paragraph.  Update tests.

Reported-by: Oskar Kvist <oskar.kvist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113542>

3 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 22 May 2017 12:18:41 +0000 (14:18 +0200)]
Merge branch 'maint'

3 days agoorg-colview: Update new summarized value only when necessary
Nicolas Goaziou [Mon, 22 May 2017 12:17:01 +0000 (14:17 +0200)]
org-colview: Update new summarized value only when necessary

* lisp/org-colview.el (org-columns--compute-spec): Make sure current
  and new values do not differ only by leading or trailing blanks
  before replacing the former by the latter.

Reported-by: Hendrik Tews <hendrik@askra.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/113597>

4 days agoRemove `org-protect-slash'
Nicolas Goaziou [Mon, 22 May 2017 06:31:53 +0000 (08:31 +0200)]
Remove `org-protect-slash'

* lisp/org.el (org-protect-slash): Remove function.
(org-refile-get-targets): Apply removal.

This internal function is used only once throughout the code base.

4 days agoUpdate a test
Nicolas Goaziou [Mon, 22 May 2017 06:26:22 +0000 (08:26 +0200)]
Update a test

* testing/lisp/test-org.el (test-org/refile-get-targets): Update test.

4 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 22 May 2017 06:25:56 +0000 (08:25 +0200)]
Merge branch 'maint'

4 days agoPreserve targets order according to rules
Nicolas Goaziou [Mon, 22 May 2017 06:24:56 +0000 (08:24 +0200)]
Preserve targets order according to rules

* lisp/org.el (org-refile-get-targets): Keep targets grouped according
  to `org-refile-targets' value.

4 days agoAdd test for `org-refile-get-targets'
Nicolas Goaziou [Mon, 22 May 2017 06:21:50 +0000 (08:21 +0200)]
Add test for `org-refile-get-targets'

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

4 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 22 May 2017 06:19:12 +0000 (08:19 +0200)]
Merge branch 'maint'

4 days agoRemove duplicates in refile targets
Nicolas Goaziou [Mon, 22 May 2017 06:16:42 +0000 (08:16 +0200)]
Remove duplicates in refile targets

* lisp/org.el (org-refile-get-targets): Remove duplicates in refile
  targets.

4 days agoAdd tests for org-refile-get-targets
Nicolas Goaziou [Mon, 22 May 2017 00:17:32 +0000 (02:17 +0200)]
Add tests for org-refile-get-targets

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

Based on a patch from Sebastian Reuße <seb@wirrsal.net>.

4 days agoMerge branch 'maint'
Kyle Meyer [Sun, 21 May 2017 18:54:59 +0000 (14:54 -0400)]
Merge branch 'maint'

4 days agoorg-store-link: Don't roll C-u behavior into C-u C-u behavior
Kyle Meyer [Sun, 21 May 2017 05:16:58 +0000 (01:16 -0400)]
org-store-link: Don't roll C-u behavior into C-u C-u behavior

* lisp/org.el (org-store-link): When a double C-u prefix argument is
given, do not reverse the meaning of the org-context-in-file-links
option.
* testing/lisp/test-org.el (test-org/store-link): Add tests.

This allows the user to fall back to the core link storing functions
without also reversing their org-context-in-file-links preference,
because wanting to do the former does not mean a user also wants to do
the latter.

Reported-by: York Zhao <gtdplatform@gmail.com>
<https://lists.gnu.org/archive/html/emacs-orgmode/2017-05/msg00254.html>

5 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 21 May 2017 09:09:02 +0000 (11:09 +0200)]
Merge branch 'maint'

5 days agoorg-colview: Fix {X%} and {X/} on recursive summaries
Nicolas Goaziou [Sun, 21 May 2017 09:08:11 +0000 (11:08 +0200)]
org-colview: Fix {X%} and {X/} on recursive summaries

* lisp/org-colview.el (org-columns--summary-checkbox-count):
(org-columns--summary-checkbox-percent): Handle own output for higher
level summaries.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Add tests.

5 days agoMerge branch 'maint'
Kyle Meyer [Sat, 20 May 2017 23:00:45 +0000 (19:00 -0400)]
Merge branch 'maint'

5 days agoorg-git-link.el: Silence byte-compiler
Kyle Meyer [Sat, 20 May 2017 23:00:25 +0000 (19:00 -0400)]
org-git-link.el: Silence byte-compiler

* contrib/lisp/org-git-link.el (org-git-open): Replace obsolete
string-to-int with string-to-number.  Don't use goto-line
non-interactively.

5 days agoorg-git-link.el: Avoid cl.el aliases
Kyle Meyer [Sat, 20 May 2017 23:00:25 +0000 (19:00 -0400)]
org-git-link.el: Avoid cl.el aliases

* contrib/lisp/org-git-link.el (org-gitbare-open):
(org-git-open):
(org-git-find-gitdir):
(org-git-create-git-link): Prefer nth function to cl.el's first,
second, third.

org-git-link.el does not explicitly load cl.el, and variants without
the "cl-" prefix have been out of favor since Emacs 24.3.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 20 May 2017 22:07:56 +0000 (00:07 +0200)]
Merge branch 'maint'

5 days agoorg-colview: Fix estimate's summary
Nicolas Goaziou [Sat, 20 May 2017 22:06:31 +0000 (00:06 +0200)]
org-colview: Fix estimate's summary

* lisp/org-colview.el (org-columns--summary-estimate): Per last
  commit, do not make use of printf, since values are not numbers.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 20 May 2017 20:13:12 +0000 (22:13 +0200)]
Merge branch 'maint'

5 days agoorg-colview: Properly apply operator format strings on leaf nodes
Nicolas Goaziou [Sat, 20 May 2017 20:11:45 +0000 (22:11 +0200)]
org-colview: Properly apply operator format strings on leaf nodes

* lisp/org-colview.el (org-columns--displayed-value): When value is
a number and a format string is specified, apply it.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Add tests.

Reported-by: Hendrik Tews <hendrik@askra.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/113547>

6 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 20 May 2017 07:10:13 +0000 (09:10 +0200)]
Merge branch 'maint'

6 days agoFix "Stack overflow in regexp matcher" in `org-refresh-stats-properties'
Nicolas Goaziou [Sat, 20 May 2017 07:09:03 +0000 (09:09 +0200)]
Fix "Stack overflow in regexp matcher" in `org-refresh-stats-properties'

* lisp/org.el (org-refresh-stats-properties): Simplify regexp.  Small
  refactoring.

Reported-by: Kevin Zettler <kevzettler@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113555>

6 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 19 May 2017 14:30:07 +0000 (16:30 +0200)]
Merge branch 'maint'

6 days agoorg-element: Fix suprious "nil" in dynamic-block interpreter
Nicolas Goaziou [Fri, 19 May 2017 14:29:12 +0000 (16:29 +0200)]
org-element: Fix suprious "nil" in dynamic-block interpreter

* lisp/org-element.el (org-element-dynamic-block-interpreter): Ignore
  empty arguments instead of displaying "nil".

Reported-by: John Kitchin <jkitchin@andrew.cmu.edu>
<http://permalink.gmane.org/gmane.emacs.orgmode/113551>

6 days agoorg-capture.el: Fix handling of variable capture location
Yuri D. Lensky [Mon, 13 Mar 2017 00:58:15 +0000 (17:58 -0700)]
org-capture.el: Fix handling of variable capture location

* lisp/org-capture.el (org-capture-expand-file): Fix handling of
  variable capture location.

7 days agoorg-agenda: Friendlier agenda tag filter user interface
Marco Wahl [Fri, 19 May 2017 07:17:05 +0000 (09:17 +0200)]
org-agenda: Friendlier agenda tag filter user interface

* lisp/org-agenda.el (org-agenda-filter-by-tag): Added little texts
  for the tag-char item and the tag-chooser item.

7 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 19 May 2017 07:09:52 +0000 (09:09 +0200)]
Merge branch 'maint'

7 days agoorg-clock: Fix missing properties in Clock table
Nicolas Goaziou [Sat, 18 Feb 2017 19:22:30 +0000 (20:22 +0100)]
org-clock: Fix missing properties in Clock table

* lisp/org-clock.el (org-clocktable-write-default): Do not ignore
  properties specified by :properties parameter.

* testing/lisp/test-org-clock.el (test-org-clock/clocktable/properties):
  New test.

The regression was introduced in b897ab722.

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

7 days agoMerge branch 'maint'
Kyle Meyer [Thu, 18 May 2017 18:50:42 +0000 (14:50 -0400)]
Merge branch 'maint'

7 days agoorg-sort: Read compare-func in interactive calls
Kyle Meyer [Tue, 9 May 2017 18:57:40 +0000 (14:57 -0400)]
org-sort: Read compare-func in interactive calls

* lisp/org-macs.el (org-read-function): New function.
* lisp/org-table.el (org-table-sort-lines): Make WITH-CASE an optional
argument to match org-sort-entries and org-sort-list.
* lisp/org.el (org-sort-entries):
* lisp/org-table.el (org-table-sort-lines):
* lisp/org-list.el (org-sort-list): Read COMPARE-FUNC when called
interactively rather than being restricted to the default behavior of
sort-subr's PREDICATE parameter.  Only prompt for for GETKEY-FUNC and
COMPARE-FUNC during an interactive call, like org-table-sort-lines
already did for GETKEY-FUNC, but use an argument rather than relying
on the brittle called-interactively-p.

Suggested-by: Zhitao Gong <zhitaao.gong@gmail.com>
<https://lists.gnu.org/archive/html/emacs-orgmode/2017-05/msg00040.html>

8 days agoorg-refile: Fix inconsistency when listing refile targets
Sebastian Reuße [Mon, 15 May 2017 12:54:55 +0000 (14:54 +0200)]
org-refile: Fix inconsistency when listing refile targets

* org.el (org-refile-get-targets): Setting org-refile-use-outline-path
to `file' or `buffer-name' causes an additional target for the file’s
root node to be inserted. This functionality was absent when using
`full-file-path'. We now add this since it is convenient and makes the
behavior more consistent.

10 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 15 May 2017 16:29:23 +0000 (18:29 +0200)]
Merge branch 'maint'

10 days agoFontify inline source blocks when exporting to HTML
Nicolas Berthier [Mon, 15 May 2017 15:35:52 +0000 (16:35 +0100)]
Fontify inline source blocks when exporting to HTML

* lisp/ox-html.el (org-html-inline-src-block): Fontify inline source
blocks.

10 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 15 May 2017 12:05:19 +0000 (14:05 +0200)]
Merge branch 'maint'

10 days agoorg.texi: Silence Texinfo
Nicolas Goaziou [Mon, 15 May 2017 12:04:38 +0000 (14:04 +0200)]
org.texi: Silence Texinfo

* doc/org.texi (HTML Specific export settings): Silence Texinfo.

11 days agoMerge branch 'maint'
Nicolas Goaziou [Mon, 15 May 2017 06:41:31 +0000 (08:41 +0200)]
Merge branch 'maint'

11 days agoorg.texi: Fix typo release_9.0.7
Nicolas Goaziou [Mon, 15 May 2017 06:41:12 +0000 (08:41 +0200)]
org.texi: Fix typo

* doc/org.texi (Tables in @LaTeX{} export): Fix typo.

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

11 days agoMerge branch 'maint'
Kyle Meyer [Mon, 15 May 2017 04:04:16 +0000 (00:04 -0400)]
Merge branch 'maint'

11 days agoBackport commit 3c4c8ca06 from Emacs
Philipp Stephani [Sat, 6 May 2017 17:16:49 +0000 (19:16 +0200)]
Backport commit 3c4c8ca06 from Emacs

* lisp/ob-ref.el (org-babel-ref-resolve): Fix unescaped character
literal.

Fix all unescaped character literals
3c4c8ca06e3306ccbcd07e354eb51abe53b52d22
Philipp Stephani
Sun May 7 13:22:34 2017 +0200

11 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 14 May 2017 22:35:12 +0000 (00:35 +0200)]
Merge branch 'maint'

11 days agoorg-clock: Disambiguate character syntax
Nicolas Goaziou [Sun, 14 May 2017 22:34:58 +0000 (00:34 +0200)]
org-clock: Disambiguate character syntax

* lisp/org-clock.el (org-clock-put-overlay): Escape character in
  character syntax.

11 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 14 May 2017 22:20:03 +0000 (00:20 +0200)]
Merge branch 'maint'

11 days agoorg.texi: Fix Texinfo compilation
Nicolas Goaziou [Sun, 14 May 2017 22:19:41 +0000 (00:19 +0200)]
org.texi: Fix Texinfo compilation

11 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 14 May 2017 21:54:39 +0000 (23:54 +0200)]
Merge branch 'maint'

11 days agoEditorial revisions to the manual
Lambda Coder [Sun, 14 May 2017 21:43:33 +0000 (23:43 +0200)]
Editorial revisions to the manual

* doc/org.texi: Exporting chapter

12 days agoAdjust `org-at-timestamp-p' behavior
Nicolas Goaziou [Sun, 14 May 2017 08:38:26 +0000 (10:38 +0200)]
Adjust `org-at-timestamp-p' behavior

* lisp/org.el (org-at-timestamp-p): Change optional argument
  behaviour.  Remove interactive call.
(org-follow-timestamp-link):
(org-get-repeat):
(org-auto-repeat-maybe):
(org-time-stamp):
(org-timestamp-up-day):
(org-timestamp-down-day):
(org-toggle-timestamp-type):
(org-timestamp-change):
(org-goto-calendar):
(org-date-from-calendar):
(org-shiftup):
(org-shiftdown):
(org-shiftright):
(org-shiftleft):
(org-org-menu):
(org-fill-paragraph-with-timestamp-nobreak-p):
(org-shiftcontrolup):
(org-shiftcontroldown):
* lisp/org-agenda.el (org-agenda-date-later):
(org-agenda-date-prompt):
* lisp/org-clock.el (org-clock-timestamps-change):
* lisp/org-mouse.el (org-mouse-delete-timestamp):
(org-mouse-context-menu):
* lisp/org-table.el (org-table-copy-down): Update callers.

* testing/lisp/test-org.el (test-org/at-timestamp-p): Add tests.

12 days agoorg-element: Do not parse timestamps within planning line
Nicolas Goaziou [Sun, 14 May 2017 08:25:13 +0000 (10:25 +0200)]
org-element: Do not parse timestamps within planning line

* lisp/org-element.el (org-element-context): Do not parse timestamps
  within planning line.
* testing/lisp/test-org-element.el (test-org-element/context): Remove test.

Strictly speaking, timestamps within planning lines are parameters
values that use timestamp syntax, not real timestamps belonging to the
document contents.

12 days agoFix typo in code comment
Nicolas Goaziou [Sat, 13 May 2017 22:21:18 +0000 (00:21 +0200)]
Fix typo in code comment

13 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 13 May 2017 07:21:31 +0000 (09:21 +0200)]
Merge branch 'maint'

13 days agoorg-element: Fix $...$ fragments followed by an apostrophe
Nicolas Goaziou [Sat, 13 May 2017 07:18:07 +0000 (09:18 +0200)]
org-element: Fix $...$ fragments followed by an apostrophe

* lisp/org-element.el (org-element-latex-fragment-parser):
* lisp/org.el (org-latex-regexps): Allow an apostrophe right after
  a fragment.

* testing/lisp/test-org-element.el (test-org-element/latex-fragment-parser):
  Add test.

In Text mode, and, as a consequence, in Org mode, "'" is not treated
as punctuation, but as word constituent.  The apostrophe isn't caught
by "\s." regexp.

Reported-by: Joe Corneli <holtzermann17@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113464>

13 days agoTiny fix
Nicolas Goaziou [Fri, 12 May 2017 15:45:46 +0000 (17:45 +0200)]
Tiny fix

* lisp/org.el (org-N-empty-lines-before-current): Insert empty lines
  before point, not after.
* testing/lisp/test-org.el (test-org/insert-heading): Add test.

2 weeks agoorg-agenda: Small refactoring
Nicolas Goaziou [Thu, 11 May 2017 23:19:51 +0000 (01:19 +0200)]
org-agenda: Small refactoring

* lisp/org-agenda.el (org-agenda-bulk-action): Small refactoring. Two
  `eval' less in the code base.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 11 May 2017 22:40:22 +0000 (00:40 +0200)]
Merge branch 'maint'

2 weeks agoorg-agenda: Fix logging with bulk-deadlining
Nicolas Goaziou [Thu, 11 May 2017 22:39:06 +0000 (00:39 +0200)]
org-agenda: Fix logging with bulk-deadlining

* lisp/org-agenda.el (org-agenda-bulk-action): Do not request logging
  writing a note when multiple entries are being re-deadline'd at the
  same time.

Reported-by: Allen Li <darkfeline@felesatra.moe>
<http://permalink.gmane.org/gmane.emacs.orgmode/113426>

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Thu, 11 May 2017 22:15:46 +0000 (00:15 +0200)]
Merge branch 'maint'

2 weeks agoorg-agenda: Fix consecutive bulk marks on the same task
Nicolas Goaziou [Thu, 11 May 2017 22:13:09 +0000 (00:13 +0200)]
org-agenda: Fix consecutive bulk marks on the same task

* lisp/org-agenda.el (org-agenda-bulk-unmark-all): Do not reset
  markers stored in `org-agenda-bulk-marked-entries'.  These markers
  are not specific to bulk actions and need not be modified by
  side-effect.

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

2 weeks agoMerge branch 'maint'
Kyle Meyer [Tue, 9 May 2017 18:49:59 +0000 (14:49 -0400)]
Merge branch 'maint'

2 weeks agoAdd tests for org-sort-list and org-sort-entries
Kyle Meyer [Tue, 9 May 2017 18:40:19 +0000 (14:40 -0400)]
Add tests for org-sort-list and org-sort-entries

* testing/lisp/test-org-list.el:
* testing/lisp/test-org.el: New test.

2 weeks agoorg-link-edit.el: Sync with upstream
Kyle Meyer [Tue, 9 May 2017 18:48:07 +0000 (14:48 -0400)]
org-link-edit.el: Sync with upstream

Update to version 1.1.1 (e975aebf8).

2 weeks agoorg-attach: Silence byte-compiler
Nicolas Goaziou [Tue, 9 May 2017 15:51:32 +0000 (17:51 +0200)]
org-attach: Silence byte-compiler

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

2 weeks agolisp/org-attach.el (org-attach-attach): Add dired-dwim-target-directory
Oleh Krehel [Tue, 9 May 2017 15:30:18 +0000 (17:30 +0200)]
lisp/org-attach.el (org-attach-attach): Add dired-dwim-target-directory

Use case: have two windows open side-by-side. One has an Org-mode
file, the other - a Dired buffer with a file we want to attach.

With this change, and user's `dired-dwim-target' setting, the prompt
for file to attach will start in the Dired buffer's directory.

2 weeks agoorg-sort: Go back to calling org-sort-* functions interactively
Kyle Meyer [Tue, 9 May 2017 03:56:28 +0000 (23:56 -0400)]
org-sort: Go back to calling org-sort-* functions interactively

* lisp/org.el (org-sort): Revert change from c1addc825 that replaced
org-call-with-arg with funcall because org-table-sort-lines changes
its behavior based on the return value of called-interactively-p.

2 weeks agoorg-sort: Call org-sort-* functions non-interactively
Kyle Meyer [Mon, 8 May 2017 15:13:19 +0000 (11:13 -0400)]
org-sort: Call org-sort-* functions non-interactively

* lisp/org.el (org-sort): Use funcall instead of org-call-with-arg,
and make WITH-CASE an optional argument.
* lisp/org-table.el (org-table-sort-lines): Make WITH-CASE an optional
argument.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 8 May 2017 09:39:34 +0000 (11:39 +0200)]
Merge branch 'maint'

2 weeks agoob-gnuplot: escape % character in output
Thierry Banel [Mon, 8 May 2017 09:38:45 +0000 (11:38 +0200)]
ob-gnuplot: escape % character in output

lisp/ob-gnuplot.el (org-babel-execute:gnuplot): escape % percent
character in output messages coming from GnuPlot.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 8 May 2017 09:26:33 +0000 (11:26 +0200)]
Merge branch 'maint'

2 weeks agoob-core: Fix regression
Nicolas Goaziou [Mon, 8 May 2017 09:25:17 +0000 (11:25 +0200)]
ob-core: Fix regression

* lisp/ob-core.el (org-babel-balanced-split): Fix regression
  introduced in 500abcd7fbe24abc887300faec2058905a13fa33.

* testing/lisp/test-ob.el (test-ob/balanced-split): Add tests.

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

2 weeks agoox-publish: Add missing `file-truename'
Nicolas Goaziou [Mon, 8 May 2017 06:48:40 +0000 (08:48 +0200)]
ox-publish: Add missing `file-truename'

* lisp/ox-publish.el (org-publish--expand-file-name): Add missing
  `file-truename'.

2 weeks agoORG-NEWS: Update new features
Sebastian Reuße [Sat, 6 May 2017 19:04:19 +0000 (21:04 +0200)]
ORG-NEWS: Update new features

2 weeks agoorg-refile: Optionally prefix refile targets with buffer name
Sebastian Reuße [Sat, 6 May 2017 06:38:45 +0000 (08:38 +0200)]
org-refile: Optionally prefix refile targets with buffer name

* org.el (org-refile-get-targets): Add case to optionally prefix
refile targets with the buffer name.
(org-refile-use-outline-path): Add new option setting and document.

Having an option to use the buffer name as a prefix is convenient,
since this will work hand in hand with uniquify to only show those
parts of the filesystem path needed to disambiguate buffers of
identically named files, as opposed to prefixing refile targets with
the full filesystem path.

2 weeks agoorg-refile: Escape slashes only in headline of refile target
Sebastian Reuße [Sat, 6 May 2017 06:38:44 +0000 (08:38 +0200)]
org-refile: Escape slashes only in headline of refile target

* org.el (org-refile-get-targets): Only escape slashes in headline
part of refile target; leave any file-system path component (when
enabled) unescaped.

The reason to escape slashes in refile targets is to make it clear
when a slash was part of a headline vs. part of the outline path.  It
makes sense to treat slashes in the file system part the same way as
outline paths, since this won’t result in any confusion and serves to
make target selection less noisy.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sat, 6 May 2017 07:03:14 +0000 (09:03 +0200)]
Merge branch 'maint'

2 weeks agoox-s5: Update to work with refactored HTML backend
Łukasz Stelmach [Thu, 4 May 2017 18:01:44 +0000 (20:01 +0200)]
ox-s5: Update to work with refactored HTML backend

* contrib/lisp/ox-s5.el (org-s5-template): Adapt to changes introduced
by c9ca0b6d in the way :html-divs/org-html-divs are passed to ox-html.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 5 May 2017 21:23:29 +0000 (23:23 +0200)]
Merge branch 'maint'

2 weeks agoox-publish: Consistently cache properties
Nicolas Goaziou [Fri, 5 May 2017 21:22:23 +0000 (23:22 +0200)]
ox-publish: Consistently cache properties

* lisp/ox-publish.el (org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Use `file-truename' so that
caching keys do not depend on links in the file name.

2 weeks agoox-publish: Fix last commit
Nicolas Goaziou [Fri, 5 May 2017 17:56:58 +0000 (19:56 +0200)]
ox-publish: Fix last commit

* lisp/ox-publish.el (org-publish-get-project-from-filename): Fix last
  commit.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 5 May 2017 17:52:55 +0000 (19:52 +0200)]
Merge branch 'maint'

2 weeks agoox-publish: Use file true name as reference
Nicolas Goaziou [Thu, 4 May 2017 07:53:46 +0000 (09:53 +0200)]
ox-publish: Use file true name as reference

* lisp/ox-publish.el (org-publish-file): Use file true name as
  reference.

2 weeks agoox-publish: Small refactoring
Nicolas Goaziou [Thu, 4 May 2017 07:20:23 +0000 (09:20 +0200)]
ox-publish: Small refactoring

* lisp/ox-publish.el (org-publish-file): Use function dedicated to
  files instead of string related ones.  Small refactoring.
(org-publish-cache-get-file-property): Small refactoring.

2 weeks agoox-publish: Fix publishing filenames with symbolic links
Nicolas Goaziou [Wed, 3 May 2017 15:05:54 +0000 (17:05 +0200)]
ox-publish: Fix publishing filenames with symbolic links

* lisp/ox-publish.el (org-publish-get-project-from-filename):
(org-publish-attachment):
(org-publish-projects):
(org-publish-org-sitemap): Use file comparison functions instead of
string ones so as to properly handle symbolic links in filenames.

3 weeks ago * lisp/org-archive.el (org-archive-subtree): Honor
Carsten Dominik [Fri, 5 May 2017 09:59:10 +0000 (11:59 +0200)]
* lisp/org-archive.el (org-archive-subtree): Honor
`org-archive-reversed-order' also on top level.