AgeCommit message (Collapse)AuthorFilesLines
13 hoursMerge branch 'maint'HEADmasterNicolas Goaziou1-3/+3
13 hoursorg-agenda: Fix error on empty headlinesmaintNicolas Goaziou1-10/+5
* lisp/org-agenda.el (org-agenda-get-timestamps): (org-agenda-get-deadlines): (org-agenda-get-scheduled): (org-agenda-get-blocks): Handle empty headlines.
32 hoursorg-capture: Adapt user-error for aborting by userChunyang Xu1-2/+2
* lisp/org-capture.el (org-capture): (org-mks): Replace `error' with `user-error'. When `org-capture` is aborted by user with 'q' or 'C-g', `user-error' is better than `error' when exiting. TINYCHANGE
32 hoursob-plantuml: Add new output formatsRainer M. Krug1-0/+16
* lisp/ob-paltuml (org-babel-execute:plantuml): add new output formats of plantuml: - pdf : this needs extra java mudules to run which are mentioned on the plantml website ( - vdx - xmi - scxml - html - txt (ascii art) - utxt (ascii art using unicode) The output format is based on the extension of the output file.
4 daysFix keywords in defcustomNicolas Goaziou1-2/+2
* lisp/org.el (org-show-context-detail): Fix keywords according to commit c112f40.
4 daysMerge branch 'maint'Nicolas Goaziou2-18/+19
4 daysFix `org-flag-drawer' with optional argumentNicolas Goaziou2-18/+19
* lisp/org.el (org-flag-drawer): Do not require point to be at a drawer in order to call the function with an optional argument. * testing/lisp/test-org.el (test-org/flag-drawer): Narrow test.
4 days`org-show-context' always displays pointNicolas Goaziou2-17/+45
* lisp/org.el (org-show-set-visibility): Always show point, even when it is hidden in a block or a drawer. * testing/lisp/test-org.el (test-org/show-set-visibility): Add tests. Reported-by: Derek Feichtinger <> <>
6 daysorg-agenda: Remove unnecessary visibility modificationNicolas Goaziou3-43/+6
* lisp/org.el (org-show-context-detail): Change default visibility span for agenda context. * lisp/org-agenda.el (org-agenda-goto): (org-agenda-todo): (org-agenda-add-note): (org-agenda-priority): (org-agenda-set-tags): (org-agenda-set-property): (org-agenda-set-effort): (org-agenda-toggle-archive-tag): (org-agenda-clock-in): Special visibility is taken care of by `org-show-context'. Do not hard-code anything else. * contrib/lisp/org-contacts.el (org-contacts-gnus-article-from-goto): Special visibility is taken care of by `org-show-context'. Do not hard-code anything else.
6 daysox-beamer: Fix "apply: Wrong number of arguments: max, 0"Nicolas Goaziou1-1/+1
* lisp/ox-beamer.el (org-beamer-select-environment): Use variable introduced in 4743d43. Reported-by: Jarmo Hurri <> <>
6 daysHandle correctly `shift-select-mode'Nicolas Goaziou1-51/+40
* lisp/org.el (org-beginning-of-line): Handle correctly `shift-select-mode'. Reported-by: Mathieu Marques <> <>
6 daysMerge branch 'maint'Nicolas Goaziou1-8/+19
6 daysFix multiple groups of mutually exclusive tagsNicolas Goaziou1-9/+19
* lisp/org.el (org-set-tags): Use a subtler mechansim to remove duplicate tags. This fixes a bug introduced in 77b4fad. Reported-by: Christoph LANGE <> <>
6 daysFix `org-export-babel-evaluate' handlingNicolas Goaziou3-138/+189
* lisp/ob-exp.el (org-babel-exp-process-buffer): Handle `org-export-babel-evaluate' handling. (org-babel-exp-results): Ignore `org-export-babel-evaluate' since it is handled as a higher level. * lisp/ox.el (org-export-as): Allow to short-circuit babel evaluation if `org-export-babel-evaluate' is nil. * testing/lisp/test-ob-exp.el (ob-export/babel-evaluate): New test. Reported-by: Nicolas Richard <> <>
6 daysSilence byte-compilerNicolas Goaziou1-1/+0
6 daysFix failing testNicolas Goaziou1-1/+1
* testing/lisp/test-ox.el (test-org-export/get-reference): Fix failing test.
8 daysox: Internal references are always 10 character longNicolas Goaziou1-1/+1
* lisp/ox.el (org-export-format-reference): Internal references are always 10 character long. This reduces further possible reference clashes with user-defined labels.
8 daysMerge branch 'maint'Nicolas Goaziou2-17/+54
8 daysFix storing links to headlines containing multiple linksNicolas Goaziou2-10/+49
* lisp/org.el (org-store-link): Fix storing links to headlines containing multiple links. * testing/lisp/test-org.el (test-org/store-link): New test. Reported-by: Georgiy Tugai <> <>
8 daysFix links to elements with a nameNicolas Goaziou1-7/+5
* lisp/org.el (org-store-link): Properly handle elements with a NAME keyword.
8 daysMerge branch 'maint'Nicolas Goaziou1-1/+7
8 daysox-ascii: Fix spurious linksNicolas Goaziou1-1/+7
* lisp/ox-ascii.el (org-ascii--unique-links): Fix spurious links. Reported-by: Samuel Wales <> <>
11 daysob-comint.el: Revert yet another changeCharles Berry1-2/+1
* ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file): Remove the `(ignore v)'. This creates a byte-compiler warning for supposedly unused `v', but allows remote execution.
11 daysob-comint.el: Reinstate let-bound variable from last commit.Charles Berry1-2/+4
* ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file): Reinstate `let (v)' which `org-babel-evaluate-session' relies on.
11 daysob-comint.el: Fix bug and remove unused let bindingCharles Berry1-4/+3
* ob-comint.el: (tramp-flush-directory-property declaration): The file is now "tramp-cache". * ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file): Remove unused let binding for `v' (which is let bound by `with-parsed-tramp-file-name'). Bug reported by Vikas Rawal Subject: Using tramp to run R source code blocks on remote server Archived-At: <>
11 daysMerge branch 'maint'Kyle Meyer1-7/+8
11 daysorg-yank: Correct docstringKyle Meyer1-7/+8
* lisp/org.el (org-yank): Update docstring for change in default value of org-yank-adjusted-subtrees. The default value was changed to nil in 2949012 (Change default values of some variables., 2009-02-01). Reported-by: Jorge Peixoto de Morais Neto <> <>
2016-04-20ob-emacs-lisp: Defaut binding is dynamicNicolas Goaziou1-3/+3
* lisp/ob-emacs-lisp.el (org-babel-default-header-args:emacs-lisp): Change default value. <>
2016-04-20org-bibtex: Fix curly braces removalNicolas Goaziou1-1/+1
* lisp/org-bibtex.el (org-bibtex-read): Only remove one level of curly braces when parsing an entry. Reported-by: timor <> <>
2016-04-20Avoid "Marker points into wrong buffer"Oleh Krehel1-0/+2
* lisp/org-indent.el (org-indent-initialize-buffer): Add a check. The bug occurred when trying to capture before any Org buffers were open.
2016-04-20Add detailed location to "org-mode fontification error"Oleh Krehel1-1/+3
* lisp/org.el (org-fontify-meta-lines-and-blocks): Update.
2016-04-20lisp/org-agenda.el (org-agenda-run-series): PrettifyOleh Krehel1-3/+3
2016-04-19ob-emacs-lisp: Make lexical eval default for elisp src blocksJohn Kitchin2-9/+33
* lisp/ob-emacs-lisp.el (org-babel-header-args:emacs-lisp): (org-babel-default-header-args:emacs-lisp): New variables. (org-babel-execute:emacs-lisp): Add an optional argument to the eval function.
2016-04-19Merge branch 'maint'Nicolas Goaziou1-1/+1
2016-04-19ox-odt: Fix styles locationNicolas Goaziou1-1/+1
* lisp/ox-odt.el (org-odt-styles-dir-list): Point to correct location for styles. Reported-by: Colin Baxter <> <>
2016-04-19org-agenda: Fix "Void variable org-clock-current-task"Nicolas Goaziou1-2/+2
* 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 <> <>
2016-04-18Merge branch 'maint'Nicolas Goaziou1-7/+7
2016-04-18Remove duplicate candidates when setting tagsNicolas Goaziou1-7/+8
* lisp/org.el (org-set-tags): Remove duplicate candidates from menu.
2016-04-18org-pcomplete: Fix TAGS completionNicolas Goaziou1-3/+4
* 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-18Fix tag related defcustomsNicolas Goaziou1-33/+51
* lisp/org.el (org-tag-alist): (org-tag-persistent-alist): Improve docstring. Fix values.
2016-04-18Properly handle `org-tag-persistent-alist'Nicolas Goaziou4-53/+95
* 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-18Factorize tags parsingNicolas Goaziou4-99/+159
* 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-16Merge branch 'maint'Nicolas Goaziou1-7/+8
2016-04-16Fix "Invalid time zone specification" errorNicolas Goaziou1-7/+8
* lisp/org.el (org-timestamp-change): Correctly handle `encode-time' parameters. Suggested-by: Derek Feichtinger <> Reported-by: Eric Abrahamsen <> <>
2016-04-16Merge branch 'maint'Nicolas Goaziou1-3/+3
2016-04-16org.texi: Fix typoNicolas Goaziou1-3/+3
* doc/org.texi (Timers): Fix typo. Reported-by: Lee <> <>
2016-04-14Merge branch 'maint'Nicolas Goaziou1-1/+1
2016-04-14Fix typoNicolas Goaziou1-1/+1
* lisp/org.el (org-property--local-values): Fix typo in doc string.
2016-04-13ox-ascii: Small refactoringNicolas Goaziou1-5/+1
* lisp/ox-ascii.el (org-ascii--describe-links): Small refactoring.
2016-04-13Merge branch 'maint'Nicolas Goaziou1-0/+1