Commit Graph

2231 Commits

Author SHA1 Message Date
Kyle Meyer 6fee6b6cde Merge branch 'maint' 2017-05-09 14:49:59 -04:00
Kyle Meyer 1eab2bb5e2 org-link-edit.el: Sync with upstream
Update to version 1.1.1 (e975aebf8).
2017-05-09 14:49:22 -04:00
Nicolas Goaziou ac656ad7b9 Merge branch 'maint' 2017-05-06 09:03:14 +02:00
Łukasz Stelmach a4f29410e9 ox-s5: Update to work with refactored HTML backend
* contrib/lisp/ox-s5.el (org-s5-template): Adapt to changes introduced
by c9ca0b6d in the way :html-divs/org-html-divs are passed to ox-html.
2017-05-06 09:02:01 +02:00
Kyle Meyer c28ec3a170 Merge branch 'maint' 2017-05-04 00:03:00 -04:00
Kyle Meyer fef346798f ox-extra: Merge sections from ignored headlines
* contrib/lisp/ox-extra.el (org-extra--merge-sections): New function.
(org-export-ignore-headlines): Merge multiple sections that result
from removing ignored headlines.

Prevent org-export-ignore-headlines from violating the one headline to
one section mapping that is relied on by at least one export backend,
ox-texinfo.  (ox-texinfo uses each section to generate the menu.)
2017-05-03 23:35:40 -04:00
Kyle Meyer fa1c6e92ac ox-extra: Use cl-lib
* contrib/lisp/ox-extra.el (org-latex-header-blocks-filter): Use "cl-"
prefix.
2017-05-03 23:35:40 -04:00
Marc Ihm cbe544edf3 ox-confluence: Export checkboxes; fix timestamps in headlines
* contrib/lisp/ox-confluence.el (org-confluence-item): Export
  checkboxes.
(org-confluence-timestamp): Fix timestamps in headlines.  Silence
byte-compiler.
2017-05-02 08:48:16 +02:00
Nicolas Goaziou 698f020be1 Merge branch 'maint' 2017-04-17 11:29:48 +02:00
Stephen Mackenzie 166364bc96 ox-confluence.el: Blank table cells produce required whitespace
* 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
2017-04-17 11:29:10 +02:00
Kyle Meyer b7d4bf7e02 Merge branch 'maint' 2017-04-16 17:08:17 -04:00
Kyle Meyer 7fb6ab52c4 Don't call kill-this-buffer outside of menus
* 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.
2017-04-16 17:07:44 -04:00
Kyle Meyer 1336347065 Merge branch 'maint' 2017-04-09 20:52:41 -04:00
Kyle Meyer 08674eae54 org-link-edit.el: Sync with upstream
Update to version 1.1.0 (af79eebdb).
2017-04-09 20:48:07 -04:00
U-IHM-NOTEBOOK\Olli 0ea6845711 org-index.el, version 5.3.0: focus can now be a list; cleaned up dependencies 2017-03-28 20:57:37 +02:00
Nicolas Goaziou a2fd3bc91b Merge branch 'maint' 2017-03-16 13:08:12 +01:00
Robert Klein 175543e5ef Fix custom timestamps during export (ox-groff)
* contrib/lisp/ox-groff.el (org-groff-clock, org-groff-planning): Use
  org-translate-time'.

(propagate changes introduced to other export backends in commit
e1adb17ba509a43e9a03a5b367a98b8bc8de8b02.)
2017-03-16 13:08:00 +01:00
Nicolas Goaziou 3b9dac26a9 Merge branch 'maint' 2017-03-05 18:39:22 +01:00
Marc Ihm 1a70061e3f ox-confluence: Handle checkboxes and inactive timestamps correctly
* contrib/lisp/ox-confluence.el (org-confluence-timestamp): New
  function.
(org-confluence-headline): Use new function.
(org-confluence-table-cell): Add missing space.

Fix handling of square brackets from timestamps and checkboxes; avoid
invalid confluence markup for empty table headers.
2017-03-05 18:37:48 +01:00
U-IHM-NOTEBOOK\Olli f572294457 new version 5.2.3 with more performance and customizations 2017-02-20 20:38:29 +01:00
Nicolas Goaziou 7e8cf5f4c2 Use Org duration library
* contrib/lisp/org-depend.el (org-depend-trigger-todo): Use new
  functions.

* contrib/lisp/org-invoice.el (org-invoice-heading-info):
(org-invoice-info-to-table):
(org-invoice-list-to-table): Use new functions.

* contrib/lisp/ox-taskjuggler.el (org-taskjuggler--build-task): Use
  new functions.

* lisp/org-agenda.el (org-agenda-show-clocking-issues):
(org-agenda-format-item):
(org-agenda-filter-effort-form): Use new functions.

* lisp/org-clock.el (org-clock-get-clock-string):
(org-clock-modify-effort-estimate):
(org-clock-notify-once-if-expired):
(org-clock-out):
(org-clock-display):
(org-clock-put-overlay):
(org-clocktable-write-default): Use new functions.

* lisp/org-table.el (org-table-sort-lines): Use new functions.

* lisp/org.el (org-properties-postprocess-alist):
(org-refresh-effort-properties):
(org-set-effort):
(org-entry-properties):
(org-property-next-allowed-value): Use new functions.

(org-time-clocksum-format):
(org-time-clocksum-use-fractional):
(org-time-clocksum-use-fractional-format):
(org-time-clocksum-use-effort-durations): Declare as obsolete.  Move
to "org-compat.el".

(org-minutes-to-clocksum-string):
(org-hh:mm-string-to-minutes):
(org-duration-string-to-minutes): Declare as obsolete.  Move to
"org-compat.el".
(org-hours-to-clocksum-string): Remove function.

* lisp/org-colview.el (org-columns--collect-values): Use new
  functions.
(org-columns--duration-re): Remove variable.
(org-columns--time-to-seconds): Rename to...
(org-columns--age-to-minutes): ... this.
(org-columns--format-age): New function.
(org-columns--summary-apply-times):
(org-columns--summary-min-age):
(org-columns--summary-max-age):
(org-columns--summary-mean-age): Use new functions.

* testing/lisp/test-org-clock.el (test-org-clock-clocktable-contents-at-point):
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Update tests.
2017-02-13 14:41:15 +01:00
Nicolas Goaziou 2064b0a393 Merge branch 'maint' 2017-02-05 09:23:12 +01:00
Sebastien Le Maguer 3dc4fa9d9d ox-bibtex: Take key with spaces or non-alphabetic characters into account
* ox-bibtex.el (org-bibtex-process-bib-files): Solve a bug in which
ox-bibtex was not considering enterily keys like "Author et&bsp; al.,
1999" as valid.

TINYCHANGE
2017-02-05 09:21:55 +01:00
Nicolas Goaziou 13b18ea5e6 Merge branch 'maint' 2017-02-01 15:43:18 +01:00
Nicolas Goaziou 76c08ea77b Replace org-set-local by setq-local in the documentation
* contrib/orgmanual.org (Conflicts): Update yasnippet instructions.

* doc/org.texi (Packages that conflict with Org mode): Update
  yasnippet instructions

TINYCHANGE
2017-02-01 15:42:04 +01:00
U-IHM-NOTEBOOK\Olli def8a848ba version 5.2.1 of org-index with speed improvements 2017-01-30 18:42:46 +01:00
Bastien eb87e9b8fe Delete contrib/lisp/org-mime.el
See https://github.com/melpa/melpa/pull/4497#issuecomment-275907926
2017-01-29 18:47:37 +01:00
U-IHM-NOTEBOOK\Olli 5210de7f16 org-index.el with new command 'focus' 2017-01-22 21:14:58 +01:00
Nicolas Goaziou 37bffbb347 Merge branch 'maint' 2017-01-21 11:59:12 +01:00
Nicolas Goaziou 53bc58c433 Rename `org-latex--make-preamble' into `org-latex-make-preamble'
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template):
* lisp/org.el (org-create-formula-image):
* lisp/ox-beamer.el (org-beamer-template):
* lisp/ox-latex.el (org-latex-make-preamble): Renamed from
  `org-latex--make-preamble'.  Add an optional argument.  Autoload
  function.
(org-latex-template): Use new function name.
2017-01-21 11:31:25 +01:00
Nicolas Goaziou 25b812104d orgmanual: Remove outdated instructions 2017-01-12 21:27:10 +01:00
Kyle Meyer 0d3683f2cd Merge branch 'maint' 2017-01-05 20:23:58 -05:00
Kyle Meyer 713f785017 Update copyright years 2017-01-05 20:19:37 -05:00
Bastien d0d05e5df1 Delete org-bullets.el from the contrib/ directory
* lisp/org.el (org-modules): Don't mention org-bullets.el,
which is now deleted from the contrib/ directory.

See https://github.com/sabof/org-bullets/issues/18
2017-01-03 12:22:38 +01:00
Bastien 8071bce880 Delete contrib/lisp/org-ebib.el
See https://github.com/joostkremers/ebib/issues/112#issuecomment-270091851
2017-01-03 12:10:00 +01:00
Lungang Fang 2b93cec8c2 ox-confluence.el: Export fixed-width as example-block
* contrib/lisp/ox-confluence.el (org-confluence-fixed-width):
export fixed-width as example-block so that the outcome is more
consistent with org-mode format.  Other back-ends (say ox-md.el)
also work this way.

TINYCHANGE
2016-12-14 13:22:44 +01:00
Lungang Fang 01b2c12fec ox-confluence.el: Support quote blocks
* contrib/lisp/ox-confluence.el (org-confluence-quote-block): New
  function.

Convert quote blocks as shown below:

This is a quote   ==>   This is a quote
2016-12-13 13:59:34 +01:00
Lungang Fang dadad5fa39 ox-confluence.el: Fix error in `org-confluence-fixed-width`
* contrib/lisp/ox-confluence.el (org-confluence-fixed-width): retrieve
  value of org element "fixed-width" instead of using "content", which
  is empty.
2016-12-13 13:55:26 +01:00
Charles Durst 9e5bdb04d7 Add support for ordered list to ox-confluence.el
* contrib/lisp/ox-confluence.el (org-confluence-item): Support
  descriptive list

When converting a descriptive list item, be sure to include the "item"
part, not just the description.

TINYCHANGE
2016-12-13 13:49:34 +01:00
Lungang Fang f184ee9d2d ox-confluence.el: Add support for ordered list
* contrib/lisp/ox-confluence.el (org-confluence-item): Support ordered
list

When converting a bullet item, examine the type of it and convert
accordingly.

TINYCHANGE
2016-12-09 21:33:47 +01:00
Charles Durst b25dd07bc0 ox-confluence.el: Add support for verbatim & code
* contrib/lisp/ox-confluence.el (org-confluence-verbatim,
org-confluence-code): New functions.

Convert org-mode =verbatim= and ~code~ into Confluence {{monospace}}.

TINYCHANGE
2016-12-05 22:22:53 +01:00
Chunyang Xu 4ea7ffe50d org-mac-link: Add autoload cookies for all commands
* contrib/lisp/org-mac-link.el (org-mac-grab-link):
(org-mac-firefox-get-frontmost-url):
(org-mac-firefox-insert-frontmost-url):
(org-mac-vimperator-get-frontmost-url):
(org-mac-vimperator-insert-frontmost-url):
(org-mac-chrome-get-frontmost-url):
(org-mac-chrome-insert-frontmost-url):
(org-mac-safari-get-frontmost-url):
(org-mac-safari-insert-frontmost-url):
(org-mac-together-get-selected):
(org-mac-together-insert-selected):
(org-mac-finder-item-get-selected):
(org-mac-finder-insert-selected):
(org-mac-addressbook-item-get-selected):
(org-mac-addressbook-insert-selected):
(org-mac-skim-get-page):
(org-mac-skim-insert-page):
(org-mac-acrobat-get-page):
(org-mac-acrobat-insert-page):
(org-mac-outlook-message-get-links):
(org-mac-outlook-message-insert-selected):
(org-mac-outlook-message-insert-flagged):
(org-mac-evernote-note-insert-selected):
(org-mac-devonthink-item-insert-selected):
(org-mac-message-get-links):
(org-mac-message-insert-selected):
(org-mac-message-insert-flagged): Add autoload cookie.
2016-11-26 11:39:59 +01:00
Bastien 82c98e3caf Delete contrib/lisp/ox-gfm.el
See https://github.com/larstvei/ox-gfm/issues/14.
2016-10-31 12:46:15 +01:00
Oleh Krehel 1399f58049 contrib/lisp/org-download.el: Remove
Fixes https://github.com/abo-abo/org-download/issues/38

The package remains available at the above address and MELPA.
2016-10-30 09:10:23 +02:00
Konubinix 8d672a2f7d org-expiry: Call `org-expiry-expired-p' correctly
* contrib/lisp/org-expiry.el (org-expiry-process-entry): Call
  `org-expiry-expired-p' with the correct number of arguments.  It does
  not accept argument anymore.
2016-10-04 12:04:02 +02:00
Bastien c0fb62dc68 Merge branch 'maint' 2016-09-30 10:00:57 +02:00
Bastien cd5e2d94d8 Fix link (un)escaping.
Thanks for David Bremner <bremner@debian.org> for reporting this
and proposing this fix.
2016-09-30 10:00:18 +02:00
Aaron Ecay 67129acdfe contrib: Use assq instead of assoc with quoted symbols 2016-09-23 11:20:55 +01:00
Aaron Ecay 407b0d41a2 contrib, test suite: use assq instead of assoc for :keywords 2016-09-23 11:20:55 +01:00
Nicolas Goaziou fd5323ccee Merge branch 'maint' 2016-09-22 21:57:17 +02:00