Commit Graph

20044 Commits

Author SHA1 Message Date
Grant Rettke 6d50e167ca 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
2017-07-14 11:25:33 +02:00
Nicolas Goaziou e59718e9c3 Merge branch 'maint' 2017-07-14 10:40:47 +02:00
Nicolas Goaziou 8d9854ca8a org-capture: Fix last commit
* lisp/org-capture.el (org-capture-fill-template): %K link
  specifically targets a headline.  Also provide a description.
2017-07-14 10:40:03 +02:00
Nicolas Goaziou 0fe685f119 org-duration: Fix copyright 2017-07-14 10:30:02 +02:00
Nicolas Goaziou 0c9feb660a Merge branch 'maint' 2017-07-13 14:26:12 +02:00
Nicolas Goaziou 3315bd1118 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>
2017-07-13 14:08:20 +02:00
Nicolas Goaziou e07392cf41 Merge branch 'maint' 2017-07-13 11:00:17 +02:00
Chunyang Xu a8e13b9ffc library-of-babel: Fix typo
* doc/library-of-babel.org: Replace non-existent with-temp-filebuffer.

TINYCHANGE
2017-07-13 10:00:58 +02:00
Nicolas Goaziou 1c07327a51 Merge branch 'maint' 2017-07-12 14:12:32 +02:00
Yuri D. Lensky b3c54c1119 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.
2017-07-12 14:11:53 +02:00
Alex Branham f88f913c35 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
2017-07-11 10:02:45 +02:00
Nicolas Goaziou 163c84f2ee Merge branch 'maint' 2017-07-10 10:58:42 +02:00
Nicolas Goaziou 60eda8e4ec 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 112c5ba479.

Reported-by: Dale Sedivec <dale@codefu.org>
2017-07-10 10:56:56 +02:00
Nicolas Goaziou f8d0ef1b52 Merge branch 'maint' 2017-07-10 10:23:26 +02:00
Jay Kamat a8ee8e1e50 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
2017-07-10 10:07:58 +02:00
Kyle Meyer d39ccc17d4 Merge branch 'maint' 2017-07-09 11:28:54 -04:00
Paul Eggert b7fdc30388 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
2017-07-09 11:27:12 -04:00
Glenn Morris 4abe197403 Backport commit 0fda6d53e from Emacs
; Standardize some copyright and license notices
0fda6d53e38cc7073186fed0bd862221d21500ab
Glenn Morris
Wed Jul 5 14:08:35 2017 -0400
2017-07-09 11:27:12 -04:00
Glenn Morris ef742df8b5 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
2017-07-09 11:27:10 -04:00
Florian Lindner da99ee0fa6 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.
2017-07-09 17:16:24 +02:00
Marco Wahl 360109e6c7 Merge branch 'maint' 2017-07-08 23:32:10 +02:00
Marco Wahl 4b4f659d74 doc/org.texi (Easy templates): unified the notation. 2017-07-08 23:29:49 +02:00
Kaushal Modi 73907bee5b Merge branch 'maint' 2017-07-07 17:35:41 -04:00
Kaushal Modi 21df3a3c2f 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).
2017-07-07 17:18:22 -04:00
Nicolas Goaziou 97a1a49895 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.
2017-07-07 18:23:10 +02:00
Nicolas Goaziou fd6a6b5cb4 Merge branch 'maint' 2017-07-06 19:21:48 +02:00
Jan Seeger 1849f391bc 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
2017-07-06 19:21:06 +02:00
Nicolas Goaziou c3bc1d2592 Merge branch 'maint' 2017-07-06 19:14:16 +02:00
Nicolas Goaziou 61ffe97885 ob-comint: Remove unnecessary (require 'tramp)
* lisp/ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  Remove unnecessary cache flush.
2017-07-06 19:10:28 +02:00
Marco Wahl 6a64c34863 Merge branch 'timer-stop-binding-for-agenda' 2017-07-05 12:36:18 +02:00
Marco Wahl 2b5ce91b35 org-timer: Fix timer setting from effort property
Testcase included.
2017-07-05 12:33:47 +02:00
Marco Wahl f70832333b org-agenda:added binding to stop timer 2017-07-05 11:05:36 +02:00
Rasmus acabacaa56 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>
2017-07-04 18:50:39 +02:00
Nicolas Goaziou 8c548b81b9 Merge branch 'maint' 2017-07-04 01:13:03 +02:00
Nicolas Goaziou a3d02c49a0 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>
2017-07-04 01:11:57 +02:00
Nicolas Goaziou a20c17fa51 Merge branch 'maint' 2017-07-04 00:20:12 +02:00
Nicolas Goaziou cc5a9bf538 Fix wrong data in clock table using :block
* lisp/org.el (org-2ft): Use new signature for
  `org-parse-time-string'.
2017-07-04 00:19:47 +02:00
Rasmus 2e02581cbf Merge branch 'maint' 2017-07-03 12:05:47 +02:00
Rasmus ad8e508e93 Fix bug in org-inside-LaTeX-fragment-p
* lisp/org.el (org-inside-LaTeX-fragment-p): Also work correctly in
  first paragraph.
2017-07-03 12:05:36 +02:00
Bastien 6961a2013f mk/eldo.el: Fix links
* mk/eldo.el (eldo-git-raw-file, eldo-git-search-string): Fix links.
2017-07-03 08:36:19 +02:00
Bastien 39906ee63d 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.
2017-07-03 08:35:25 +02:00
Nicolas Goaziou dd757f14f0 Merge branch 'maint' 2017-07-02 09:20:35 +02:00
Nicolas Goaziou 796a78222a Move an obsolete declaration in "org-compat.el"
* lisp/org-compat.el (org-capture-import-remember-templates): Moved
  from "org-capture.el".
2017-07-02 09:19:09 +02:00
Nicolas Goaziou fbd865941f Merge branch 'maint' 2017-07-01 18:27:21 +02:00
Mario Martelli 20d1c56575 org.texi: Fixes missing space after dot.
* doc/org.texi (Summary):
(Weekly/daily agenda): Fixes missing space after dot.
2017-07-01 18:25:51 +02:00
Nicolas Goaziou bff7f5daad Merge branch 'maint' 2017-07-01 14:34:19 +02:00
Nicolas Goaziou 3d63899088 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.
2017-07-01 14:32:54 +02:00
Nicolas Goaziou f4f921ce5a Merge branch 'maint' 2017-07-01 14:24:29 +02:00
Nicolas Goaziou 4f372457f2 Fix `org-check-before-invisible-edit', part 2
* lisp/org.el (org-check-before-invisible-edit): Fix error before
  first headline.  Handle nested overlays.
2017-07-01 14:23:41 +02:00
Nicolas Goaziou 64cbcb1bff Merge branch 'maint' 2017-07-01 10:34:01 +02:00