Commit Graph

21773 Commits

Author SHA1 Message Date
Bastien 1315315465 Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint 2018-10-14 12:13:11 +02:00
Nicolas Goaziou 9d6a9e1739 Merge branch 'master' into next 2018-10-14 09:58:55 +02:00
Nicolas Goaziou f12f9b4f28 Fix fontification of links within verbatim markup
* lisp/org.el (org-do-emphasis-faces): Prevent fontification of links
  within verbatim markup.
2018-10-14 09:57:47 +02:00
Nicolas Goaziou 4d8c78a0ef Merge branch 'master' into next 2018-10-14 09:09:23 +02:00
Nicolas Goaziou 085f150372 ob-tangle: Add a test
* testing/lisp/test-ob-tangle.el (ob-tangle/block-order): Add test.
2018-10-14 09:08:44 +02:00
Nicolas Goaziou b9d0e7e7f6 Merge branch 'master' into next 2018-10-13 23:31:09 +02:00
Nicolas Goaziou ee4af96202 org-clock: Fix typo in docstring
* lisp/org-clock.el (org-clock-special-range): Fix typo in docstring.
2018-10-13 23:27:47 +02:00
Gong Qijian 2b96fc9171 ob-core: Fix `org-babel--string-to-number'
* lisp/ob-core.el (org-babel--string-to-number): Fix the regular expression.
* testing/lisp/test-ob.el (test-ob/string-to-number): Test cases.

If people write the data in the form "0001"", it means that he wants to
treat it as a string.

TINYCHANGE

> #+name: TBL
> |   id | name   | age |
> |------|--------|-----|
> | 0001 | Apollo |  16 |
> | 0002 | Bmw    |  16 |
>
> #+BEGIN_SRC emacs-lisp :results value pp :var tbl=TBL
> (mapc 'print tbl)
> #+END_SRC
>
> #+RESULTS:
> : (("0001" "Apollo" 16)
> :  ("0002" "Bmw" 16))

TINYCHANGE
2018-10-13 23:22:05 +02:00
Kyle Meyer 1c5339e974 Merge branch 'master' into next 2018-10-13 12:17:17 -04:00
Kyle Meyer d59ca13c20 org-manual: Correct suggested value for org-agenda-inhibit-startup
* doc/org-manual.org (Speeding Up Your Agendas): Adjust
org-agenda-inhibit-startup snippet to match the text.

This correpsonds to maint's 01c419426.
2018-10-13 12:16:08 -04:00
Kyle Meyer aa4e0a5453 Merge branch 'maint' 2018-10-13 12:13:06 -04:00
Kyle Meyer 01c4194267 org.texi: Correct suggested value for org-agenda-inhibit-startup
* doc/org.texi (Speeding up your agendas): Adjust
org-agenda-inhibit-startup snippet to match the text.
2018-10-13 11:55:33 -04:00
Kyle Meyer e2f2502757 Fix typo in docstring
* lisp/org-agenda.el
(org-agenda-move-date-from-past-immediately-to-today): Fix typo.
2018-10-13 11:55:04 -04:00
Nicolas Goaziou e2d0f32e00 Backport commit 6a7a869c3 from Emacs
* doc/org.texi (Org Mobile): Rewritten from "MobileOrg" section.
Remove all references to non-free software.
Moved into "Miscellaneous", much like Org Crypt library. No longer an
appendix.
(Footnotes): Remove a reference to "MobileOrg".
(Bug#32722)

Org manual: Rewrite the Org Mobile section
6a7a869c33bb69efd93bb0ce8d8322083dbbcbac
Nicolas Goaziou
Sun Sep 30 14:40:14 2018 +0300
2018-10-13 11:06:25 -04:00
Nicolas Goaziou 848037d54c Merge branch 'master' into next 2018-10-13 16:59:49 +02:00
Dima Gerasimov 7a09c33867 org-agenda: New test for setting priority
* testing/examples/agenda-file.org: Add a subnote, make sure it has no
  impact on agenda.
* testing/lisp/test-org-agenda.el (test-org-agenda/set-priority): New
  test.

TINYCHANGE
2018-10-13 16:58:33 +02:00
Nicolas Goaziou 36c7bada28 Merge branch 'master' into next 2018-10-13 16:54:39 +02:00
Michaël Cadilhac d9fdc204cc org.el: Fix typo
* lisp/org.el (org-enforce-todo-checkbox-dependencies): Fix typo.

TINYCHANGE
2018-10-13 16:54:01 +02:00
Nicolas Goaziou 100edaccd1 Implement `month' and `year' steps in clock tables
* doc/org-manual.org (The clock table): Update manual.
* lisp/org-clock.el (org-clocktable-steps): Rewrite function.  Add
  `month' and `year' steps.
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/step): Add
  tests.
2018-10-13 16:22:43 +02:00
Bastien 0aa2589185 Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-10-11 11:15:56 +02:00
Nicolas Goaziou 5341312b79 Merge branch 'master' into next 2018-10-11 00:02:46 +02:00
Nicolas Goaziou 2fda33bfef ob-tangle: Fix tangling order
* lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Preserver order
  of code blocks from the source document.
* testing/lisp/test-ob-tangle.el (ob-tangle/block-order): New test.

Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00062.html>
2018-10-11 00:01:50 +02:00
Bastien bfc93e0c92 Merge branch 'maint' 2018-10-10 06:51:49 +02:00
Michaël Cadilhac a761ceb986 org.el: Fix typo
* lisp/org.el (org-enforce-todo-checkbox-dependencies): Fix typo.

TINYCHANGE
2018-10-10 06:51:37 +02:00
Nicolas Goaziou 6a12f65453 Merge branch 'master' into next 2018-10-09 18:27:39 +02:00
Nicolas Goaziou 0df6d9f782 org-clock: Fix `org-clock-in'
* lisp/org-clock.el (org-clock-in): Do not stop clock when clocking-in
  a task already being clocked.

Reported-by: Marcin Borkowski <mbork@mbork.pl>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00095.html>
2018-10-09 18:25:11 +02:00
Nicolas Goaziou a85ba9fb9b org-manual: Remove unnecessary @noindent
* doc/org-manual.org (Feedback):
(Headlines):
(Initial visibility):
(Sparse Trees):
(Creating Footnotes):
(Column Width and Alignment):
(Named references):
(Formula syntax for Calc):
(Using multiple =TBLFM= lines):
(Link Format):
(External Links):
(Link Abbreviations):
(Basic TODO Functionality):
(Setting up keywords for individual files):
(Tracking TODO state changes):
(Priorities):
(Checkboxes):
(Tag Inheritance):
(Setting Tags):
(Property Syntax):
(Column attributes):
(Capturing column view):
(Custom time format):
(The clock table):
(Template elements):
(Template expansion):
(Attachments):
(Moving a tree to an archive file):
(Agenda Views):
(Agenda Files):
(Categories):
(Exporting Agenda Views):
(Exporting):
(Images in HTML export):
(JavaScript supported display of web pages):
(Images in LaTeX export):
(A Cleaner Outline View):
(Setting up the staging area):
(Radio tables):
(A LaTeX example of radio tables):
(Extracting Agenda Information):
(From Carsten): Remove unnecessary @noindent.
2018-10-07 23:16:59 +02:00
Nicolas Goaziou 01061ccb06 org-manual: Use "Important" quotations
* doc/org-manual.org (Advanced features):
(Inserting deadlines or schedules): Use "Important" quotations.
2018-10-07 23:16:24 +02:00
Nicolas Goaziou c088176c8b org-manual: Tiny change
* doc/org-manual.org (Using Emacs packaging system): Use a tagged
  quotation for the important remark.
2018-10-07 22:35:10 +02:00
Nicolas Goaziou cbe1d76dc2 ox-texinfo: Fix quotations
* lisp/ox-texinfo.el (org-texinfo-quote-block): Do not use NAME
  keyword as the emphasized tag.  Use a dedicated :tag attribute
  instead.  Also add :author attribute.
* doc/org-manual.org (Quotations in Texinfo export): New section.
2018-10-07 22:32:03 +02:00
Nicolas Goaziou 25b3fd06be org-manual: Fix typo
* doc/org-manual.org (Repeated tasks):
(Effort Estimates): Fix typos.
2018-10-07 18:36:28 +02:00
Nicolas Goaziou 58a13f58f5 org-manual: Remove reference to Orgstruct minor mode
* doc/org-manual.org (Export in Foreign Buffers): Remove reference to
  Orgstruct minor mode.
2018-10-07 18:35:32 +02:00
Nicolas Goaziou 100541b53c Bump version keyword to 9.3 2018-10-06 12:12:13 +02:00
Nicolas Goaziou ee6bb635dc Merge branch 'master' into next 2018-10-06 12:09:22 +02:00
Nicolas Goaziou fdb36d07e4 org-manual: Fix typos
* doc/org-manual.org (Tag Hierarchy):
(~capture~ protocol): Add missing comma.
2018-10-06 12:08:33 +02:00
Nicolas Goaziou 8e33a9fdf8 Merge branch 'master' into next 2018-10-06 12:01:52 +02:00
Nicolas Goaziou 050e2bf509 org-manual: Fix typo
* doc/org-manual.org (Footnotes): Fix typo.
2018-10-06 12:01:30 +02:00
Nicolas Goaziou ffad253307 Merge branch 'master' into next 2018-10-06 09:50:52 +02:00
Nicolas Goaziou 1fbae137da Silence byte-compiler 2018-10-06 09:50:32 +02:00
Nicolas Goaziou da87967602 Merge branch 'master' into next 2018-10-06 09:45:01 +02:00
Nicolas Goaziou e7911a0fb1 org-macs: Add missing docstring
* lisp/org-macs.el (org-current-line-string): Add missing docstring.
2018-10-06 09:44:35 +02:00
Nicolas Goaziou 1b62a56498 Merge branch 'master' into next 2018-10-06 09:42:04 +02:00
Nicolas Goaziou 5cc69a9ebf Deprecate `org-babel-strip-quotes' in favor of `org-strip-quotes'
* lisp/ob-core.el (org-babel-strip-quotes): Remove function.
* lisp/org-macs.el (org-strip-quotes): New function.
* lisp/org-compat.el (org-babel-strip-quotes): Alias for new function.
* lisp/ob-haskell.el (org-babel-execute:haskell):
* lisp/ob-octave.el (org-babel-octave-evaluate-session): Use new function.
2018-10-06 09:40:33 +02:00
Nicolas Goaziou 26ed66b233 ob: :file and :file-ext no longer imply :results file
* lisp/ob-core.el (org-babel-execute-src-block): ":results file" must
  be specified in order to return a file.
(org-babel-merge-params): :file and :file-ext no longer imply :results
file.
* testing/lisp/test-ob.el (test-ob/indented-cached-org-bracket-link):
(test-ob/result-file-link-type-header-argument):
(test-ob/result-graphics-link-type-header-argument): Update tests.

Deducing the results from some other arguments is not obvious.
Moreover, it prevents users from setting, e.g., :file-ext, in a node
property, as every block would then create a file.

Reported-by: Alex Fenton <alex@pressure.to>
<http://lists.gnu.org/r/emacs-orgmode/2018-05/msg00469.html>
2018-10-06 08:56:05 +02:00
Marco Wahl ed9bdfd220 Merge branch 'master' into next 2018-10-05 00:54:19 +02:00
Marco Wahl 0ae2e656d7 test-org: More tests for cut and paste subtree 2018-10-04 23:49:00 +02:00
Nicolas Goaziou 0954d4c258 Merge branch 'master' into next 2018-10-04 22:52:53 +02:00
Nicolas Goaziou 2ada40b796 Fix `org-paste-subtree' when called at the end of a headline
* lisp/org.el (org-paste-subtree): Fix `org-paste-subtree' when called
  at the end of a headline.

Reported-by: Dale Sedivec <dale@codefu.org>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00050.html>
2018-10-04 22:50:09 +02:00
Kaushal Modi 5abfdeeb8f org-manual: Add cindex for include keyword options
* doc/org-manual.org (Include Files): Add cindex for :minlevel,
  :lines, :only-contents.
2018-10-04 10:55:10 -04:00
Nicolas Goaziou bb36c0c8ab Refactor `org-babel-load-file'
* lisp/org.el (org-babel-load-file): Refactor code.
2018-10-03 18:44:34 +02:00