summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
6 hoursMerge branch 'maint'HEADmasterNicolas Goaziou1-2/+1
6 hoursorg-colview: Fix agenda columns with diary entriesmaintNicolas Goaziou1-2/+1
* lisp/org-colview.el (org-agenda-columns): Do not treat diary entries as headlines. Reported-by: "Éibhear" <eibhear.geo@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/113282>
2 daysMerge branch 'maint'Nicolas Goaziou1-1/+5
2 daysorg-agenda: Store stuck project redo commandAllen Li1-1/+5
* lisp/org-agenda.el (org-agenda-list-stuck-projects): Store the redo command in a text property so it is found correctly. `org-agenda-redo' checks the `org-redo-cmd' text property, not `org-agenda-redo-command'. TINYCHANGE
3 daysMerge branch 'maint'Nicolas Goaziou1-2/+3
3 daysob-C: Fix command to perform on remote hostИван Трусков1-2/+3
* lisp/ob-C.el (org-babel-C-execute): Make sure name of compiled program is converted to local representation before sending it to the shell on remote host. The problem was when one would try to evaluate C source code block in the file on remote host. Compilation would go normally, then evaluation would fail with error like "/bin/sh: unable to find file". TINYCHANGE
4 daysMerge branch 'maint'Kyle Meyer1-2/+2
4 daysBackport commit c68cce94c from EmacsChristian Garbs1-2/+2
; Fix typo in error messages (Bug#26034) c68cce94c46140f2ad1411550427d3cc2658ec02 Christian Garbs Mon Apr 17 07:07:12 2017 +0300 TINYCHANGE
4 daysox: Ignore INCLUDE keywords in commented headlinesNicolas Goaziou3-117/+126
* lisp/ox.el (org-export-expand-include-keyword): Ignore INCLUDE keywords in commented headlines. * testing/lisp/test-ox.el (test-org-export/expand-include): Add test.
10 daysorg-agenda: `tags-todo' command type includes DONE keywordsNicolas Goaziou2-2/+5
* lisp/org-agenda.el (org-agenda): (org-agenda-run-series): Do not restrict `tags-todo' searches to non-DONE TODO keywords. Reported-by: Kevin Foley <kfoley15@gmail.com>
10 daysMerge branch 'maint'Nicolas Goaziou1-1/+0
10 daysorg-protocol: Don't push url to kill-ringMatt Lundin1-1/+0
* lisp/org-protocol.el: (org-protocol-do-capture) Don't push link to kill-ring when invoking `org-protocol-capture'. Otherwise, `org-protocol-do-capture' interferes with capture templates that insert the contents of the clipboard or the kill ring.
10 daysMerge branch 'maint'Nicolas Goaziou1-4/+3
10 daysorg-capture: Fix typoNicolas Goaziou1-4/+3
* lisp/org-capture.el (org-capture-fill-template): Fix typo introduced in last commit. Reported-by: Kaushal Modi <kaushal.modi@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/113126>
11 daysMerge branch 'maint'Nicolas Goaziou1-24/+25
11 daysorg-capture: Fix clipboard history with %^C or %^L place holdersNicolas Goaziou1-24/+25
* lisp/org-capture.el (org-capture--clipboards): New variable. (org-capture-fill-template): Use new variable. Reported-by: Allen Li <darkfeline@felesatra.moe> <http://permalink.gmane.org/gmane.emacs.orgmode/113020>
11 daysMerge branch 'maint'Nicolas Goaziou1-3/+3
11 daysox-confluence.el: Blank table cells produce required whitespaceStephen Mackenzie1-3/+3
* contrib/lisp/ox-confluence.el (org-confluence-table-cell): Add blank space in an empty table cell such that Confluence tables do not skip empty entries and produce erroneous table headers. Confluence tables are formatted incorrectly when empty cells cause `||' to generate the next cell as a table header, skipping the empty cell. Empty cells must be formatted as `| |'. TINYCHANGE
11 daysMerge branch 'maint'Nicolas Goaziou1-9/+14
11 daysorg-protocol: Do not catch all errors when providing backward compatibilityNicolas Goaziou1-9/+14
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Do not catch every error so as to ease old style support. Re-format code to fit within 80 columns. Reported-by: Adam Porter <adam@alphapapa.net> <http://permalink.gmane.org/gmane.emacs.orgmode/113102>
11 daysMerge branch 'maint'Nicolas Goaziou1-27/+31
11 daysFix explanation, if state change is blocked by contained checkboxesMarc Ihm1-27/+31
* lisp/org.el (org-todo): Fix explanation, if state change is blocked by contained checkboxes. Consider a node, which contains unchecked checkboxes; if you have set org-enforce-todo-checkbox-dependencies and try to change the node to DONE, you will be denied with a message explaining why. However in this special case the explanation would be wrong in talking of an unrelated node instead of the checkboxes. The fix uses the already existing variable org-blocked-by-checkboxes (which is handled in org-block-todo-from-checkboxes). Similar code is already present in org-agenda-dim-blocked-tasks within org-agenda.el.
11 daysMerge branch 'maint'Nicolas Goaziou1-1/+1
11 daysorg-clock: Silence byte-compilerNicolas Goaziou1-1/+1
11 daysorg-clock: Add testNicolas Goaziou1-0/+124
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/link): New test.
11 daysMerge branch 'maint'Nicolas Goaziou1-50/+55
11 daysorg-clock: Fix :link parameter in Clock tableNicolas Goaziou1-50/+55
* lisp/org-clock.el (org-clock-get-table-data): Fix link creation with headlines containing COMMENT or TODO keywords. Fix docstring. Small refactoring. Reported-by: "Stacey Marshall" <stacey.marshall@oracle.com> <http://permalink.gmane.org/gmane.emacs.orgmode/113094>
11 daysMerge branch 'maint'Kyle Meyer2-3/+3
11 daysDon't call kill-this-buffer outside of menusKyle Meyer2-3/+3
* contrib/lisp/org-toc.el (org-toc-quit): * lisp/org-mhe.el (org-mhe-follow-link): Use kill-buffer rather than menu-bar.el's kill-this-buffer. See Emacs bug#26466 and discussion on emacs.devel: https://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00346.html. This is in favor of backporting Emacs's 2e4f4c9d48 (Don't call 'kill-this-buffer' outside of menus, 2017-04-12), which introduces a new function kill-current-buffer that provides special handling of minibuffers.
12 daysMerge branch 'maint'Nicolas Goaziou1-2/+2
12 daysox-latex: Remove unwanted indentation in horizontal rulesNicolas Goaziou1-2/+2
* lisp/ox-latex.el (org-latex-horizontal-rule): Add "\noindent" macro before the horizontal rule. Reported-by: Justen Rickert <justenrickert@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/113092>
12 daysMerge branch 'maint'Nicolas Goaziou1-7/+7
12 daysob-sql.el: Fix filename conversion in minGW environment.Xi Shen1-7/+7
(org-babel-sql-convert-standard-filename): If it is not in Cygwin environment, and `system-nt' is "windows-nt", Emacs must be in minGW or MSYS environment, and can handle Windows filename correctly. TINYCHANGE
12 daysMerge branch 'maint'Nicolas Goaziou2-11/+4
12 daysUpdating MathJax CDN linksaviv2-11/+4
* doc/org.texi : Change reference to "cdn.mathjax.org" to "cdnjs.com", removing comment about no longer relevant terms of service. * lisp/ox-html.el (org-html-mathjax-options) : Change link to appropriate cdnjs.com link to load MathJax. Updating MathJax CDN links to reflect cdnjs.com as cdn.mathjax.org will be disconitnued as of 30 April 2017. TINYCHANGE
13 daysMerge branch 'maint'Nicolas Goaziou2-3/+19
13 daysorg-element: Fix radio link parserNicolas Goaziou2-3/+19
* lisp/org-element.el (org-element--object-lex): Fix parsing of radio links within emphasis. * testing/lisp/test-org-element.el (test-org-element/link-parser): Add test. Reported-by: R C <recifx@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/113063>
13 daysMerge branch 'maint'Nicolas Goaziou2-26/+79
13 daysFix `org-forward-heading-same-level'Nicolas Goaziou2-26/+79
* lisp/org.el (org-forward-heading-same-level): Do not fail when heading is at the beginning of the buffer. * testing/lisp/test-org.el (test-org/forward-heading-same-level): New test. Reported-by: Rafael Laboissière <rafael@laboissiere.net> <http://permalink.gmane.org/gmane.emacs.orgmode/113084>
2017-04-10Merge branch 'maint'Nicolas Goaziou1-1/+1
2017-04-10org-mobile: Fix bug in mobile outline path handlingIan Dunn1-1/+1
* org-mobile.el (org-mobile-get-outline-path-link): Use a `:' after file instead of a `/'.
2017-04-10Merge branch 'maint'Nicolas Goaziou1-2/+2
2017-04-10Ensure test files are opened in Emacs in test-org/fuzzy-linksSkip Collins1-2/+2
2017-04-10Merge branch 'maint'Kyle Meyer4-31/+93
2017-04-10org-insert-link: Correct changes from a08dd527dKyle Meyer1-4/+4
* lisp/org.el (org-insert-link): Fix regexp and undefined variable.
2017-04-10Backport commit c92bae9a0 from EmacsTom Tromey2-3/+3
* lisp/org-list.el (org-list-insert-radio-list): * lisp/org-table.el (orgtbl-setup, orgtbl-insert-radio-table): Use derived-mode-p. change org to use derived-mode-p c92bae9a08cc7c2eb61bad32d9a9d6553b6d2c19 Tom Tromey Wed Apr 5 15:53:38 2017 -0600
2017-04-10org-link-edit.el: Sync with upstreamKyle Meyer1-24/+86
Update to version 1.1.0 (af79eebdb).
2017-04-06ob-sql: Add vertica engineAndreas Gerler2-1/+35
* lisp/ob-sql.el (org-babel-sql-dbstring-vertica): New function. (org-babel-execute:sql): Add `vertica' engine. Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
2017-04-01Merge branch 'maint'Nicolas Goaziou1-1/+1
2017-04-01ox-man: Add new line before line break tagFrancesco Montanari1-1/+1
* lisp/ox-man.el (org-man-line-break): Transcode a LINE-BREAK object from Org to Man by adding the appropriate tag on a new line. TINYCHANGE