1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-26 20:20:38 +00:00
Commit Graph

21807 Commits

Author SHA1 Message Date
Nicolas Goaziou
845d028bac Merge branch 'master' into next 2018-12-18 09:42:17 +01:00
Nicolas Goaziou
5949d9352b org-capture: Tiny refactoring
* lisp/org-capture.el (org-capture): Use `when' instead of one-armed
  `if'.  Use `error-message-string' when possible.
2018-12-18 09:40:58 +01:00
Nicolas Goaziou
09d20cfff7 Merge branch 'master' into next 2018-12-18 09:33:23 +01:00
Nicolas Goaziou
fbd1deca57 org-protocol: Fix capture protocol without a URL
* lisp/org-protocol.el (org-protocol-capture): Do not corrupt
  `org-stored-links' when there is no URL to capture.
(org-protocol-do-capture): Remove function.

Reported-by: Allen Li <darkfeline@felesatra.moe>
<http://lists.gnu.org/r/emacs-orgmode/2018-12/msg00131.html>
2018-12-18 09:30:32 +01:00
Nicolas Goaziou
86a0659af8 Merge branch 'master' into next 2018-12-18 01:17:46 +01:00
Nicolas Goaziou
cd0517da24 org-manual: Fix markup
* doc/org-manual.org (Handling Links):
(Using capture):
(Capture templates):
(Refile and Copy):
(Footnotes): Fix markup.
2018-12-18 01:17:15 +01:00
Nicolas Goaziou
974bfcb0fa Merge branch 'master' into next 2018-12-18 01:07:47 +01:00
Nicolas Goaziou
abbe5d3958 Fix a docstring
* lisp/org.el (org-store-link-functions): Fix docstring.
2018-12-18 01:07:21 +01:00
Nicolas Goaziou
ddf6f2e8eb Merge branch 'master' into next 2018-12-18 00:44:17 +01:00
Nicolas Goaziou
0811af50b4 ox-latex: Improve subscript and superscript
* lisp/ox-latex.el (org-latex--wrap-latex-math-block): Ignore
  superscript and subscript.
(org-latex--script-size): Remove function.
(org-latex-subscript): Use \textsubscript.
(org-latex-superscript): Use \textsuperscript.

Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-12/msg00221.html>
2018-12-18 00:42:07 +01:00
Nicolas Goaziou
372099440f Merge branch 'master' into next 2018-12-17 17:45:24 +01:00
Nicolas Goaziou
c024844e56 org-capture: Fix failing tests
* testing/lisp/test-org-capture.el (test-org-capture/abort):
(test-org-capture/item):
(test-org-capture/table-line):
(test-org-capture/plain): Fix failing tests.
2018-12-17 17:43:23 +01:00
Bastien
a311f29db1 Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-12-17 09:49:26 +01:00
Nicolas Goaziou
dd26f03e18 Merge branch 'master' into next 2018-12-16 11:14:16 +01:00
Nicolas Goaziou
6656f11596 Fix typo
* lisp/org.el (org-do-latex-and-related): Fix typo.
2018-12-16 11:13:49 +01:00
Nicolas Goaziou
cc594e6fba Merge branch 'master' into next 2018-12-16 11:09:35 +01:00
Nicolas Goaziou
af3e2b1856 Fix fontification of LaTeX elements (take two)
* lisp/org.el (org-do-latex-and-related): Fix last commit.
2018-12-16 11:08:00 +01:00
Bastien
f89189c618 Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-12-15 17:16:47 +01:00
Nicolas Goaziou
6920c4390d Merge branch 'master' into next 2018-12-14 14:38:08 +01:00
Nicolas Goaziou
dc74770706 org-manual: Fix typos
* doc/org-manual.org (Using Emacs packaging system):
(Formula syntax for Calc):
(Lookup functions):
(Weekly/daily agenda):
(Setting limits for the agenda):
(Export Settings):
(Other Built-in Back-ends):
(Structure Templates):
(Adding Hyperlink Types): Use correct markup for sexps.
(Using the Mapping API): Fix typo.  Use correct markup.
2018-12-14 14:37:01 +01:00
Nicolas Goaziou
a34b43629b Merge branch 'master' into next 2018-12-14 14:23:09 +01:00
Nicolas Goaziou
b3afd71a06 org-manual: Small fixes
* doc/org-manual.org (A LaTeX example of radio tables): Use correct
  markup, improve wording, fix typo.
2018-12-14 14:22:07 +01:00
Nicolas Goaziou
8fc4fcb8a7 org-manual: Fix markup
* doc/org-manual.org (Special Agenda Views): Use = markup for sexps.
2018-12-14 14:18:01 +01:00
Bastien
4cc10166d7 Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-12-14 11:08:13 +01:00
Nicolas Goaziou
5da146626d Merge branch 'master' into next 2018-12-13 21:30:01 +01:00
Nicolas Goaziou
a86b14253b Fix fontification of LaTeX environments
* lisp/org.el (org-compute-latex-and-related-regexp):
(org-do-latex-and-related): Fix fontification of LaTeX environments.
2018-12-13 21:28:14 +01:00
Kaushal Modi
bd2a666a17 Merge branch 'master' into next 2018-12-13 14:11:08 -05:00
Kaushal Modi
a60a0edc6f Add :no-save keyword for Org capture templates
* lisp/org-capture.el (org-capture-finalize): Do not save the target
  capture file if :no-save keyword is non-nil in the capture template.
* doc/org-manual.org (Template elements),
  lisp/org-capture.el (org-capture-templates): Document :no-save.

Ref: https://lists.gnu.org/r/emacs-orgmode/2018-09/msg00325.html
2018-12-13 14:09:39 -05:00
Kaushal Modi
54123cd7f2 Revert "org-capture: Do not save buffer when running `org-capture-finalize'"
This reverts commit b4422add37.

Revert the regression in Org capture + auto-saving behavior.

Ref: https://lists.gnu.org/r/emacs-orgmode/2018-09/msg00325.html
2018-12-13 10:11:25 -05:00
Bastien
6423f391e0 Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-12-11 22:27:45 +01:00
Nicolas Goaziou
63e58ac22d Merge branch 'master' into next 2018-12-09 23:37:19 +01:00
Nicolas Goaziou
adec504d5b org-manual: Improve %(sexp) capture template placeholder documentation
* doc/org-manual.org (Template expansion): Improve documentation for
%(sexp) documentation.
2018-12-09 23:36:04 +01:00
Allen Li
601f373e3f Document %i prefix in capture templates
* doc/org-manual.org (Template expansion): Fix documentation.
* lisp/org-capture.el (org-capture-templates): Fix docstring.
2018-12-09 23:34:20 +01:00
Nicolas Goaziou
2f00151020 org-manual: Small markup fixes
* doc/org-manual.org (Template elements):
(Template expansion):
(Attachments): Replace ~ with =.
2018-12-09 12:34:05 +01:00
Nicolas Goaziou
f8533978db Merge branch 'master' into next 2018-12-08 21:21:10 +01:00
Jens Lechtenboerger
3b5e26651b ox-html: Export attributes specified with :attr_html for links
* lisp/ox-html.el (org-html-link): Export :attr_html from link.
2018-12-08 21:20:18 +01:00
Bastien
40111597c1 Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-12-08 14:54:48 +01:00
Jens Lechtenboerger
94d2dbf95f ox-html: New property HTML_HEADLINE_CLASS for class of headline
* lisp/ox-html.el (org-html-headline): Add new property
HTML_HEADLINE_CLASS to assign class attribute to headline.

* doc/org-manual.org (CSS support): Document new property
HTML_HEADLINE_CLASS.
2018-12-08 12:45:22 +01:00
Nicolas Goaziou
1eea78d1a5 Merge branch 'master' into next 2018-12-08 11:50:30 +01:00
Nicolas Goaziou
e9108043e1 org-capture: Fix %i with prefix containing "\\"
* lisp/org-capture.el (org-capture-fill-template): Fix %i with prefix
  containing "\\".
* testing/lisp/test-org-capture.el (test-org-capture/fill-template):
  Add test.
2018-12-08 11:49:10 +01:00
Bastien
094cb8ecdc Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-12-07 07:40:35 +01:00
Nicolas Goaziou
63e8efda8d Merge branch 'master' into next 2018-12-06 23:20:18 +01:00
Nicolas Goaziou
4c23d83eed manual: Tiny rewording
* doc/org-manual.org (LaTeX math snippets): Tiny rewording.
2018-12-06 23:18:36 +01:00
Nicolas Goaziou
fc464d7a72 manual: Fix footnote location
* doc/org-manual.org (Customizing tables in ODT export): Fix footnote location.
2018-12-06 23:11:14 +01:00
Emmanuel Charpentier
e30aed8f0c manual: document the need for babel when setting LANGUAGE keyword
* doc/org-manual.org (Export Settings): Add a note to Export
Variables.
(LaTeX specific export settings): Describe the use of
org-latex-packages-alist for loading babel (or polyglossia) with the
right argument in LaTeX specific export settings.
2018-12-06 23:09:28 +01:00
Nicolas Goaziou
253686a402 Merge branch 'master' into next 2018-12-06 15:07:21 +01:00
Nicolas Goaziou
1d60d5ee03 org-capture: Correctly store position of captured entry
* lisp/org-capture.el (org-capture-place-entry): Store position at the
  beginning of the capture entry, not at its end.
* testing/lisp/test-org-capture.el (test-org-caputre/entry): Add test.
2018-12-06 15:07:03 +01:00
Nicolas Goaziou
b423a6187a Merge branch 'master' into next 2018-12-06 00:25:45 +01:00
Nicolas Goaziou
503ede74bc org-clock: Fix resolving clocks
* lisp/org-clock.el (org-clock-resolve-clock): Fix resolving clocks
  when the entry is empty barring the clock itself and possibly the
  clock drawer, and `org-clock-out-remove-zero-time-clocks' is
  non-nil.
2018-12-06 00:24:14 +01:00
Nicolas Goaziou
6f8347a834 org-clock: Use `org-link-display-format'
* lisp/org-clock.el (org-clock--mode-line-heading): Use
  `org-link-display-format'.
2018-12-02 14:49:02 +01:00