Commit Graph

18378 Commits

Author SHA1 Message Date
Nicolas Goaziou b2411769cf Merge branch 'maint' 2016-04-19 21:31:30 +02:00
Nicolas Goaziou 21ef130752 ox-odt: Fix styles location
* lisp/ox-odt.el (org-odt-styles-dir-list): Point to correct location
  for styles.

Reported-by: Colin Baxter <m43cap@yandex.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106209>
2016-04-19 21:30:39 +02:00
Nicolas Goaziou dbda42010c org-agenda: Fix "Void variable org-clock-current-task"
* lisp/org-agenda.el (org-agenda-mark-clocking-task):
(org-agenda-clock-goto): `org-clock-current-task' may not be defined, so
check that first.

Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106504>
2016-04-19 21:14:54 +02:00
Nicolas Goaziou 7894129841 Merge branch 'maint' 2016-04-19 01:37:50 +02:00
Nicolas Goaziou 77b4fad528 Remove duplicate candidates when setting tags
* lisp/org.el (org-set-tags): Remove duplicate candidates from menu.
2016-04-19 01:34:27 +02:00
Nicolas Goaziou 2a49038fd6 org-pcomplete: Fix TAGS completion
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/tags):
(pcomplete/org-mode/tag): Use new `org-current-tag-alist' instead of
`org-tag-alist' so as to take `org-tag-persistent-alist' into
consideration.
2016-04-18 19:34:08 +02:00
Nicolas Goaziou 9297757fc0 Fix tag related defcustoms
* lisp/org.el (org-tag-alist):
(org-tag-persistent-alist): Improve docstring. Fix values.
2016-04-18 18:08:53 +02:00
Nicolas Goaziou 4743d43dd8 Properly handle `org-tag-persistent-alist'
* lisp/org.el (org-current-tag-alist): New variable.
(org-set-tags):
(org-global-tags-completion-table):
(org-agenda-prepare-buffers): Use new variable.
(org-set-regexps-and-options): Use new variable.  Handle STARTUP early
so that "#+STARTUP: noptag" is taken into consideration.

* lisp/org-agenda.el (org-agenda-bulk-action): Use new variable.

* lisp/org-mobile.el (org-mobile-create-index-file): `org-tag-alist' is
  no longer buffer-local.

* testing/lisp/test-org.el (test-org/set-regexps-and-options): Add
  tests.
2016-04-18 18:07:40 +02:00
Nicolas Goaziou 74d3bd484f Factorize tags parsing
* lisp/org.el (org-tag-string-to-alist):
(org-tag-alist-to-string):
(org-tag-alist-to-groups): New functions.
(org-set-regexps-and-options): Use new functions.

(org--setup-process-tags): Remove function.

(org--setup-collect-keywords): Return tag groups as a string instead of
a list so as to be compatible with new functions.

* lisp/org-mobile.el (org-mobile-create-index-file): Use new functions.

* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/tags): Use new
  functions.
(pcomplete/org-mode/tag): Small refactoring.

* testing/lisp/test-org.el (test-org/tag-string-to-alist):
(test-org/tag-alist-to-string):
(test-org/tag-alist-to-groups): New tests.
2016-04-18 17:40:15 +02:00
Nicolas Goaziou d87158ba2a Merge branch 'maint' 2016-04-16 11:38:25 +02:00
Nicolas Goaziou e0acd8a15a Fix "Invalid time zone specification" error
* lisp/org.el (org-timestamp-change): Correctly handle `encode-time'
  parameters.

Suggested-by: Derek Feichtinger <dfeich@gmail.com>
Reported-by: Eric Abrahamsen <eric@ericabrahamsen.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/106344>
2016-04-16 11:35:43 +02:00
Nicolas Goaziou da9fb9eacd Merge branch 'maint' 2016-04-16 11:31:01 +02:00
Nicolas Goaziou e3656b6b2e org.texi: Fix typo
* doc/org.texi (Timers): Fix typo.

Reported-by: Lee <maplainfly@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106430>
2016-04-16 11:30:31 +02:00
Nicolas Goaziou 9314380284 Merge branch 'maint' 2016-04-14 09:18:00 +02:00
Nicolas Goaziou 846467b718 Fix typo
* lisp/org.el (org-property--local-values): Fix typo in doc string.
2016-04-14 09:17:34 +02:00
Nicolas Goaziou 3135d24239 ox-ascii: Small refactoring
* lisp/ox-ascii.el (org-ascii--describe-links): Small refactoring.
2016-04-13 23:50:15 +02:00
Nicolas Goaziou 602fca424d Merge branch 'maint' 2016-04-13 23:48:27 +02:00
Nicolas Goaziou 297315c46a org-capture: Fix invalid table line specification
* lisp/org-capture.el (org-capture-place-table-line): Move point in
  front of the table before trying to analyze it.

Reported-by: Christian Moe <mail@christianmoe.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106356>
2016-04-13 23:47:36 +02:00
Nicolas Goaziou 2aa7c34bb5 ob-lisp: Fix error when evaluating a lisp src-block
* lisp/ob-lisp.el (org-babel-lisp-eval-fn): Change values to functions
  instead of strings.
(org-babel-execute:lisp): Apply change.
2016-04-13 23:29:41 +02:00
Nicolas Goaziou a57a93e3f6 Merge branch 'maint' 2016-04-13 23:18:29 +02:00
Nicolas Goaziou 9b5f2a03ea ox-ascii: Fix export of links in headlines
* lisp/ox-ascii.el (org-ascii--unique-links):
(org-ascii-headline):
(org-ascii-section): Fix export of links in headlines.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106338>
2016-04-13 23:16:25 +02:00
Nick Dokos 16ad80fe34 Fix the paragraph on tag groups as regular expressions.
Reword the paragraph and fix the regexps to include
the requisite @ signs.
2016-04-13 10:59:09 -04:00
Nicolas Goaziou 1581da82be ob-lisp: Default evaluator is SLIME
* lisp/ob-lisp.el (org-babel-lisp-eval-fn): Set default value to
  "slime-eval".
2016-04-12 22:12:11 +02:00
Nick Dokos 476211ac73 ob-lisp: Fix typo in doc string
* lisp/ob-lisp.el (org-babel-lisp-eval-fn): Fix typo.
2016-04-12 22:10:54 +02:00
Kyle Meyer 634e12a31e Merge branch 'maint' 2016-04-11 00:32:43 -04:00
Kyle Meyer acfd411193 Update format-time-string calls for argument change
* lisp/org.el (org-timestamp-format):
* lisp/ox-icalendar.el (org-icalendar-convert-timestamp): Specify t for
  the ZONE argument of format-time-string to indicate UTC.

As of Emacs's af32fa9 (New optional ZONE arg for format-time-string
etc., 2015-07-26), UTC is indicated by passing t as the third argument
to format-time-string rather than any non-nil value.

This change is in place of a backport of Emacs's b787d55 (More
format-time-string change fixups, 2016-04-02), which would not work for
earlier versions of Emacs.
2016-04-11 00:32:08 -04:00
Nicolas Goaziou 492d68c936 Add ODT to default export back-ends
* lisp/org.el (org-export-backends): Add `odt' to default value.

Reported-by: Uwe Brauer <oub@mat.ucm.es>
<http://permalink.gmane.org/gmane.emacs.orgmode/106198>
2016-04-10 10:22:38 +02:00
Erik Hetzner f97317abcb org-attach: Use relative path for git annex
* lisp/org-attach.el (org-attach-annex-get-maybe): Use relative path as
  argument for git annex.  Fixes error in test with version 3 of git
  annex.
2016-04-10 10:13:57 +02:00
stardiviner d79835a821 ob-lisp: Add SLY support
* ob-lisp.el (org-babel-lisp-eval-fn): New variable.
(org-babel-execute:lisp): Support using SLY to evaluate lisp src block.

Let user can evaluate Lisp src block with SLY.

Modified from a patch proposal by stardiviner.

TINYCHANGE
2016-04-10 10:07:38 +02:00
Ethan Ligon a6ccd4ad95 org.texi: Replace broken example script for batch execution
* doc/org.texi: Example bash script to tangle from *.org file was broken
and obsolete; fixed to now work with recent versions of Org.

There is an example bash script in section  14.12 of the Org manual which
is meant to tangle source blocks from a supplied list of Org files.

The present version is broken in several small ways (it appears to date
from a period when babel was still part of contrib), and requires a
hard-coded specification of the path ORG_HOME.

I've fixed the issue with ORG_HOME, another issue with grepping for strings
that no longer are emitted by ob-tangle, and removed some obsolete
dependencies.

I'm finding the corrected script a useful thing to call from makefiles.
2016-04-09 23:16:39 +02:00
Michael Strey 0fac70ea89 org.el: Fix bug from switch to lexical binding
* lisp/org.el (org-check-dates-range): Fix a bug introduces with the
  switch to lexical binding in commit
  1f49e9fdfd.

This change fixed the following bug:  C-c \ D leads to error message "Symbol's value as variable is void: start-date".

TINYCHANGE
2016-04-08 23:12:42 +02:00
Nicolas Goaziou ea98632e3b Merge branch 'maint' 2016-04-08 22:52:32 +02:00
Nicolas Goaziou d522fc8853 orgguide: Fix mis-uses of itemx
* doc/orgguide.texi (Agenda commands): Fix mis-uses of itemx.

Reported-by: Jean-Christophe Helary <jean.christophe.helary@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106211>
2016-04-08 22:51:04 +02:00
Rasmus 519f78d1a3 ox-koma-letter: Changes to LOCATION handling
* ox-koma-letter.el (options): Parse LOCATION and remove
  :with-location and :inbuffer-with-location.
  (org-koma-letter--get-tagged-contents): Change string handling.
  (org-koma-letter--get-value): Simplify function.
  (org-koma-letter-use-location): remove
2016-04-07 10:03:03 +02:00
Myles English a0e942544c ox-koma-letter: Fixed bug in filling 'location' field
* contrib/lisp/ox-koma-letter.el: Fix code apparently introduced
  in 3ee3663
2016-04-07 10:03:03 +02:00
Nicolas Goaziou 4bc07758a5 Merge branch 'maint' 2016-04-06 22:28:16 +02:00
Nicolas Goaziou 9c6811b9d4 ox-texinfo: Fix erroneous count of blank lines in menu
* lisp/ox-texinfo.el (org-texinfo-section):
(org-texinfo--build-menu): Normalize empty lines in generated menu.

Reported-by: Jonas Bernoulli <jonas@bernoul.li>
<http://permalink.gmane.org/gmane.emacs.orgmode/106145>
2016-04-06 22:26:42 +02:00
Nicolas Goaziou 716e339c96 Allow angular links within link descriptions
* lisp/org-element.el (org-element-object-restrictions):
(org-element--object-lex): Allow angular links as equivalent to plain
links in description.

* testing/lisp/test-org-element.el (test-org-element/link-parser): Add
  test.
2016-04-06 11:08:53 +02:00
Nicolas Goaziou 64ca6f2c24 Keep headlines named like current one in refile targets
* lisp/org.el (org-refile-get-targets): Change signature.
(org-refile-get-location): Change signature.  Also apply change above.
(org-goto):
(org-refile): Apply change above.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106051>
2016-04-05 23:45:37 +02:00
Nicolas Goaziou 0e0a72443a org-agenda: Fix Invalid Function 4 error
* lisp/org-agenda.el (org-tags-view): Fix wrong conversion introduced in
  commit a02a83793b.

Reported-by: Ian Dunn <dunni@gnu.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/106080>
2016-04-05 23:31:21 +02:00
Paul Schorfheide cd47ab7411 ox-confluence: Add `org-confluence-lang-alist'
* ox-confluence.el (org-confluence-src-block): Add var for mapping
language name.

TINYCHANGE
2016-04-02 10:56:05 +02:00
Nicolas Goaziou 506ff0d76e ORG-NEWS: Document NAME handling for blocks 2016-04-02 10:44:09 +02:00
Myles English 3ee36639f0 ox-koma-letter: Add support for LOCATION
* contrib/lisp/ox-koma-letter.el (koma-letter): Duplicated code
  used for 'place' variable, renamed as 'location'

Whenever OPTION keyword contains a 'location' item or LOCATION
keyword is used in the buffer, set KOMA option 'location' after
LCO inclusion.
2016-03-31 21:50:11 +02:00
Rasmus 600c5c1b4b ox-koma-letter: Small change
ox-koma-letter.el (org-koma-letter--build-settings): Simplify code.
	(org-koma-letter--get-tagged-contents): Treat strings before
	return.
2016-03-31 21:49:45 +02:00
Rasmus 012346f564 ox-koma-letter: Allow buffer FROM keyword
* ox-koma-letter.el (koma-letter backend): Add :inbuffer-from.
  (org-koma-letter--get-tagged-contents): Check that value is not empty.
  (org-koma-letter-template): Remove from address block from
  template and find to address directly.
  (org-koma-letter--build-settings): Determine from address.
  (org-koma-letter--special-contents-inline): Remove function.
2016-03-31 21:43:52 +02:00
Rasmus 8eadcd3c31 ox-koma-letter: Add after_closing and cleanup
* ox-koma-letter.el
  (org-koma-letter-special-tags-after-closing): Add after_closing.
  (org-koma-letter-special-tags-as-macro): New defvar.
  (koma-letter backend): Revamp special tags options.
  (org-koma-letter--get-value): Rewrite function.
  (org-koma-letter--keyword-or-headline): Get special tags dynamically
  (org-koma-letter-template): Use new specifications.
2016-03-31 21:31:21 +02:00
Rasmus 8ba48e47d5 ox-koma-letter: Fix docstring
* ox-koma-letter.el (org-koma-letter-special-tags-as-macro): Fix docstring.
2016-03-31 21:31:21 +02:00
Nicolas Goaziou f07580066e ox-html: Silence byte-compiler 2016-03-30 17:18:47 +02:00
Nicolas Goaziou 3149a01513 Merge branch 'maint' 2016-03-30 17:17:51 +02:00
Nicolas Goaziou cb683e3a56 ox-html: Fix planning info export
* lisp/ox-html.el (org-html-planning): Properly escape angle brackets in
  time-stamps.

Reported-by: Keith Sutton <kesutt@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/105945>
2016-03-30 17:17:07 +02:00