AgeCommit message (Collapse)AuthorFilesLines
30 hoursMerge branch 'maint'HEADmasterRasmus1-1/+1
30 hoursorg-mime: Use `compose-mail' to send mailmaintErik Hetzner1-1/+1
* contrib/lisp/org-mime.el (org-mime-compose): Use `compose-mail' to send mail. Allows customization via `mail-user-agent'. TINYCHANGE
2 daysox-koma-letter: Sometimes prefer special headingRasmus1-33/+44
* ox-koma-letter.el (org-koma-letter--keyword-or-headline): New function. (org-koma-letter-template): Use new function. (org-koma-letter-opening, org-koma-letter-closing) (org-koma-letter-signature) (org-koma-letter-headline-is-opening-maybe): Update docstring. If both org-koma-letter-headline-is-opening-maybe and org-koma-letter-prefer-special-headings is non-nil, always prefer special headline title for opening and closing.
4 daysMerge branch 'maint'Nicolas Goaziou1-1/+1
4 daysorg.texi: Fix typoJorge A. Alfaro Murillo1-1/+1
* doc/org.texi (Extracting source code): Fix typo.
5 daysMerge branch 'maint'Nicolas Goaziou1-5/+9
5 daysFix column view display when editing a propertyNicolas Goaziou1-5/+9
* lisp/org.el (org-insert-property-drawer): Ensure insertion of new property drawer happens in current entry so as to not mess with next's overlays. Reported-by: Dale <> <>
5 daysMerge branch 'maint'Nicolas Goaziou0-0/+0
6 daysox-html: Fix center block classRasmus1-1/+1
* ox-html.el (org-html-center-block): Correct class. Reported-by: <>
6 daysox-html: Fix center block classRasmus1-1/+1
* ox-html.el (org-html-center-block): Correct class. Reported-by: <>
6 daysMerge branch 'maint'Nicolas Goaziou1-2/+3
6 daysorg-indent: Remove extra column in indentationNicolas Goaziou1-2/+3
* lisp/org-indent.el (org-indent-set-line-properties): Fix virtual indentation computation. Reported-by: Eric S Fraga <> <>
6 daysMerge branch 'maint'Nicolas Goaziou2-1/+24
6 daysox: Fix uninterpreted data in captionsNicolas Goaziou2-1/+24
* lisp/ox.el (org-export--remove-uninterpreted-data-1): Handle uninterpreted data in captions. * testing/lisp/test-ox.el (test-org-export/uninterpreted): Add tests. Reported-by: Johannes Rainer <> <>
6 daysAdd news about org-agenda-insert-diary-strategyNikolai Weibull1-0/+3
7 daysMerge branch 'maint'Nicolas Goaziou1-7/+7
7 daysFix agenda follow mode to work with included diaryMatt Lundin1-7/+7
* lisp/org-agenda.el (org-agenda-goto): Fix function to work with non-Org buffers. Otherwise `org-agenda-follow-mode' does not work correctly with included diary entries (e.g., it errors out while the cursor is still in the diary buffer). Follow mode does not work with diary entries in the agenda. It calls `org-agenda-goto', which expects to be in an Org mode buffer but does not test to make sure that it is in an Org buffer. As a result, it errors out midway through and leaves the cursor stranded in the diary buffer.
7 daysMerge branch 'maint'Nicolas Goaziou1-2/+2
7 daysorg-notify: Fix compatibility with latest org-element (uppercase properties)Peter Münster1-2/+2
* contrib/lisp/org-notify.el (org-notify-make-todo): Properties from org-element are all uppercase now. * (org-notify-maybe-too-late): Fix typo in docstring (thanks to davemq,
7 daysAllow inserting diary entries last in date treeNikolai Weibull1-9/+17
* org-agenda.el (org-agenda-insert-diary-strategy): Add new value 'date-tree-last. (org-agenda-insert-diary-make-new-entry): Handle `org-agenda-insert-diary-strategy' set to 'date-tree-last. To allow for diary entries to be entered in time order in the date tree, add a new value to `org-agenda-insert-diary-strategy' that allows for this. The code for handling this value, 'date-tree-last, is a bit tricky, as we need to keep track of whether the date-tree already had one or more entries for the given date.
7 daysMerge branch 'maint'Kyle Meyer1-5/+6
7 daysorg-footnote-action: Handle nil contextKyle Meyer1-5/+6
* lisp/org-footnote.el (org-footnote-action): Check whether context is non-nil before trying to move to the end of the element.
8 daysMerge branch 'maint'Nicolas Goaziou1-4/+5
8 daysox: Fix inheritance for EXPORT_... propertiesNicolas Goaziou1-4/+5
* lisp/ox.el (org-export--get-subtree-options): (org-export-output-file-name): Let user control inheritance for these properties instead of hard-coding (an inconsistent) behavior. Reported-by: Eric Abrahamsen <> <>
8 daysMerge branch 'maint'Nicolas Goaziou2-21/+37
8 daysob: Fix RESULTS indentationNicolas Goaziou2-21/+37
* lisp/ob-core.el (org-babel-parse-src-block-match): Compute indentation taking into consideration tab width. (org-babel-where-is-src-block-result): Do not assume indentation consists of white space characters only. * testing/lisp/test-ob.el (test-ob/preserve-results-indentation): Add test. Reported-by: Jarmo Hurri <> <>
8 daysMerge branch 'maint'Nicolas Goaziou1-1/+1
8 daysFix COMMENT fontificationNicolas Goaziou1-1/+1
* lisp/org.el (org-set-font-lock-defaults): Fix regexp. Reported-by: Martin Carlé <> <>
8 daysMerge branch 'maint'Nicolas Goaziou1-1/+3
8 daysRedo Agenda in more cases even in sticky modeNikolai Weibull1-1/+3
* org-agenda.el (org-agenda-maybe-redo): Test for org-agenda-this-buffer-name as well. The Agenda buffer will have a different name if it’s in sticky mode, but some commands that alter the agenda should still redo it, for example, org-agenda-remove-restriction-lock, just like org-agenda-filter-by-category does.
9 daysMerge branch 'maint'Kyle Meyer2-2/+2
9 daysorg.texi: Fix typoKyle Meyer1-1/+1
* doc/org.texi (Clocking commands): Fix typo.
9 daysBackport commit c1cacb0 from Emacs master branchKyle Meyer1-1/+1
* lisp/org-gnus.el (org-gnus-no-new-news): Prefer (substitute-command-keys "`\\[foo-command]'") to "`M-x foo-command'" in docstrings and the like. Avoid hard-coding "M-x command" in docstrings c1cacb09948928287bfc32745f2a92604d3291c4 Paul Eggert Fri Aug 21 14:09:47 2015 -0700
9 daysMerge branch 'maint'Nicolas Goaziou2-14/+121
9 daysorg-datetree: Fix DATE_TREE searchNicolas Goaziou2-14/+121
* lisp/org-datetree.el (org-datetree-find-date-create): Ignore case and discard false positives (e.g., a fake property in an example block). * testing/lisp/test-org-datetree.el: New file.
10 daysMerge branch 'maint'Nicolas Goaziou1-1/+3
10 daysorg-capture: Fix bindings in header lineNicolas Goaziou1-1/+3
* lisp/org-capture.el (org-capture-mode): Display currently used bindings in header line.
10 daysMerge branch 'maint'Nicolas Goaziou2-27/+25
10 daysorg-datetree: Fix datetree captureNicolas Goaziou1-21/+24
* lisp/org-datetree.el (org-datetree-add-timestamp): Clarify docstring. (org-datetree-insert-line): Leave point on new entry.
10 daysorg-index.el version 4.3Marc Ihm1-313/+289
10 daysRevert "org-capture: Fix datetree capture"Nicolas Goaziou1-6/+1
This reverts commit a834a5939fd7fa9b7184ebc0a4587a72916f907f.
10 daysMerge branch 'maint'Nicolas Goaziou1-1/+6
10 daysorg-capture: Fix datetree captureNicolas Goaziou1-1/+6
* lisp/org-capture.el (org-capture-set-target-location): Fix file+datetree capture with non-nil `org-datetree-add-timestamp. Reported-by: Gregor Zattler <> <>
10 daysRevert "Merge branch 'maint'"Rasmus2-9/+4
This reverts commit cadb9f3603f7be0042c1ed30f7f8c3b44b81674e, reversing changes made to f6be2b5aa3cb0586b8c9a9bdda923528a9b8f081.
10 daysRevert "org.el: Update Version and Package-Requires header"Rasmus1-2/+2
This reverts commit 97d43ff681c54766593a67a5d1f48426db884865.
10 daysRevert "org.el: Add version header"Rasmus2-9/+4
This reverts commit 182552ee75bad48b062d3b0f7e8e9dce9c1b7965.
10 daysMerge branch 'maint'Nicolas Goaziou1-38/+15
10 daysorg-indent: Fix indentation in inline tasksNicolas Goaziou1-38/+15
* lisp/org-indent.el (org-indent-add-properties): Indent inline tasks' contents according to current outline level, not inlinetask's. This is consistent with hard indentation, using `org-indent-line'.
10 daysMerge branch 'maint'Nicolas Goaziou1-1/+1
10 daysFix typoNicolas Goaziou1-1/+1
* lisp/org.el (org-open-at-point): Fix typo. Reported-by: Sergei Nosov <>