Commit Graph

9766 Commits

Author SHA1 Message Date
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
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
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
Bastien Guerry 52d34f6cbc Merge branch 'maint' 2013-12-30 10:37:33 +01:00
Vladimir Lomov 1813200fc8 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.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
2013-12-30 10:35:13 +01:00
Bastien Guerry c8bb89faca Merge branch 'maint' 2013-12-30 10:32:24 +01:00
Bastien Guerry 8bb519d934 Fix defcustoms: don't quote const values.
* ob-latex.el (org-babel-latex-htlatex-packages): Use repeat
instead of list as the defcustom type.

* ox.el (org-export-with-creator):
* org.el (org-loop-over-headlines-in-active-region)
(org-mouse-1-follows-link, org-provide-todo-statistics):
* org-agenda.el (org-agenda-custom-commands-local-options)
(org-agenda-start-with-log-mode)
(org-agenda-show-inherited-tags): Don't quote const values.

Thanks to Glenn Morris for reporting this.
2013-12-30 10:30:44 +01:00
Bastien Guerry 9d3e48f629 Add missing :type to a few options.
* ox-texinfo.el (org-texinfo-def-table-markup):
* org-inlinetask.el (org-inlinetask-show-first-star):
* ob-maxima.el (org-babel-maxima-command): Add type.

Thanks to Glenn Morris for reporting this.
2013-12-30 10:13:57 +01:00
Vladimir Lomov 0dee513f6b ox: Russian translation for all supported strings
* ox.el: Completed Russian translation for all available strings.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
2013-12-29 09:55:50 +01:00
Nicolas Goaziou 398dbd91ed org-element: Fix `org-element-at-point' shortcut
* lisp/org-element.el (org-element-at-point): Correctly move from
  blank line to blank line in order to find a known element above.
2013-12-27 15:41:41 +01:00
Nicolas Goaziou 954168565b Merge branch 'maint' 2013-12-26 12:43:06 +01:00
Nicolas Goaziou 4ee7e60405 ox: Fix smart quote detection
* lisp/ox.el (org-export-smart-quotes-regexps): Fix smart quote
  detection when it is followed by an open parenthesis syntax class.
2013-12-26 12:35:59 +01:00
Nicolas Goaziou c0aa83bf41 ox: Fix uninterpreted objects in TITLE property
* lisp/ox.el (org-export-remove-uninterpreted-data): Renamed from
  `org-export--remove-uninterpreted'.
(org-export--remove-uninterpreted-data-1): New function.
(org-export-as): Use new function.
* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add test.
2013-12-26 12:26:11 +01:00
Nicolas Goaziou 39c936584a ox-latex: Fix inline math in title
* lisp/ox-latex.el (org-latex--wrap-latex-math-block): Change
  signature.
(org-latex-math-block-tree-filter,
org-latex-math-block-options-filter): New functions.

This patch fixes 68fda96c06, where
changes to inline math export were not propagated to document
properties.
2013-12-26 12:26:11 +01:00
Nicolas Goaziou 4cb98ed1cd org-element: Fix org-element-insert-before
* lisp/org-element.el (org-element-insert-before): Handle insertion at
  the beginning of a :title property.
2013-12-26 12:26:11 +01:00
Oleh Krehel 0ef823725b ob-J (obj-strip-leading-ws): Remove redundant function.
* lisp/ob-J.el (obj-strip-leading-ws): Remove function.
  (org-babel-J-print-block): Use `org-trim' instead.
2013-12-23 14:48:06 +01:00
Oleh Krehel 7ea6c3cf38 ob-J: Fix explicit body regexp.
* lisp/ob-J.el (org-babel-J-interleave-echos-except-functions):
  Explicit body has to end either with "\n)\n" or with "\n)$".
2013-12-23 14:39:43 +01:00
Bastien Guerry d4710bd0aa Merge branch 'maint' 2013-12-23 06:58:46 +01:00
Bastien Guerry fc3857b310 Small rewrite of the previous commit.
Use `regexp-opt' instead of `regexp-quote'.
2013-12-23 06:58:26 +01:00
Bastien Guerry acfe7255ff Merge branch 'maint' 2013-12-23 00:11:37 +01:00
Ted Wiles a7417ffcdb org-habit.el (org-habit-parse-todo): Match all TODO keywords, not just "TODO"
* org-habit.el (org-habit-parse-todo): Match all TODO
keywords, not just "TODO".

TINYCHANGE
2013-12-23 00:10:44 +01:00
Oleh Krehel fa2e39148f lisp/ob-J.el (obj-string-match-m): add missing function 2013-12-22 18:48:29 +01:00
Bastien Guerry b291cdbe6d Merge branch 'maint' 2013-12-22 10:10:02 +01:00
Bastien Guerry eb28fe41dc org-table.el (org-table-fix-formulas): Handle multiple #+tblfm: lines
* org-table.el (org-table-fix-formulas): Handle multiple
#+tblfm: lines.

Thanks to Daniel Gerber for reporting this problem.
2013-12-22 10:09:53 +01:00
Thierry Banel 14337ce4eb Merge D-language into ob-C.el C&C++-languages 2013-12-21 11:59:27 -07:00
Eric Schulte 39a6ce6e46 removed top-level (require 'j-console) 2013-12-21 11:58:18 -07:00
Nicolas Goaziou 663cb3b9b9 ox: Fix a dictionary entry
* lisp/ox.el (org-export-dictionary): Fix an entry.

Suggested-by: Yasushi SHOJI <yashi@atmark-techno.com>
2013-12-21 09:49:44 +01:00
Nicolas Goaziou 5b778a6940 ox: Fix ^:{} handling
* lisp/ox.el (org-export--remove-uninterpreted): Fix ^:{} handling.
* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add test.
2013-12-20 21:51:17 +01:00
Eric Schulte be70c688b2 fix typo
* lisp/org.el (org-babel-load-languages): Forgot to capitalize "j".
2013-12-20 10:11:29 -07:00
Eric Schulte 44f6bde0cf add J to babel languages
* lisp/org.el (org-babel-load-languages): Add J to babel languages.
2013-12-20 10:05:10 -07:00
Oleh Krehel 98811ad800 Add org-babel support for J. 2013-12-20 10:00:02 -07:00
Nicolas Goaziou 68fda96c06 ox-latex: Fix 24b61d9105
* lisp/ox-latex.el (org-latex--wrap-latex-math-block): Refactor code
  to make it easier to read.  Fix a code typo.  Silence byte-compiler.
2013-12-19 22:49:48 +01:00
Nicolas Goaziou 24b61d9105 ox-latex: Handle entities cluster
* lisp/ox-latex.el (org-latex-pseudo-objects): New variable.
(org-latex--wrap-latex-math-block): New function.
(org-latex-table, org-latex--math-table): declare pseudo objects.

This patch provides support for constructs like:

  \alpha_b

which should be translated as

  $\alpha_{\text{b}}$

instead of

  $\alpha$$_{\text{b}}$
2013-12-19 21:59:15 +01:00
Bastien Guerry da05ab32f1 Merge branch 'maint' 2013-12-18 16:00:24 +01:00
Bastien Guerry 8e00dbb00b ox.el (org-export-to-file): Fix typo in docstring
* ox.el (org-export-to-file): Fix typo in docstring.
2013-12-18 16:00:05 +01:00
Nicolas Goaziou 86eb0afe05 ox: Fix export of uninterpreted elements
* lisp/ox.el (org-export-data): Do not check for uninterpreted
  elements or objects.  These are removed from parse tree anyway.
(org-export--remove-uninterpreted): New function.
(org-export--interpret-p): Removed function.
(org-export-as): Handle uninterpreted elements and objects.
2013-12-18 14:25:03 +01:00
Nicolas Goaziou b44fbb920c Merge branch 'maint' 2013-12-16 21:04:57 +01:00
Nicolas Goaziou b22714a88d org-element: Keep compatibility with Babel's regexps
* lisp/org-element.el (org-element-inline-babel-call-successor): Use
  original regexp to stay up-to-date with Babel changes.
2013-12-16 21:00:57 +01:00
Eric Schulte 085b7e8d16 no spaces in call line names
* lisp/ob-lob.el (org-babel-inline-lob-one-liner-regexp): Don't allow
  spaces in call line function names.
2013-12-16 08:04:59 -07:00
Aaron Ecay 5b9e79c8b8 org.el: use a shy regex for fontifying macros
* lisp/org.el (org-set-font-lock-defaults): use a shy regex for
identifying macros to fontify

Before this change, the xxx in the following text would be erroneously
fontified with the macro face:

{{{macro1()}}} xxx {{{macro2()}}}
2013-12-15 23:31:47 -05:00
Nicolas Goaziou d55f0632b5 Merge branch 'maint' 2013-12-15 16:18:31 +01:00
Nicolas Goaziou f1b9339aa5 org-element: Fix affiliated keyword regexp
* lisp/org-element.el (org-element--affiliated-re): Fix affiliated
  keyword regexp.
2013-12-15 16:16:20 +01:00
Nicolas Goaziou 29c02c3810 ox-org: Remove attr_backend keywords
* lisp/ox-org.el (org-org-identity): Since back-end specific keywords
  are stripped from output, also remove attr_backend keywords.
2013-12-15 15:17:24 +01:00
Nicolas Goaziou 4e02e48fa3 Merge branch 'maint'
Conflicts:
	doc/org.texi
2013-12-15 14:59:33 +01:00
Nicolas Goaziou 18d3057e62 org.texi: Document `org' back-end
* doc/org.texi (Org export): New section.
* lisp/ox-org.el: Remove initial code comments since this is now in
  manual.
2013-12-15 14:52:46 +01:00
Nick Dokos 17e11fe419 Delete :grouptags from tags list when creating org-mobile index file
* org-mobile.el (org-mobile-create-index-file): delete :grouptags
  entries from tags list when creating the org-mobile index file.

Reported by Dror Atariah - see

    http://thread.gmane.org/gmane.emacs.orgmode/79803

and (the continuation of the above thread)

    http://thread.gmane.org/gmane.emacs.orgmode/79856
2013-12-14 15:17:18 -05:00
Bastien Guerry 059dc08dec ob-clojure.el (org-babel-execute:clojure): Don't pretty print results
* ob-clojure.el (org-babel-execute:clojure): Don't pretty
print results.

Thanks to Daniel Szmulewicz for reporting this.
2013-12-14 14:26:56 +01:00
Eric Schulte fb09863fbb more shell names 2013-12-13 16:04:41 -07:00
Eric Schulte ea993c6d8c fixed insertion of results with hashes
No longer overwrites intervening #+ lines.

* lisp/ob-core.el (org-babel-where-is-src-block-result): Fixed
  insertion of results with hashes.
2013-12-13 15:06:06 -07:00
Eric Schulte 3b3dbca13c finish rename (split up for git) 2013-12-13 09:54:48 -07:00
Eric Schulte 583e7ab175 rename ob-sh to ob-shell 2013-12-13 09:54:28 -07:00
Eric Schulte 7a6c0e3541 multiple code block types for multiple shells
* lisp/ob-sh.el (org-babel-sh-command): Now set from
  `shell-file-name'.
  (org-babel-shell-names): List of specific shells known to Org mode
  shell code blocks.
  (org-babel-execute:shell): New generic shell execution function.
2013-12-13 09:52:05 -07:00
Eric Schulte d286d81b57 Revert "change default sh code block shell to bash"
This reverts commit 1f498c93f2.
2013-12-13 09:19:00 -07:00
Nicolas Goaziou 149eafb487 org-element: Small change to cache optimization
* lisp/org-element.el (org-element-at-point): Simplify opportunistic
  shortcut by looking only for blank lines and headlines or
  inlinetasks.  Since regexp is simpler, we can afford to make more
  searches.
2013-12-12 23:49:49 +01:00
Nicolas Goaziou 4423d750a4 org-element: Fix holes in cache
* lisp/org-element.el (org-element--cache-stable-types): New variable.
(org-element--cache-sync): Do not store elements with missing parents
in cache.

The bug was introduced in 71c8474ae9.
Parsing doesn't always start from beginning of section, which means
that missing parents aren't always repaired while moving to the
current element.  Therefore, we need to remove any element from cache
with an invalid parent property.
2013-12-12 23:04:29 +01:00
Eric Schulte 031d2565f7 don't change code block body during sha1 hashing
* lisp/ob-core.el (org-babel-sha1-hash): Don't change code block body
  during sha1 hashing.
2013-12-10 11:11:27 -07:00
Eric Schulte ed64845fd6 fix bug introduced by e6a6fed
* lisp/ob-core.el (org-babel-sha1-hash): Don't reference non-existent
  params variable.
2013-12-10 11:00:29 -07:00
Eric Schulte e6a6fed934 expanded noweb references when calculating hashes
The bulk of the new code in org-babel-sha1-hash is borrowed from
org-babel-expand-src-block.

* lisp/ob-core.el (org-babel-sha1-hash): Expanded noweb references
  when calculating hashes.
2013-12-10 00:36:16 -07:00
Bastien Guerry 0eb020a377 Merge branch 'maint' 2013-12-07 08:17:46 +01:00
Bastien Guerry 7fe99af695 Fix bug when using both electric-pair-mode and delete-selection-mode
* org.el (org-self-insert-command)
(orgtbl-self-insert-command): Change the value of the
`delete-selection' property to allow other commands like
`electric-pair-will-use-region' to be run before deletion.

Thanks to Harald Hanche-Olsen for reporting this.
2013-12-07 08:17:33 +01:00
Nicolas Goaziou 5d359d864f Merge branch 'maint'
Conflicts:
	lisp/ob-exp.el
2013-12-06 16:42:43 +01:00
Nicolas Goaziou ba20e937ae ob-exp: Fix duplicate evaluation with :wrap src
* lisp/ob-exp.el (org-babel-exp-process-buffer): Fix duplicate
  evaluation with :wrap src.
(org-babel-exp-non-block-elements): Removed function.
* testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): Fix test.
2013-12-06 16:40:23 +01:00
Nicolas Goaziou 37eb0df867 Move `org-comment-dwim' in an appropriate section
* lisp/org.el (org-comment-dwim): Move function into "comment" related
  part of the library.
2013-12-06 16:37:57 +01:00
Bastien Guerry 3f6b1dcfd4 Merge branch 'maint' 2013-12-06 15:23:05 +01:00
Bastien Guerry 6a86f32c70 org-attach.el: Check whether git is installed
* org-attach.el (vc-git): Require.
(org-attach-commit): Check whether git is installed.

Thanks to Jonathan Leech-Pepin for reporting this.
2013-12-06 15:22:50 +01:00
Bastien Guerry 487c74580c Fix bug when commenting source code.
* org.el (org-babel-do-in-edit-buffer): Declare.
(org-babel-load-file, org-insert-comment)
(org-comment-or-uncomment-region): Don't require 'ob-core.
(org-mode-map): Remap `comment-dwim' to `org-comment-dwim'.
(org-comment-dwim): New command.

* ob-core.el (org-babel-do-in-edit-buffer): Make an autoload.

See http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00154.html
for a discussion about this bug.
2013-12-06 10:45:35 +01:00
Nicolas Goaziou 3a317abc23 Merge branch 'maint' 2013-12-03 21:50:45 +01:00
Nicolas Goaziou af6f14d907 Fix C-c C-c behaviour on some objects
* lisp/org.el (org-ctrl-c-ctrl-c): When point is on an unsupported
  object, look for something to do at a higher level instead of
  bailing out.

For example, C-c C-c should toggle checkbox in the following example
even though X point is technically on a subscript.

  - [ ] a_Xb
2013-12-03 21:41:48 +01:00
Nicolas Goaziou 3f6c64a8e2 ox-publish: Introduce `org-publish-after-publishing-hook'
* lisp/ox-publish.el (org-publish-after-publishing-hook): New variable.
(org-publish-file): Call hook with file name and output file name as
arguments.  Small refactoring.
(org-publish-attachment): Return output file.
2013-12-03 21:10:59 +01:00
Nicolas Goaziou 317efee93b Merge branch 'maint'
Conflicts:
	contrib/lisp/org-drill.el
2013-12-03 21:02:48 +01:00
Nicolas Goaziou 8953b417f2 ox-html: Fix LaTeX fragments export
* lisp/ox-html.el (org-html-format-latex): Add an argument.  Ensure
  latex header is the same as specified in the original buffer when
  exporting a LaTeX fragment or environment.
(org-html-latex-environment, org-html-latex-fragment): Apply signature
change.
2013-12-03 20:57:08 +01:00
Eric Schulte baa44f6542 add --set=\"ON_ERROR_STOP=1\" to psql execution
Thanks to Joost Helberg for suggesting this change.

* lisp/ob-sql.el (org-babel-execute:sql): Add
  --set=\"ON_ERROR_STOP=1\" to psql execution.
2013-12-01 11:07:16 -07:00
Nicolas Goaziou cd439bc513 org-element: Extend `org-element-set-element' to strings
* lisp/org-element.el (org-element-set-element): Allow to replace
  a string with an element, an element with a string, or a string with
  a string.
2013-12-01 17:05:34 +01:00
Nicolas Goaziou 798ad3a27e org-element: Implement `org-element-insert-before'
* lisp/org-element.el (org-element-insert-before): New function.
* testing/lisp/test-org-element.el (test-org-element/insert-before):
  New test.
2013-12-01 17:05:34 +01:00
Nicolas Goaziou b0216248e3 org-element: Implement `org-element-extract-element'
* lisp/org-element.el (org-element-extract-element): New function.
* testing/lisp/test-org-element.el (test-org-element/extract-element):
  New test.
2013-12-01 17:05:34 +01:00
Nicolas Goaziou 0fd4245a43 org-element: Implement `org-element-secondary-p'
* lisp/org-element.el (org-element-secondary-p): New function.
* lisp/ox.el (org-export-get-previous-element,
  org-export-get-next-element): Use new function.
* testing/lisp/test-org-element.el (test-org-element/secondary-p): New
  test.
2013-12-01 17:05:34 +01:00
Nicolas Goaziou 45509c4490 ox: Fix erroneous code comment
* lisp/ox.el (org-export--generate-copy-script): Fix code comment.
2013-11-29 10:07:31 +01:00
Nicolas Goaziou 320ae9021e ox: Fix cache confusion during export
* lisp/ox.el (org-export--generate-copy-script): Do not share cache
  when copying buffers since keys and values are modified by
  side-effect.
2013-11-28 22:19:29 +01:00
Bastien Guerry c811bb0ea5 org.el (org-cycle-hide-drawers): Fix bug about re-searching at the wrong side of point
* org.el (org-cycle-hide-drawers): Fix bug about re-searching
at the wrong side of point.

The bug was introduced by this commit:
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=e8bafd

And reported here:
http://article.gmane.org/gmane.emacs.orgmode/79282
2013-11-28 06:27:57 +01:00
Achim Gratz e655e664bf org: check for derived-mode-p instead of "org-mode" exactly
* lisp/org.el (org-mode-restart): Check for derived-mode-p instead of
  "org-mode" exactly.  This covers a situation normal-mode already
  instantiates a derived mode (e.g. via file local variables).
2013-11-27 20:52:03 +01:00
Achim Gratz f2483ec4bb org: fix commit 0911edfac8
* lisp/org.el (org-mode-restart): After `normal-mode´ the mode may not
  be "org-mode".  Explicitly switch to org-mode in that case.
2013-11-27 19:56:38 +01:00
Nick Dokos 0911edfac8 Second try: Ensure that file local variables are set
* lisp/org.el (org-mode-restart): Call normal-mode,
  instead of org-mode. This will set the mode but it
  will also set file local variables properly.

Reported by Tom Dye: C-c C-c on e.g an #+OPTIONS line
would lose file local variable settings.

The original fix (commit 5ea0228) was incorrect: if the
local variable was a mode setting, then we ended up in an
"infinite" recursion. Problem found, reported and a reproducer
provided by York Zhao.
2013-11-27 09:19:56 -05:00
Nick Dokos a82a5206f3 Revert "Ensure that file local variables are set"
This reverts commit 5ea02285ba.

York Zhao ran into an infinite recursion with this "fix".
2013-11-27 09:19:55 -05:00
Nicolas Goaziou 5a2dabc21b org-element: Optimize parser only when cache is active
* lisp/org-element.el (org-element-at-point): Try opportunistic
  shortcut only when cache is active.
2013-11-26 23:51:26 +01:00
Nicolas Goaziou 15246d1165 org-colview: Silence byte-compiler 2013-11-26 18:23:35 +01:00
Nicolas Goaziou 71c8474ae9 org-element: Speed-up for `org-element-at-point'
* lisp/org-element.el (org-element-at-point): Rewrite function. Remove
  optional argument.

Include an opportunistic search at the beginning of the function.  It
drastically improves speed on large sections for a small overhead on
small ones.
2013-11-26 18:18:33 +01:00
Nicolas Goaziou 2b22886005 org-element: Prepare signature change
* lisp/ob-exp.el: Declare signature change.
* lisp/org-macro.el: Declare signature change.
* lisp/org.el (org-backward-element, org-drag-element-backward): Avoid
  using optional argument from `org-element-at-point'.
* testing/lisp/test-org-element.el: Update test.
2013-11-26 18:08:19 +01:00
Carsten Dominik 0ae48c544b Fix bug in uncompilation of column format
* lisp/org-colview.el (org-columns-uncompile-format): Fix bug when retrieving
operator symbol.
2013-11-26 13:14:06 +01:00
York Zhao f1583aab46 Fix problem with :exact-positions in capture
* lisp/org-capture.el (org-capture-place-entry): Set :exact-position
before doing other stuff, to allow function with other target settings

TINYCHANGE

Assuming file "test.org" has a single headline "* Level 1" (ended with
newline character), when trying to use function type capture target in
an org-capture template, as shown in the example:

(setq org-capture-templates
      `(("t"
         "Test function type target"
         entry
         (function
          (lambda ()
            (set-buffer (org-capture-target-buffer "test.org"))
            (goto-char (point-max))))
         "* Level 2")))

When this template gets filled, file "test.org" becomes:

* Level 1
* Level 2

Instead of:

* Level 1
** Level 2

This is because when using function type target, `:exact-position' is
used to store buffer position returned by user's function (the lambda
function here), and function `org-capture-place-entry' will never
insert template as a child of current entry when `:exact-position' is
used.

The problem is addressed by not special casing for `:exact-position'
in function `org-capture-place-entry'.

York
2013-11-26 06:28:07 +01:00
Nicolas Goaziou a9eec72ecf Merge branch 'maint' 2013-11-25 23:36:38 +01:00
Nicolas Goaziou 3ead82a321 ox-publish: Error when publishing non-existent file
* lisp/ox-publish.el (org-publish-cache-ctime-of-src): Return an error
  when publishing a non-existent file.

Suggested-by: Arne Babenhauserheide <arne_bab@web.de>
2013-11-25 23:34:20 +01:00
Nicolas Goaziou 7bee47120b org-element: Update paragraph separate regexp
* lisp/org-element.el (org-element-paragraph-separate): More accurate
  regexp.
2013-11-25 23:19:48 +01:00
Nicolas Goaziou 4a27c2b4b6 Improved Flyspell checks
* lisp/org.el (org-mode-flyspell-verify): Rewrite function using
  Org parser.  As a consequence, Org is more cautious about areas
  where checks are allowed.
(org-fontify-meta-lines-and-blocks-1, org-activate-footnote-links): Be
subtler when removing flyspell overlays.
(org-unfontify-region): Remove reference to unused `org-no-flyspell'
property.
(org-fontify-drawers): New function.
(org-set-font-lock-defaults): Use new function to fontify drawers.
* contrib/lisp/org-wikinodes.el (org-wikinodes-activate-links): Remove
reference to unused `org-no-flyspell' property.
2013-11-24 16:14:09 +01:00
Eric Schulte 8c98879d7c declare function to appease compiler
* lisp/ob-C.el (org-remove-indentation): Declare function to appease
  compiler.
* lisp/ob-core.el (org-remove-indentation): Declare function to
  appease compiler.
* lisp/ob-fortran.el (org-remove-indentation): Declare function to
  appease compiler.
2013-11-23 17:02:22 -07:00
Eric Schulte 39070b7fc7 sometimes remove common indentation when trimming
* lisp/ob-C.el (org-babel-C-execute): Remove common indentation when
  trimming.

* lisp/ob-core.el (org-babel-read-result): Remove common indentation
  when trimming.
  (org-babel-update-block-body): Remove common indentation when
  trimming.

* lisp/ob-fortran.el (org-babel-execute:fortran): Remove common
  indentation when trimming.

* lisp/ob-tangle.el (org-babel-process-comment-text): Better default
  to process tangled comments.
2013-11-23 15:57:29 -07:00
Eric Schulte 6a4dfd3182 fixed export of inline src blocks
* lisp/ob-exp.el (org-babel-exp-non-block-elements): Fixed export of
  inline src blocks.
2013-11-23 12:24:58 -07:00
Eric Schulte 1f498c93f2 change default sh code block shell to bash
* lisp/ob-sh.el (org-babel-sh-command): Change default sh code block
  shell to bash.
2013-11-23 09:14:27 -07:00
Achim Gratz e26b6fb77b Merge branch 'maint' 2013-11-23 16:18:10 +01:00
Achim Gratz 5213e0f704 org-crypt: fix 3e87d5893d
* lisp/org-crypt.el: Declare `epg-context´.
  (org-encrypt-string): Correct indentation.
2013-11-23 16:15:45 +01:00
Nicolas Goaziou e8bafdd04f Optimize hiding all drawers in a buffer
* lisp/org.el (org-cycle-hide-drawers): Make sure each drawer is only
  flagged once.
2013-11-23 09:34:48 +01:00
Nicolas Goaziou 402c310f00 Fix some defconst and docstrings
* lisp/org.el (org-drawer-regexp, org-clock-drawer-start-re,
  org-clock-drawer-end-re): Fix docstring.
(org-clock-drawer-re): Fix value
2013-11-23 09:34:48 +01:00
Nicolas Goaziou cdbdb9ee66 org-inlinetask: Small clean-up 2013-11-23 09:34:48 +01:00
Bastien Guerry b6a1584fa6 Merge branch 'maint' 2013-11-22 22:33:05 +01:00
Nicolas Richard 9ff70abc14 Use key-description on the keys mentionned by the functions defined by
`orgtbl-mode'.
2013-11-22 22:32:50 +01:00
Nicolas Richard a598e9c163 Remove old comment
The comment was introduced (in git) at commit
4be4c56239 ; it refers to a
FIXME located ~40 lines above it. The FIXME was removed in
dc8bc8e392.
2013-11-22 22:32:45 +01:00
Eric Schulte 89a35bc147 inline src block parser set "switches" in info
* lisp/ob-core.el (org-babel-parse-inline-src-block-match): Inline src
  block parser set "switches" in info, otherwise later offset are broken.
2013-11-22 08:28:29 -07:00
Eric Schulte bbcf17b969 set location info parameter for inline src blocks
* lisp/ob-core.el (org-babel-execute-src-block): Set location info
  parameter for inline src blocks.
  (org-babel-get-src-block-info): Set location info parameter for
  inline src blocks.
2013-11-22 08:28:29 -07:00
Eric Schulte 060d79f080 whitespace fixes 2013-11-22 08:28:29 -07:00
Nicolas Goaziou 72a81dd06a Fix export of links to attachements (part 2)
* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  properties, as `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.
2013-11-22 12:42:41 +01:00
Nicolas Goaziou 5ae3a25755 Fix export of links to attachments (part 2)
* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  a property, as both `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.
2013-11-22 12:39:15 +01:00