Commit Graph

15175 Commits

Author SHA1 Message Date
Oleh Krehel 24ff7c648b Add image drag-and-drop and screenshot support to org-mode. 2014-01-04 16:20:23 +01:00
Bastien Guerry 0965364707 Merge branch 'maint' 2014-01-04 15:28:04 +01:00
Bastien Guerry e764dfe80b org-rmail.el (org-rmail-follow-link): Don't raise an error when no article is matched
* org-rmail.el (org-rmail-follow-link): Don't raise an error
when no article is matched.
2014-01-04 15:27:53 +01:00
Bastien Guerry d09088ca17 Merge branch 'maint' 2014-01-04 15:05:13 +01:00
Bastien Guerry 45b0d23b0c Fix creation of parent nodes when refiling.
* org.el (org-refile-get-location): Check for a refile
position when the position is not nil, otherwise allow to
create the parent node if the user requests it.

Thanks to Li Zhuo for reporting this bug and for providing
a preliminary patch.
2014-01-04 15:05:01 +01:00
Bastien Guerry c36ab62b11 Merge branch 'maint' 2014-01-04 14:53:10 +01:00
Bastien Guerry 857cf28a90 org.el (org-refile-allow-creating-parent-nodes): Fix typo in docstring
* org.el (org-refile-allow-creating-parent-nodes): Fix typo in
docstring.
2014-01-04 14:53:00 +01:00
Bastien Guerry 31c5e3dc8c Merge branch 'maint' 2014-01-04 14:49:07 +01:00
Bastien Guerry 2aeb5f0cad Merge branch 'maint' of orgmode.org:org-mode into maint 2014-01-04 14:48:51 +01:00
Bastien Guerry 597a7e65f0 org.el (org-entry-get): Minor docstring enhancement
* org.el (org-entry-get): Minor docstring enhancement.
2014-01-04 14:48:39 +01:00
Nicolas Goaziou 7ef92ae121 Merge branch 'maint' 2014-01-04 14:29:03 +01:00
Nicolas Goaziou 9b0067e166 ox-icalendar: Fix BBDB anniversaries integration
* lisp/ox-icalendar.el (org-icalendar--combine-files): Make sure
  anniversaries do not end up in *Message* buffer instead of the ICS
  file.

Patch-by: Thomas Baumann <tbaumann@tum.de>
2014-01-04 14:26:19 +01:00
Bastien Guerry 02078833e0 Merge branch 'maint' 2014-01-04 12:23:27 +01:00
Bastien Guerry 44acd00049 org.el (org-set-startup-visibility): Bugfix
* org.el (org-set-startup-visibility): Bugfix.

See http://article.gmane.org/gmane.emacs.orgmode/79905
2014-01-04 12:22:50 +01:00
Marc-Oliver Ihm 7e1ea27e78 Small updates to org-index.el 2014-01-03 19:58:38 +01:00
Marc-Oliver Ihm f69d4cef82 Updated org-index.el to Version 2.4 2014-01-03 18:38:17 +01:00
Bastien Guerry 914f3f88a7 Merge branch 'maint' 2014-01-03 17:38:19 +01:00
Bastien Guerry bee871762c org.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select' when point is on a clock log
* org.el (org-shiftcontrolup, org-shiftcontroldown): When
`org-support-shift-select' is not `nil', let-bind it to nil
if point is on a clock log.  Otherwise throw an error.
2014-01-03 17:38:02 +01:00
Bastien Guerry 62375dc3e5 Merge branch 'maint' 2014-01-03 17:16:10 +01:00
Bastien Guerry 6492b9cde4 ob-lob.el: Minor custom and docstring fixes
* ob-lob.el (org-babel-lob-files): Fix custom type.
(org-babel-lob-ingest): Small docstring fix.

Thanks to Glenn Morris for reporting them.
2014-01-03 17:15:34 +01:00
Bastien Guerry d97c050720 Merge branch 'maint' 2014-01-03 16:04:06 +01:00
Bastien Guerry adb6e545c7 org-agenda.el (org-cmp-ts): Fix bug
* org-agenda.el (org-cmp-ts): Fix bug: interpret `late' as
`later than any date' instead of `later than today'.

Thank to Michael Crouch for reporting this and to Michael Hoffman for
providing the fix.
2014-01-03 16:01:30 +01:00
Bastien Guerry f531d06f80 Merge branch 'maint' 2014-01-03 11:16:30 +01:00
Bastien Guerry f21150f185 org.el (org-do-emphasis-faces): Fix false positives handling
* org.el (org-do-emphasis-faces): Handle false positives by
restarting the re-search one char after the beginning of the
match, not one char before its ending.

Before this fix, consider this buffer

** Headline
  - *Bold* non-bold
  - *Bold* non-bold

The first false positive is "** Headline\n  - *Bold*"

Starting the search again from the last "*" will skip
the "*Bold*" string.  Starting again at "* Headline" will
find it.
2014-01-03 11:16:14 +01:00
Bastien Guerry d9b520586d Merge branch 'master' of orgmode.org:org-mode 2014-01-03 10:07:40 +01:00
Bastien Guerry af97893516 Merge branch 'maint' 2014-01-03 10:07:31 +01:00
Bastien Guerry 9758f203fb org.el (org-entry-put): Check that the value provided is a string
* org.el (org-entry-put): Check that the value provided is a
string.  If it is nil, convert it to the empty string.
2014-01-03 10:07:09 +01:00
Yasushi SHOJI 6ee4a75b68 ox: Add new Japanese translation strings
* lisp/ox.el (org-export-dictionary): Add new Japanese translation
  strings.

A few strings in `org-export-dictionary' didn't have Japanese
translations.  So, I just added.
2014-01-03 09:57:32 +01:00
Yasushi SHOJI 92b37eec82 ox: Convert Japanese translation from utf-8 to default
* lisp/ox.el (org-export-dictionary): Convert all Japanese translation
  from utf-8 to default.

There shouldn't be much need for exporters and users to worry about
the coding system of the final output.  If one wants to export a
"Japanese" document, he should already have the document with Japanese
capable coding system. In that case, Emacs should be able to handle
the coding system conversion form the translation table to the
designated file coding system.

There are two cases which I can think don't work:

  - all words in the document are written in romaji, and one wants
    romaji translations

  - the documents are writ en in a language which does not support
    Japanese character set, ie English or French, and one wants to use
    Japanese for non-content strings, ie TOC.

These cases are too rare that we can ignore for now.
2014-01-03 09:57:24 +01:00
Bastien Guerry 581db4e0a5 ob-clojure.el (org-babel-clojure-backend): Use 'cider when available
* ob-clojure.el (org-babel-clojure-backend): Use 'cider as the
backend when available.  Fall back on nrepl when available and
on slime otherwise.
2014-01-03 09:33:30 +01:00
Bastien Guerry 6e51188ead Merge branch 'maint' 2014-01-02 16:11:08 +01:00
Bastien Guerry 03ce57e7db Backport r115828 from Emacs trunk 2014-01-02 16:10:44 +01:00
Bastien Guerry 3c4a99c731 Merge branch 'maint' 2014-01-02 16:08:36 +01:00
Bastien Guerry a66028dfc5 Revert "Backport change from r115807 in Emacs trunk"
This reverts commit c2ed678f20.
2014-01-02 16:08:26 +01:00
Oleh Krehel 13bb11695b ob-J: Fix docstrings.
* lisp/ob-J.el (org-babel-J-interleave-echos): Update docstring.
  (org-babel-J-interleave-echos-except-functions): Update docstring.
  (obj-get-string-alignment): Update docstring.
  (obj-string-match-m): Update docstring.
2014-01-02 11:10:39 +01:00
Nicolas Goaziou eb5cb33218 Merge branch 'maint' 2014-01-01 19:07:31 +01:00
Nicolas Goaziou 1a3591c0e7 ox-html: Clean up some comments
* lisp/ox-html.el: Clean up "FIXME" comments.
2014-01-01 19:05:49 +01:00
Nicolas Goaziou e4386ba22a Merge branch 'maint' 2014-01-01 19:02:58 +01:00
Nicolas Goaziou 22c3bb81ff ox-publish: Fix a docstring
* lisp/ox-publish.el (org-publish-resolve-external-fuzzy-link): Fix
  docstring.
2014-01-01 19:02:13 +01:00
Nicolas Goaziou 4d652d21ae ox-html: Change default behaviour for unresolved link options
* lisp/ox-html.el (org-html-link): When an option cannot be resolved,
  append a hash sign as it could point to a target, instead of
  ignoring it.
2014-01-01 18:58:26 +01:00
Oleh Krehel e23bbda0aa ob-J.el: Fix wrong name in a call.
* lisp/ob-J.el (obj-get-string-alignment): Fix bug.
2013-12-31 22:56:20 +01:00
Oleh Krehel 8c67695e62 ob-J.el: Fix display of 3-dimensional arrays.
* lisp/ob-J.el (org-babel-J-interleave-echos): Change '' to ','.
  (org-babel-J-interleave-echos-except-functions): Improve regexp
  and change '' to ','.
  (org-babel-J-strip-whitespace): Change '' to ','.
  (obj-get-string-alignment): New function.
  (org-babel-J-print-block): Accomodate left- and right-aligned tables.
  (obj-match-second-space): Rename.
  (obj-match-second-space-left): Renamed from `obj-match-second-space'.
  (obj-match-second-space-right): New function.
2013-12-31 22:46:02 +01:00
Nicolas Goaziou ae1cf04833 org-element: Fix `org-element-at-point'
* lisp/org-element.el (org-element-at-point): Fix function when buffer
  starts with a headline.
2013-12-30 17:26:13 +01:00
Nicolas Goaziou 4dbbbe5b01 org-element: Small refactoring
* lisp/org-element.el (org-element-at-point): Refactor code.  Fixing
  structure in cached plain lists is no longer required since
  4423d750a4.
2013-12-30 14:15:11 +01:00
Nicolas Goaziou fde42c5303 org-element: Fix cache when point is at eob
* lisp/org-element.el (org-element-at-point): Fix cache when point is
  at eob and shortcut found something above.
2013-12-30 14:15:11 +01:00
Nicolas Goaziou 405b505c73 org-element: Fix cache update
* lisp/org-element.el (org-element--cache-sync): Fix cache update when
  a only contents of an element are modified.
(org-element--cache-shift-positions): Add optional argument allowing
partial shifting.
2013-12-30 14:15:11 +01:00
Bastien Guerry f58a8482b4 Merge branch 'maint' 2013-12-30 10:44:57 +01:00
Vladimir Lomov 71e2401bb5 ox-html.el: Use classes for caption instead of align
* ox-html.el (org-html-style-default): New classes
caption.t-above and caption.t-bottom.
(org-html-table): Use new classes.

TINYCHANGE

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
2013-12-30 10:44:43 +01:00
Bastien Guerry 855ba428f2 Merge branch 'maint' 2013-12-30 10:44:31 +01:00
Bastien Guerry 4898be673f Revert "ox-html.el: Use classes for caption instead of align"
This reverts commit 1813200fc8.
2013-12-30 10:43:43 +01:00