29 hours agoorg-mime: Use `compose-mail' to send mail maint
Erik Hetzner [Sun, 30 Aug 2015 05:12:20 +0000]
org-mime: Use `compose-mail' to send mail

* contrib/lisp/org-mime.el (org-mime-compose): Use `compose-mail' to
send mail.  Allows customization via `mail-user-agent'.


3 days agoorg.texi: Fix typo
Jorge A. Alfaro Murillo [Tue, 25 Aug 2015 19:12:43 +0000]
org.texi: Fix typo

* doc/org.texi (Extracting source code): Fix typo.

4 days agoFix column view display when editing a property
Nicolas Goaziou [Wed, 26 Aug 2015 20:18:21 +0000]
Fix column view display when editing a property

* 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

Reported-by: Dale <>

5 days agoox-html: Fix center block class
Rasmus [Tue, 25 Aug 2015 23:14:15 +0000]
ox-html: Fix center block class

* ox-html.el (org-html-center-block): Correct class.


6 days agoorg-indent: Remove extra column in indentation
Nicolas Goaziou [Tue, 25 Aug 2015 13:03:59 +0000]
org-indent: Remove extra column in indentation

* lisp/org-indent.el (org-indent-set-line-properties): Fix virtual
  indentation computation.

Reported-by: Eric S Fraga <>

6 days agoox: Fix uninterpreted data in captions
Nicolas Goaziou [Tue, 25 Aug 2015 11:59:03 +0000]
ox: Fix uninterpreted data in captions

* 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 days agoFix agenda follow mode to work with included diary
Matt Lundin [Mon, 24 Aug 2015 15:31:49 +0000]
Fix agenda follow mode to work with included diary

* 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.

6 days agoorg-notify: Fix compatibility with latest org-element (uppercase properties)
Peter Münster [Mon, 24 Aug 2015 13:47:13 +0000]
org-notify: Fix compatibility with latest org-element (uppercase properties)

* 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 days agoorg-footnote-action: Handle nil context
Kyle Meyer [Mon, 24 Aug 2015 04:10:54 +0000]
org-footnote-action: Handle nil context

* lisp/org-footnote.el (org-footnote-action): Check whether context is
  non-nil before trying to move to the end of the element.

7 days agoox: Fix inheritance for EXPORT_... properties
Nicolas Goaziou [Sun, 23 Aug 2015 21:50:49 +0000]
ox: Fix inheritance for EXPORT_... properties

* 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 <>

7 days agoob: Fix RESULTS indentation
Nicolas Goaziou [Sun, 23 Aug 2015 21:38:36 +0000]
ob: Fix RESULTS indentation

* 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

Reported-by: Jarmo Hurri <>

7 days agoFix COMMENT fontification
Nicolas Goaziou [Sun, 23 Aug 2015 20:45:27 +0000]
Fix COMMENT fontification

* lisp/org.el (org-set-font-lock-defaults): Fix regexp.

Reported-by: Martin Carlé <>

8 days agoRedo Agenda in more cases even in sticky mode
Nikolai Weibull [Thu, 20 Aug 2015 17:02:34 +0000]
Redo Agenda in more cases even in sticky mode

* 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.

8 days agoorg.texi: Fix typo
Kyle Meyer [Sat, 22 Aug 2015 20:51:42 +0000]
org.texi: Fix typo

* doc/org.texi (Clocking commands): Fix typo.

8 days agoBackport commit c1cacb0 from Emacs master branch
Kyle Meyer [Sat, 22 Aug 2015 20:51:38 +0000]
Backport commit c1cacb0 from Emacs master branch

* 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
Paul Eggert
Fri Aug 21 14:09:47 2015 -0700

8 days agoorg-datetree: Fix DATE_TREE search
Nicolas Goaziou [Sat, 22 Aug 2015 19:40:54 +0000]
org-datetree: Fix DATE_TREE search

* 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.

9 days agoorg-capture: Fix bindings in header line
Nicolas Goaziou [Fri, 21 Aug 2015 22:54:14 +0000]
org-capture: Fix bindings in header line

* lisp/org-capture.el (org-capture-mode): Display currently used
  bindings in header line.

9 days agoorg-datetree: Fix datetree capture
Nicolas Goaziou [Fri, 21 Aug 2015 22:16:57 +0000]
org-datetree: Fix datetree capture

* lisp/org-datetree.el (org-datetree-add-timestamp): Clarify docstring.
(org-datetree-insert-line): Leave point on new entry.

9 days agoRevert "org-capture: Fix datetree capture"
Nicolas Goaziou [Fri, 21 Aug 2015 21:48:36 +0000]
Revert "org-capture: Fix datetree capture"

This reverts commit a834a5939fd7fa9b7184ebc0a4587a72916f907f.

9 days agoorg-capture: Fix datetree capture
Nicolas Goaziou [Fri, 21 Aug 2015 21:31:23 +0000]
org-capture: Fix datetree capture

* lisp/org-capture.el (org-capture-set-target-location): Fix
  file+datetree capture with non-nil `org-datetree-add-timestamp.

Reported-by: Gregor Zattler <>

9 days agoRevert "org.el: Add version header"
Rasmus [Fri, 21 Aug 2015 20:23:42 +0000]
Revert "org.el: Add version header"

This reverts commit 182552ee75bad48b062d3b0f7e8e9dce9c1b7965.

10 days agoorg-indent: Fix indentation in inline tasks
Nicolas Goaziou [Fri, 21 Aug 2015 12:44:26 +0000]
org-indent: Fix indentation in inline tasks

* 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 days agoFix typo
Nicolas Goaziou [Fri, 21 Aug 2015 12:07:26 +0000]
Fix typo

* lisp/org.el (org-open-at-point): Fix typo.

Reported-by: Sergei Nosov <>

10 days agoFix expansion of archived trees
Nicolas Goaziou [Fri, 21 Aug 2015 11:56:50 +0000]
Fix expansion of archived trees

* lisp/org.el (org-hide-archived-subtrees): Do not assume BEG is at
  beginning of line.  This matters when function is called with point in
  the middle of an archived headline.

Reported-by: Hymie! <>

10 days agoMerge branch 'fix-indent' into maint
Nicolas Goaziou [Thu, 20 Aug 2015 19:04:32 +0000]
Merge branch 'fix-indent' into maint

11 days agoFix f4d7646
Nicolas Goaziou [Thu, 20 Aug 2015 12:02:39 +0000]
Fix f4d7646

* lisp/org.el (org-deadline):
(org-schedule): Remove spurious argument.

11 days agoorg-indent: Fix indentation with proportional font
Nicolas Goaziou [Thu, 20 Aug 2015 11:58:00 +0000]
org-indent: Fix indentation with proportional font

* lisp/org-indent.el (org-indent-max):
(org-indent-stars): Remove unused variables.

(org-indent-initialize): Remove function.

(org-indent-boundary-char): Remove unnecessary comment.  Do not rely on
function above.

(org-indent): Make sure characters used for virtual indentation are
invisible since they are not necessarily white spaces.

(org-indent-set-line-properties): Fix indentation with proportional
font, i.e., do not use only white spaces to indent.
(org-indent-add-properties): Apply changes above.

Reported-by: Jakub Szypulka <>

11 days agoox-latex: Allow nil for `org-latex-hyperref-template'
Nicolas Goaziou [Wed, 19 Aug 2015 14:49:36 +0000]
ox-latex: Allow nil for `org-latex-hyperref-template'

* lisp/ox-latex.el (org-latex-hyperref-template): Allow nil value.  Make
  `org-latex-with-hyperref' an obsolete alias for the variable.


11 days agoRevert "ox-latex.el: Resurrect `org-latex-with-hyperref'"
Nicolas Goaziou [Wed, 19 Aug 2015 14:45:01 +0000]
Revert "ox-latex.el: Resurrect `org-latex-with-hyperref'"

This reverts commit 6f41105bd97c4a64272ec23493d9ae3ced4c4cbe.

11 days agoFix 93b73bd
Nicolas Goaziou [Wed, 19 Aug 2015 14:24:34 +0000]
Fix 93b73bd

* lisp/org-element.el (org-element-link-parser): Fix 93b73bd.

11 days agoFix new time logging upon rescheduling
Nicolas Goaziou [Wed, 19 Aug 2015 14:07:22 +0000]
Fix new time logging upon rescheduling

* lisp/org.el (org-deadline):
(org-schedule): Properly store new time so it is accessible using "%s"
in `org-log-note-headings'.

Reported-by: Malcolm Purvis <>

11 days agoFix translated link
Nicolas Goaziou [Wed, 19 Aug 2015 13:12:57 +0000]
Fix translated link

* lisp/org-element.el (org-element-link-parser): Call
  `org-link-translation-function' if required.
(org-element-link-interpreter): Build link from type and path instead of
simply pasting raw value.

* lisp/org.el (org-translate-link): Call parser to extract proper path
  and type.

* testing/lisp/test-org-element.el (test-org-element/link-interpreter):
  Add test.

Reported-by: Sergei Nosov <>

12 days agoFix `org-entry-properties' with default priority
Nicolas Goaziou [Wed, 19 Aug 2015 09:12:43 +0000]
Fix `org-entry-properties' with default priority

* lisp/org.el (org-entry-properties): When no priority is explicitly
  set, report `org-default-priority' instead.

* testing/lisp/test-org.el (test-org/entry-properties): Update test.

12 days agoox-html: Rename `org-html-html5-fancy-p' to `org-html--html5-fancy-p'
Nicolas Goaziou [Wed, 19 Aug 2015 09:07:06 +0000]
ox-html: Rename `org-html-html5-fancy-p' to `org-html--html5-fancy-p'

* lisp/ox-html.el (org-html--html5-fancy-p): Renamed from
  `org-html-html5-fancy-p'.  Add docstring.
(org-html-special-block): Apply renaming.

As an internal function, it should follow the convention of double
hyphens in its name.

12 days agoox-latex.el: Resurrect `org-latex-with-hyperref'
Bastien [Tue, 18 Aug 2015 17:23:34 +0000]
ox-latex.el: Resurrect `org-latex-with-hyperref'

* ox-latex.el (latex): Resurrect :latex-hyperref-p.
(org-latex-with-hyperref): Resurrect.
(org-latex-template): Use :latex-hyperref-p.

* org.texi (Beamer specific export settings)
(@LaTeX{} specific export settings): Mention both
`org-latex-hyperref-template' and `org-latex-with-hyperref'.

Thanks to Scott Randby for raising this issue.

12 days agoorg.texi: Fix case of `results' header-arg node
Grant Rettke [Mon, 17 Aug 2015 23:56:06 +0000]
org.texi: Fix case of `results' header-arg node

* org.texi (Top, Specific header arguments, var)
(Results of evaluation): Lowercase "results".

12 days agoAdd function to better guard html5 exports
Eric Abrahamsen [Tue, 18 Aug 2015 00:42:35 +0000]
Add function to better guard html5 exports

* lisp/ox-html.el (org-html-html5-fancy-p): New function to check
  that we are exporting to HTML5 and that the user has requested
  fancy elements.
  (org-html--wrap-image, org-html-template, org-html-toc)
  (org-html-special-block): Use the new function.

13 days agoorg.el (org-occur): Match timestamps at the end of a headline
Bastien [Tue, 18 Aug 2015 09:53:45 +0000]
org.el (org-occur): Match timestamps at the end of a headline

* org.el (org-occur): Workaround to match timestamps at the
end of a headline.

13 days agoFix c6d9a4ec
Bastien [Mon, 17 Aug 2015 18:42:50 +0000]
Fix c6d9a4ec

* org.el (org-check-before-date, org-check-after-date): Save
match data.

2 weeks agoox-odt: Small refactoring
Nicolas Goaziou [Sun, 16 Aug 2015 17:30:39 +0000]
ox-odt: Small refactoring

* lisp/ox-odt.el (org-odt-footnote-reference): Small refactoring.

2 weeks agoox-html.el (org-html-use-unicode-chars): Delete.
Bastien [Sun, 16 Aug 2015 13:58:07 +0000]
ox-html.el (org-html-use-unicode-chars): Delete.

* ox-html.el (org-html-use-unicode-chars): Delete.
(html, org-html-final-function): Update.

* org.texi (Publishing options): Don't mention

Thanks to Vladimir Alexiev for raising this.

2 weeks agomk/ Add etc/ORG-NEWS to the ELPA package
Bastien [Sun, 16 Aug 2015 13:34:32 +0000]
mk/ Add etc/ORG-NEWS to the ELPA package

2 weeks agoetc/ORG-NEWS: Minor rephrasing
Bastien [Sun, 16 Aug 2015 13:21:27 +0000]
etc/ORG-NEWS: Minor rephrasing

2 weeks agoorg.el: Fix `org-comment-string' fontification
Bastien [Sun, 16 Aug 2015 13:14:27 +0000]
org.el: Fix `org-comment-string' fontification

* org.el (org-set-font-lock-defaults): Don't fontify
`org-comment-string' when not in a headline.

2 weeks agoDocument :environment for LaTeX export of example blocks
Bastien [Sun, 16 Aug 2015 12:59:12 +0000]
Document :environment for LaTeX export of example blocks

2 weeks agoox-odt: Fix footnote export
Nicolas Goaziou [Sat, 15 Aug 2015 21:42:33 +0000]
ox-odt: Fix footnote export

* lisp/ox-odt.el (org-odt-footnote-reference): Only inline footnotes are
  to be wrapped within a paragraph.

Reported-by: Gerald Wildgruber <> <>

2 weeks agoRearrange; better advertize changes about COMMENT
Bastien [Sat, 15 Aug 2015 08:30:26 +0000]
Rearrange; better advertize changes about COMMENT

2 weeks agoFix links: use the new cgit interface
Bastien [Sat, 15 Aug 2015 08:29:44 +0000]
Fix links: use the new cgit interface

2 weeks agoRemove references to ChangeLog
Philip [Fri, 14 Aug 2015 16:42:02 +0000]
Remove references to ChangeLog

* README_contribute: Remove references to ChangeLog.  Instead,
reference the Emacs `CONTRIBUTE' file which documents how to
format git commit messages.


2 weeks agoorg.el: Fix recursive regexp backtracking
Philip [Thu, 13 Aug 2015 18:49:56 +0000]
org.el: Fix recursive regexp backtracking

* org.el (org-link-search): Avoid recursive regexp backtracking behavior
when following search links.



2 weeks agoorg-footnote: Fix remote editing of empty definitions
Nicolas Goaziou [Fri, 14 Aug 2015 14:46:09 +0000]
org-footnote: Fix remote editing of empty definitions

* lisp/org-src.el (org-edit-footnote-reference): Fix remote editing of
  empty definitions.

2 weeks agoorg-footnote: Fix consistency between footnotes and links
Nicolas Goaziou [Fri, 14 Aug 2015 14:22:13 +0000]
org-footnote: Fix consistency between footnotes and links

* lisp/org-footnote.el (org-footnote-action): Mimic `org-open-at-point'
  behavior for consistency.

2 weeks agoorg-footnote: Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c
Nicolas Goaziou [Fri, 14 Aug 2015 14:17:18 +0000]
org-footnote: Fix f8c4102cc6e65d48e0b9502cc568843a86f92f1c

* lisp/org-footnote.el (org-footnote-new): Fix

* testing/lisp/test-org-footnote.el (test-org-footnote/new): Add test.

2 weeks agoorg-footnote: Fix location after moving to definition
Nicolas Goaziou [Fri, 14 Aug 2015 14:15:09 +0000]
org-footnote: Fix location after moving to definition

* lisp/org-footnote.el (org-footnote-goto-definition): Move to location
  appropriate for further editing.
* testing/lisp/test-org-footnote.el (test-org-footnote/delete): Update

2 weeks agoorg.el: Add version header
Rasmus [Fri, 14 Aug 2015 00:00:49 +0000]
org.el: Add version header

* org.el: Add version header.
* README_maintainer: Mention Version header.

2 weeks agoFix completion when selecting more than one tag
Matt Lundin [Thu, 13 Aug 2015 04:22:22 +0000]
Fix completion when selecting more than one tag

* lisp/org.el (org-fast-tag-selection): Make sure to set local variable
  buffer-tags to actual buffer-tags before pushing selected tag to the
  list; otherwise, the subsequent completion list will be limited to the
  one selected tag.

2 weeks agoorg-footnote: Fix positioning when inserting footnotes
Nicolas Goaziou [Thu, 13 Aug 2015 22:54:07 +0000]
org-footnote: Fix positioning when inserting footnotes

* lisp/org-footnote.el (org-footnote-new): Fix point when a new footnote
  triggers sorting.

Reported-by: Gerald Wildgruber <>

2 weeks agoorg-src: Fix remote editing
Nicolas Goaziou [Thu, 13 Aug 2015 22:17:47 +0000]
org-src: Fix remote editing

* lisp/org-src.el (org-src--contents-area): Make sure buffer is widened
  before extracting contents of area.

2 weeks agoFix clock in when org-clock-into-drawer is integer
Tom Hinton [Wed, 12 Aug 2015 11:46:47 +0000]
Fix clock in when org-clock-into-drawer is integer

* org-clock.el (org-clock-jump-to-current-clock): Fixed a bug wherein
  `org-clock-jump-to-current-clock' did not work if
  `org-clock-into-drawer' was not either a string or nil.


2 weeks agoFix table detection in non-Org buffers
Nicolas Goaziou [Thu, 13 Aug 2015 20:31:36 +0000]
Fix table detection in non-Org buffers

* lisp/org.el (org-at-table-p): Allow local tables without full valid
  syntax when current buffer is not in Org mode.

Reported-by: Benjamin Slade <>

2 weeks agoob-ruby: Fix double-escaping
Archenoth [Wed, 12 Aug 2015 05:59:25 +0000]
ob-ruby: Fix double-escaping

* lisp/ob-ruby.el (org-babel-ruby-evaluate): Remove second call to



2 weeks agoFix splitting headlines with RET
Nicolas Goaziou [Thu, 13 Aug 2015 00:23:40 +0000]
Fix splitting headlines with RET

* lisp/org.el (org-return): Make sure to keep headline from being
  invalidated by restricting positions where it can be split.

* testing/lisp/test-org.el (test-org/return): Add test.

2 weeks agoMake `org-return' follow links in headings again
Alexey Lebedeff [Wed, 12 Aug 2015 20:02:49 +0000]
Make `org-return' follow links in headings again

* org.el (org-return): Check for links first when
  `org-return-follows-link' is non-nil, before inserting any newlines.

* testing/lisp/test-org.el (test-org/return): Add test.

This patch restores order in which `org-return' perform actions (which
was changed in a7e62499f2fe5c313567212ee90ff743c5e734a8).


2 weeks agoorg.texi: Fix compilation error
Nicolas Goaziou [Wed, 12 Aug 2015 13:00:48 +0000]
org.texi: Fix compilation error

* doc/org.texi (Macro replacement): Fix typo.

2 weeks agoorg-colview: Fix column view area
Nicolas Goaziou [Wed, 12 Aug 2015 12:49:02 +0000]
org-colview: Fix column view area

* lisp/org-colview.el (org-columns-goto-top-level): Actually move point.
(org-columns): Adapt to change above.

Reported-by: Johan Sandblom <>

2 weeks agoorg-colview: Fix typo in a docstring
Nicolas Goaziou [Tue, 11 Aug 2015 23:12:43 +0000]
org-colview: Fix typo in a docstring

* lisp/org-colview.el (org-columns--value): Fix typo.

2 weeks agoorg.texi: Edit date and time macros
tsdye [Tue, 11 Aug 2015 18:34:50 +0000]
org.texi: Edit date and time macros

* doc/org.texi (Macro replacement): Edit date and time macros.

2 weeks agoFix column view sums
Nicolas Goaziou [Tue, 11 Aug 2015 17:10:09 +0000]
Fix column view sums

* lisp/org.el (org-entry-properties): Remove need for `org-summaries'

* lisp/org-colview.el (org-columns--value): New function.
(org-agenda-columns): Use new functions.

Reported-by: Johan Sandblom <>

2 weeks agoorg-agenda: Fix slowdown introduced in 570b193
Nicolas Goaziou [Tue, 11 Aug 2015 12:42:34 +0000]
org-agenda: Fix slowdown introduced in 570b193

* lisp/org-agenda.el (org-agenda-dim-blocked-tasks): Do not check
multiple times the same entry.

Reported-by: Matt Lundin <>

2 weeks agoorg-list: Fix "Invalid search bound" error
Nicolas Goaziou [Tue, 11 Aug 2015 12:11:15 +0000]
org-list: Fix "Invalid search bound" error

* lisp/org-list.el (org-update-checkbox-count): Fix "Invalid search
  bound" error.

Reported-by: Rasmus <>

2 weeks agoorg-list: Fix statistics updating with cookie in sublist
Nicolas Goaziou [Mon, 10 Aug 2015 21:23:39 +0000]
org-list: Fix statistics updating with cookie in sublist

* lisp/org-list.el (org-update-checkbox-count): Properly update
  statistics cookies in a sublist.

* testing/lisp/test-org-list.el (test-org-list/update-checkbox-count):
Add test.

Reported-by: Gerald Wildgruber <>

2 weeks agoEdit proper timestamp when on a time range
Nicolas Goaziou [Mon, 10 Aug 2015 20:32:24 +0000]
Edit proper timestamp when on a time range

* lisp/org.el (org-time-stamp): Offer appropriate default value
  depending on position of point in a time range.

Reported-by: Christoph LANGE <>

2 weeks agoFix ambiguous docstrings
Nicolas Goaziou [Mon, 10 Aug 2015 20:31:31 +0000]
Fix ambiguous docstrings

* lisp/org.el (org-at-date-range-p):
(org-at-timestamp-p): Make match data explicit when returning a non-nil

2 weeks agoorg-clock: Fix org-add-archive-files call
Kyle Meyer [Mon, 10 Aug 2015 16:19:39 +0000]
org-clock: Fix org-add-archive-files call

* lisp/org-clock.el (org-dblock-write:clocktable): Check that
  buffer-file-name is non-nil before passing to org-add-archive-files.

2 weeks agoorg-map-entries: Fix org-agenda-prepare-buffers call
Kyle Meyer [Mon, 10 Aug 2015 16:19:13 +0000]
org-map-entries: Fix org-agenda-prepare-buffers call

* lisp/org.el (org-map-entries): Check that buffer-file-name is non-nil
  before passing to org-agenda-prepare-buffers.

Like 11e8749, this surfaced as an error when 05efa7a ("Backport commit
3a5f751 from Emacs master branch", 2015-08-08) replaced a
'(while (setq VAR (pop LIST)) BODY)' with '(dolist (VAR LIST) BODY)',
resulting in the body being executed when '(nil)' was passed to

Reported-by: Robert Klein <>

3 weeks agoFix agenda wrt commented headlines
Nicolas Goaziou [Mon, 10 Aug 2015 11:54:19 +0000]
Fix agenda wrt commented headlines

* lisp/org.el (org-agenda-prepare-buffers): Ignore commented headlines
  deeper than level 1.

Reported-by: Samuel Wales <>

3 weeks agoFix infloop due to wrong angle link regexp
Nicolas Goaziou [Mon, 10 Aug 2015 08:04:09 +0000]
Fix infloop due to wrong angle link regexp

* lisp/org.el (org-make-link-regexps): Fix infloop.

Reported-by: Gregor Zattler <>

3 weeks agoUpdate remaining copyright years in lisp/
Kyle Meyer [Mon, 10 Aug 2015 06:13:27 +0000]
Update remaining copyright years in lisp/

3 weeks agoBackport remaining changes from commit 7e09ef0
Paul Eggert [Thu, 1 Jan 2015 22:26:41 +0000]
Backport remaining changes from commit 7e09ef0

Add changes from Emacs repo that should have been backported with

Update copyright year to 2015
Paul Eggert
Thu Jan 1 14:26:41 2015 -0800

3 weeks agoorg-cycle-agenda-files: Fix agenda file check
Kyle Meyer [Mon, 10 Aug 2015 01:29:22 +0000]
org-cycle-agenda-files: Fix agenda file check

* lisp/org.el (org-cycle-agenda-files): Raise error if there are no
  agenda files, as intended.  Simplify code.

3 weeks agoorg-clock: Fix org-agenda-prepare-buffers call
Kyle Meyer [Mon, 10 Aug 2015 01:29:14 +0000]
org-clock: Fix org-agenda-prepare-buffers call

* lisp/org-clock.el (org-dblock-write:clocktable): Pass buffer to
  org-agenda-prepare-buffers when buffer is not visiting file.

This surfaced as an error when 05efa7a ("Backport commit 3a5f751 from
Emacs master branch", 2015-08-08) replaced a
'(while (setq VAR (pop LIST)) BODY)' with '(dolist (VAR LIST) BODY)',
resulting in the body being executed when '(nil)' was passed to

3 weeks agoorg-local-logging: Replace let* with let
Kyle Meyer [Mon, 10 Aug 2015 01:37:48 +0000]
org-local-logging: Replace let* with let

* lisp/org.el (org-local-logging): Replace let* with let.

3 weeks agoPartially revert last backport
Kyle Meyer [Mon, 10 Aug 2015 01:28:27 +0000]
Partially revert last backport

* lisp/org.el (org-assign-fast-keys, org-make-tags-matcher)
(org-cycle-agenda-files): Revert dolist change because code in body
expects the list to be modified by pop each iteration.
(org-fast-todo-selection, org-fast-tag-selection): Revert dolist change
because code in body expects the list to be modified by pop each
iteration and because the variable name is used outside of the dolist

3 weeks agoBackport commit 3a5f751 from Emacs master branch
Stefan Monnier [Sat, 8 Aug 2015 23:41:57 +0000]
Backport commit 3a5f751 from Emacs master branch

* lisp/org.el (org-goto-map, org-assign-fast-keys)
(org-contextualize-keys, org-contextualize-validate-key)
(org-notes-order-reversed-p, org-local-logging, org-map-entries)
(org-find-olp, org-find-exact-heading-in-directory)
(org-cycle-agenda-files, org-release-buffers, org-fill-template)
(org-agenda-prepare-buffers, org-occur-in-agenda-files)
(org-replace-escapes): Use dolist.
(org-mode): Optimize away XEmacs-only code.
(org-refile-get-targets): Remove unused var `f'.
(org-fast-todo-selection): Remove unused var `e'.
(org-make-tags-matcher): Use dolist.  Remove unused var `term'.
(org-fast-tag-selection): Use dolist.  Remove unused var `e'.
(org-format-latex): Use dolist.  Remove unused var `e'.
(org-backward-sentence, org-forward-sentence, org-meta-return)
(org-kill-line): Mark arg as unused.
(org-submit-bug-report): Silence compiler warning.
(org-occur-in-agenda-files): Don't use add-to-list on local vars.
(org-get-cursor-date): Remove unused var `tm'.
(org-comment-or-uncomment-region): Use standard name `_'.
(reftex-docstruct-symbol, reftex-cite-format): Declare to
silence byte-compiler.
(org-reftex-citation): Add `org--' prefix to dynamically scoped
`rds' var.

org.el: Fix up some lexical scoping warnings, and use dolist
Stefan Monnier
Sat Aug 8 19:41:57 2015 -0400

3 weeks agoOpen timestamps also on CLOCK lines
Nicolas Goaziou [Sun, 9 Aug 2015 22:18:16 +0000]
Open timestamps also on CLOCK lines

* lisp/org.el (org-open-at-point): CLOCK are a valid location for

Reported-by: Christoph LANGE <>

3 weeks agoFix false positives in TODO keywords
Nicolas Goaziou [Sun, 9 Aug 2015 21:56:57 +0000]
Fix false positives in TODO keywords

* lisp/org.el (org-entry-properties): Make sure case is meaningful when
  matching a TODO keyword.
* testing/lisp/test-org.el (test-org/entry-properties): Add test.

Reported-by: Samuel Wales <>

3 weeks agoorg-table: Fix number-or-marker-p error
Nicolas Goaziou [Sun, 9 Aug 2015 00:09:08 +0000]
org-table: Fix number-or-marker-p error

* lisp/org-table.el (org-table-goto-field): Fix number-or-marker-p

Initial patch by Rasmus <>.

Reported-by: Scott Randby <>

3 weeks agoFix visibility when switching from agenda to item
Nicolas Goaziou [Fri, 7 Aug 2015 00:07:43 +0000]
Fix visibility when switching from agenda to item

* lisp/org-agenda.el (org-agenda-switch-to): Do not hardcode visibility
  set-up when switching to item relative to current agenda line.
  Instead let `org-show-context' handle it.  Improve docstring.

Reported-by: Samuel Wales <>

3 weeks agoorg-agenda: Do not block non-TODO entries
Nicolas Goaziou [Thu, 6 Aug 2015 14:56:41 +0000]
org-agenda: Do not block non-TODO entries

* lisp/org-agenda.el (org-agenda-dim-blocked-tasks): Do not check if an
  entry can be blocked when it doesn't have any TODO keyword.

* lisp/org.el (org-entry-blocked-p): Make sure entry is really an open
  task before even considering it as a blocked task.  Small refactoring.

* testing/lisp/test-org.el (test-org/entry-properties): Update tests.
(test-org/entry-blocked-p): New test.

Reported-by: Bingo UV <>

3 weeks agoTiny fix
Nicolas Goaziou [Thu, 6 Aug 2015 13:41:16 +0000]
Tiny fix

* lisp/org.el (org-get-tag-face): Tiny fix.

3 weeks agoFontify priorities, tags and TODO in colview
Nicolas Goaziou [Thu, 6 Aug 2015 13:35:44 +0000]
Fontify priorities, tags and TODO in colview

* lisp/org.el (org-get-priority-face): New function.
(org-font-lock-add-priority-faces): Use new function.

* lisp/org-colview.el (org-columns-new-overlay): Preserve face from
  string to display.
(org-columns-display-here): Apply usual face on TODO keywords, tags and
priorities in the columns overlay.

3 weeks agoRevert "org-colview: Preserve face for TODO keywords"
Nicolas Goaziou [Thu, 6 Aug 2015 13:34:56 +0000]
Revert "org-colview: Preserve face for TODO keywords"

This reverts commit 96b4e8f74b6c067b64fd997e953961fc609ac31e.

Font leaks on the vertical bar after the keyword.

3 weeks agoFix a docstring
Nicolas Goaziou [Thu, 6 Aug 2015 12:57:23 +0000]
Fix a docstring

* lisp/org.el (org-get-tag-face): Fix docstring.  Small refactoring.

3 weeks agoorg-colview: Preserve face for TODO keywords
Nicolas Goaziou [Thu, 6 Aug 2015 12:55:51 +0000]
org-colview: Preserve face for TODO keywords

* lisp/org-colview.el (org-columns-display-here): Preserve face for TODO
  keywords in column view.

Suggested-by: Matt Price <>

3 weeks agoBackport commit 0c856a2 from Emacs master branch
Paul Eggert [Thu, 6 Aug 2015 02:06:57 +0000]
Backport commit 0c856a2 from Emacs master branch

* lisp/ob-core.el (org-babel-check-evaluate)
* lisp/ob-fortran.el (org-babel-fortran-var-to-fortran):
* lisp/ox-latex.el (org-latex-compile):
* lisp/ox-man.el (org-man-compile):
* lisp/ox-odt.el (org-odt-template):
* lisp/ox-texinfo.el (org-texinfo-compile):
Change (message (format ...)) to (message ...), and likewise
for ‘error’.  This lessens the probability of confusion when the
output of ‘format’ contains ‘%’.

Fix some confusion with ‘format’
Paul Eggert
Wed Aug 5 19:07:28 2015 -0700

3 weeks agoorg-src: Use font-lock-fontify-buffer for blocks release_8.3.1
Kyle Meyer [Wed, 5 Aug 2015 03:50:59 +0000]
org-src: Use font-lock-fontify-buffer for blocks

* lisp/org-src.el (org-src-font-lock-fontify-block): Use
  font-lock-fontify-buffer because font-lock-ensure does not display
  source block fonts.

When font-lock-fontify-buffer was originally replaced by
font-lock-ensure, source block fonts were not being displayed, so
99f9999 reverted this change.  However, a backport (d81e6b5) from the
Emacs repo, which was merged to master in 0d0d0ad, reverted this again.

Reported-by: Kaushal Modi <>

3 weeks agoBackport commit eb0f65b from Emacs master branch
Paul Eggert [Fri, 31 Jul 2015 17:12:37 +0000]
Backport commit eb0f65b from Emacs master branch

Don't overflow if computing approximate percentage
Paul Eggert
Fri Jul 31 10:13:38 2015 -0700

* lisp/org-list.el (org-update-checkbox-count):
* lisp/org.el (org-table-map-tables)
Prefer (floor (* 100.0 NUMERATOR) DENOMINATOR) when calculating
progress-report percentages and the like.  This avoids problems
if (* 100 NUMERATOR) would overflow.
* lisp/org-colview.el (org-nofm-to-completion):
Prefer (round (* 100.0 NUMERATOR) DENOMINATOR) to a
more-complicated and less-accurate approximation.

3 weeks agodoc/orgguide.texi: uncomment the license release_8.3
Bastien [Tue, 4 Aug 2015 23:44:41 +0000]
doc/orgguide.texi: uncomment the license

3 weeks agoetc/ORG-NEWS: Slightly reformat entries
Bastien [Tue, 4 Aug 2015 23:13:31 +0000]
etc/ORG-NEWS: Slightly reformat entries

3 weeks agoMerge branch 'backport-master'
Bastien [Tue, 4 Aug 2015 23:01:46 +0000]
Merge branch 'backport-master'