0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 21:10:42 +00:00
Commit graph

7358 commits

Author SHA1 Message Date
Bastien Guerry c1b6920568 Fix a compiler warning. 2012-09-26 15:18:49 +02:00
Bastien Guerry 8365b738ee org-agenda.el (org-agenda-format-item): Fix initialization of the level text property
* org-agenda.el (org-agenda-format-item): Fix initialization
of the level text property.

Thanks to Daniel Clemente for reporting this problem.
2012-09-26 11:36:04 +02:00
Bastien Guerry ca1467160d Merge branch 'maint' 2012-09-26 11:23:57 +02:00
Bastien Guerry 6634a30772 org-agenda.el (org-agenda-skip): Skip information retrieved from a source block
* org-agenda.el (org-agenda-skip): Skip information retrieved
from a source block.

Thanks to Sébastien Vauban for pointing at this.
2012-09-26 11:23:23 +02:00
Bastien Guerry 1b53c705de org.el: Fix `org-display-outline-path' (see commit 979567)
* org.el (org-format-outline-path): Small docstring
enhancement.
(org-display-outline-path): Fix order or arguments.
2012-09-26 11:06:20 +02:00
Bastien Guerry b50c465c17 Merge branch 'maint' 2012-09-26 10:56:20 +02:00
Bastien Guerry 440b9388d4 ob.el: Reintroduce ":results org" but using "#+BEGIN_SRC org", not "#+BEGIN_ORG"
* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Reintroduce ":results org" but
using "#+BEGIN_SRC org", not "#+BEGIN_ORG".

* org.texi (results): Update documentation for ":results
drawer" and ":results org".
2012-09-26 10:56:16 +02:00
Bastien Guerry a2408063f9 Merge branch 'maint' 2012-09-26 09:49:26 +02:00
Bastien Guerry 4ebfe4f030 ob.el: Remove "org" the list of predefined values for the ":results" parameter
* ob.el (org-babel-common-header-args-w-values): Remove "org"
the list of predefined values for the ":results" parameter.

This complete the previous fix (commit 203e50b).
2012-09-26 09:49:09 +02:00
Bastien Guerry 60626e7406 Merge branch 'maint' 2012-09-26 09:39:02 +02:00
Bastien Guerry 203e50b89b * ob.el (org-babel-insert-result): Remove support for ":results org"
* ob.el (org-babel-insert-result): Remove support for
":results org".

The insertion of #+BEGIN_ORG was confusing.  You can either use
":results raw" to insert the raw results or ":results drawer" to
wrap them into a :RESULTS: ... :END: drawer.
2012-09-26 09:38:49 +02:00
Bastien Guerry e4a01d0dde ob.el: Deprecate ":results wrap" in favor of ":results drawer"
* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Deprecate ":results wrap" in favor
of ":results drawer".
2012-09-26 09:23:51 +02:00
Bastien Guerry 1ab3bfb119 Merge branch 'maint' 2012-09-26 08:28:44 +02:00
Bastien Guerry 8fbf78d185 org-crypt.el (org-at-encrypted-entry-p): Fix bug when the check happens before the first headline
* org-crypt.el (org-at-encrypted-entry-p): Fix bug when
the check happens before the first headline.
2012-09-26 08:28:32 +02:00
Bastien Guerry 74c294ac84 Merge branch 'maint' 2012-09-26 08:25:16 +02:00
Bastien Guerry 0b65064961 org-capture.el: Add declarations and check is `org-crypt' is loaded (Fix commit ac6409fe)
* org-capture.el (org-at-encrypted-entry-p)
(org-encrypt-entry, org-decrypt-entry): Declare.
(org-capture-set-target-location): Check whether `org-crypt'
has been loaded.

Thanks to Mike McLean for reporting this.
2012-09-26 08:25:05 +02:00
Carsten Dominik 9795679299 Allow to specify the separator used in an outline path.
* lisp/org.el (org-format-outline-path): New argument SEPARATOR to
specify a string that is inserted between parts of the outline path.
(org-display-outline-path): New argument SEPARATOR, to specify a
string that is inserted between parts of the outline path.
2012-09-26 05:44:27 +02:00
Bastien Guerry d42349d3cf Merge branch 'maint' 2012-09-25 18:31:06 +02:00
Bastien Guerry 12ed0c3978 org-agenda.el (org-agenda-todo-custom-ignore-p): Fix typo in docstring
* org-agenda.el (org-agenda-todo-custom-ignore-p): Fix typo in docstring.
2012-09-25 18:30:55 +02:00
Bastien Guerry 225714a28b Merge branch 'maint' 2012-09-25 17:30:35 +02:00
Bastien Guerry ac6409feae Allow using an encrypted headline as a capture target.
* org-capture.el (org-capture-finalize): Maybe re-encrypt
the target headline if it was decrypted.
(org-capture-set-target-location): Maybe decrypt the target
headline.

* org-crypt.el (org-at-encrypted-entry-p): New function.

Thanks to Guilherme Gondim for suggesting this.
2012-09-25 17:29:44 +02:00
Bastien Guerry 50091a849e org.el: Add a 'htmlize-link text property to plain and bracket links
* org.el (org-activate-plain-links)
(org-activate-bracket-links): Add a new 'htmlize-link text
property, so that htmlize (> version 1.42) can linkify the
links.

Thanks to Hrvoje Nikšić for suggesting this.
2012-09-25 16:04:51 +02:00
Bastien Guerry 4512f88c3c org.el (org-display-outline-path): Allow a string value for the `as-string' parameter
* org.el (org-display-outline-path): Allow a string value for
the `as-string' parameter.  Such a value will replace the "/"
separator in the output.

Thanks to Sébastien Vauban for triggering this.
2012-09-25 14:47:58 +02:00
Bastien Guerry 9ebf9c169e Merge branch 'maint' 2012-09-25 14:40:49 +02:00
Bastien Guerry 26b9e71f26 org.el (org-options-keywords): Add "STYLE:"
* org.el (org-options-keywords): Add "STYLE:".
2012-09-25 14:40:38 +02:00
Jarmo Hurri 108689550f org-gnus.el: New option to start Gnus with `gnus-no-server'
* org-gnus.el (org-gnus-no-server): New option to start Gnus
using `gnus-no-server'.
(org-gnus-no-new-news): Use the new option.

TINYCHANGE
2012-09-25 11:55:26 +02:00
Bastien Guerry 044dbf680e org.el (org-display-outline-path): New argument `as-string'
* org.el (org-display-outline-path): New argument `as-string'.

This useful if you want to display the outline path in the
minibuffer like this:

(add-hook 'org-mode-hook
          (lambda() (add-to-list 'mode-line-format
                                 '(:eval (org-display-outline-path nil t t)) t)))
2012-09-25 03:43:41 +02:00
Bastien Guerry bf072bd647 Merge branch 'maint' 2012-09-24 19:15:59 +02:00
Bastien Guerry 9aff6ffe8a Add COPYING and fix other related issues.
Mention COPYING in READMEs.
Fix the header of ob-fortran.el (see this fix in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-09/msg00365.html)
Specify that org-colview-xemacs.el is *not* part of Emacs.
Specify that org-element.el is part of Emacs (prepare the sync.)
Add COPYING in the release (mk/server.mk).
2012-09-24 19:15:42 +02:00
Bastien Guerry 2150a98987 Merge branch 'maint' 2012-09-24 17:59:32 +02:00
Bastien Guerry c92a2a5c4f org-agenda.el (org-agenda-ndays): Fix bug
* org-agenda.el (org-agenda-ndays): Don't make an alias, as
`org-agenda-span' is defined separately.

Thanks to Tassilo for reporting this.
2012-09-24 17:59:23 +02:00
Bastien Guerry 5036388ab9 Merge branch 'maint' 2012-09-24 17:19:39 +02:00
Bastien Guerry 6c92eca5eb Small enhancements to the main Org menu.
* org.el (org-in-subtree-not-table-p): New utility function
for building the menu.
(org-org-menu): Add an item for refiling.  Check more contexts
when activating items.
(org-tree-to-indirect-buffer): Use `org-up-heading-safe'.

* org-agenda.el (org-agenda-tree-to-indirect-buffer)
(org-agenda-do-tree-to-indirect-buffer): Use argument `arg'.
2012-09-24 17:19:12 +02:00
Bastien Guerry 00f338a757 Merge branch 'maint' 2012-09-24 08:28:58 +02:00
Bastien Guerry b61ff117bc org-capture.el: Set a correct time value with file+datetree+prompt
* org-capture.el (org-capture-set-target-location): Set a
correct time value when storing a note in a datetree and
prompting the user for a date.

Thanks to Gregor Zattler for reporting this.
2012-09-24 08:28:45 +02:00
Bastien Guerry ec9f52d185 org-capture.el (org-capture-mode): Fix bug: don't run the mode's hook twice
* org-capture.el (org-capture-mode): Fix bug: don't run the
mode's hook twice.

Thanks to Kalev Takkis for reporting this.
2012-09-24 07:07:43 +02:00
Nicolas Goaziou b60445cfd4 org-element: Define a new element: node-property
* lisp/org-element.el (org-element-all-elements): Add `node-property'
  as a new element type.
(org-element-greater-elements): Add property-drawer element to greater
  elements since they now contain node-property elements.
(org-element-drawer-parser): Small refactoring.
(org-element-property-drawer-parser): Move into Greater Elements file
section.
(org-element-node-property-parser,
org-element-node-property-interpreter): New functions.
(org-element--current-element, org-element-at-point,
org-element--parse-elements): Handle new element type.
* testing/lisp/test-org-element.el: Add tests.
2012-09-23 19:10:27 +02:00
Achim Gratz 998e5565c4 Fix merge conflict in org-agenda.el
* lisp/org-agenda.el: Merge conflict due to additional parameters in
  both maint and master resolved.

Needs review!
2012-09-23 16:27:25 +02:00
Bastien Guerry ed991f49d7 Merge branch 'maint' 2012-09-23 12:01:05 +02:00
Bastien Guerry 5a297114fa org-agenda.el: Use `define-obsolete-variable-alias'
* org-agenda.el (org-agenda-menu-two-column)
(org-finalize-agenda-hook, org-agenda-ndays): Use
`define-obsolete-variable-alias' instead of
`make-obsolete-variable'.
2012-09-23 12:00:44 +02:00
Bastien Guerry 0906e32b15 org.el: Use nil as the default value for `org-link-to-org-use-id'
* org.el (org-link-to-org-use-id): Move to org-id.el.

* org-id.el (org-id-link-to-org-use-id): Rename from
`org-link-to-org-use-id'.  Use `nil' as the default value.
(org-link-to-org-use-id): Alias and define as obsolete.

`org-link-to-org-use-id' was previously defined in org.el but only
active when org-id.el was loaded.  This is wrong.  It now belongs
to org-id.el.

Also, as some libraries require org-id.el on the fly, a non-nil
default value for `org-link-to-org-use-id' had the side-effect of
changing the behavior of `org-store-link' behind the user's back.
Which is wrong too.  The new default value is `nil' so that, even
when a library requires org-id.el without the user noticing it,
the behavior of `org-store-link' will not change.

Users who want to keep the previous behavior can set the variable
to 'create-if-interactive-and-no-custom-id

INCOMPATIBLE
2012-09-23 11:58:49 +02:00
Bastien Guerry a14948c89f Merge branch 'master' of orgmode.org:org-mode 2012-09-23 11:42:46 +02:00
Bastien Guerry a65b5bd36c New command `org-copy' to copy a subtree/region
* org.el (org-refile-keep): New variable.
(org-copy): New command to copy notes.
(org-refile): New parameter msg to override the "Refile"
string in the default prompt.
(org-mode-map): Bind "C-c M-w" to `org-copy'.

* org.texi (Refile and copy): Document the new command `org-copy'.

* orgguide.texi (Refile and copy): Ditto.

Thanks to Kalev Takkis who triggered this change.
2012-09-23 11:42:41 +02:00
Achim Gratz cdf094aca7 Merge branch 'maint' 2012-09-23 11:08:30 +02:00
Achim Gratz b20ef32b9a do not set variables belonging to ESS
* lisp/ob-R.el (org-babel-R-initiate-session): Protect against use of
  unbound variable `ess-ask-for-ess-directory´. The default for this
  variable is true, so act accordingly if it is found unbound.

* lisp/ob-R.el: Remove initialization with `nil´ from
 `ess-ask-for-ess-directory´ and `ess-local-process-name´.  Remove
 second declaration for `ess-local-process-name´.

* testing/lisp/test-ob-R.el (test-ob-R/simple-session): Bind
  `ess-ask-for-ess-directory´ to nil to facilitate batch testing.
2012-09-23 11:07:18 +02:00
Bastien Guerry 7b7e876319 Merge branch 'master' of orgmode.org:org-mode 2012-09-23 10:17:16 +02:00
Bastien Guerry 8ea2518bce Merge branch 'maint'
Conflicts:
	lisp/org-agenda.el
2012-09-23 10:17:07 +02:00
Bastien Guerry 348b4f3a8a org-agenda.el: Fix bug about 'time-up sorting strategy not being honored
* org-agenda.el (org-search-view, org-agenda-get-todos)
(org-agenda-get-timestamps, org-agenda-get-blocks): Use the
dotime parameter of `org-agenda-format-item' so that 'time-up
and 'time-down agenda sorting strategies are handled correctly.

Thanks to Richard Lawrence who reported this.
2012-09-23 10:16:12 +02:00
Bastien Guerry f19af99d2a org.el: Use the current file name as the default target when there is no refile history
* org.el (org-refile-get-location): Use the current file name
as the default target when there is no refile history.
2012-09-23 10:04:29 +02:00
Nicolas Goaziou 393acf0df8 org-element: Fix for affiliated keywords parsing
* lisp/org-element.el (org-element--collect-affiliated-keywords): Fix
  return value.
* testing/lisp/test-org-element.el: Add test.
2012-09-23 09:49:32 +02:00
Nicolas Richard eedee465f7 org.el (org-insert-link): Call `org-link-try-special-completion' from the original buffer
* org.el (org-insert-link): Call
`org-link-try-special-completion' from the original buffer.

TINYCHANGE
2012-09-22 11:18:06 +02:00
Bastien Guerry 6e40519811 Merge branch 'maint' 2012-09-22 11:08:59 +02:00
Bastien Guerry 1fc19ce5bc org-capture.el (org-capture-fill-template): Fix checking of protected template entries
* org-capture.el (org-capture-fill-template): Fix checking of
protected template entries.

Thanks to Myles English for spotting this.
2012-09-22 11:08:20 +02:00
Bastien Guerry 59f9e22dda org.el: Add a new function to `org-cycle-hook' to hide inline tasks from the 'contents view
* org.el (org-cycle-hide-inline-tasks): New function to hide
inline tasks when cycling.
(org-cycle-hook): Use the new function.

Thanks to Christopher Witte for triggering this and to Carsten for
suggesting this change.
2012-09-22 11:02:34 +02:00
Bastien Guerry 5d62f26fbc Merge branch 'maint' 2012-09-22 10:55:11 +02:00
Bastien Guerry e1c609c6aa org.el (org-cycle-global-at-bob): Fix typo in docstring
* org.el (org-cycle-global-at-bob): Fix typo in docstring.
2012-09-22 10:55:06 +02:00
Bastien Guerry 34db1c2934 Merge branch 'maint' 2012-09-21 18:11:54 +02:00
Bastien Guerry 50837906ec org.el: Fix bug in `org-insert-drawer'
* org.el (org-insert-drawer): Deactivate the mark before
trying to indent the :END: of the drawer.

Thanks to Christoph LANGE for reporting this.
2012-09-21 18:00:52 +02:00
Bastien Guerry 99453a16f5 Merge branch 'maint' 2012-09-21 16:31:55 +02:00
Levin Du 996a49dd44 org-clock.el (org-clock-in): Fix bug in setting the clock heading
* org-clock.el (org-clock-in): Fix bug in setting the clock
heading.

TINYCHANGE
2012-09-21 15:42:38 +02:00
Bastien Guerry 40baaf8626 Merge branch 'maint' 2012-09-21 10:04:24 +02:00
Bastien Guerry 77a4815047 org-agenda.el (org-agenda-export-html-style): Default to nil
* org-agenda.el (org-agenda-export-html-style): Default to nil
as any string value will replace the htmlize style.

See commit 8447ea.
2012-09-21 10:04:14 +02:00
Achim Gratz f14f829652 Merge branch 'maint' 2012-09-20 22:37:27 +02:00
Achim Gratz 27527b670e Makefile: add contrib files while generating autoloads
* mk/targets.mk: Move copy of contrib additions to lisp/Makefile.

* lisp/Makefile: Let `autoloads´ in lisp re-generate contrib files by
  depending on new target `addcontrib´ in the right order.
2012-09-20 22:35:35 +02:00
Achim Gratz 23b30cd124 declare function org-clock-get-last-clock-out-time
* lisp/org.el: Declare function org-clock-get-last-clock-out-time.
2012-09-20 22:16:13 +02:00
Nicolas Goaziou baed7dc7db org-element: Optimize affiliated keywords parsing
* lisp/org-element.el (org-element-center-block-parser,
  org-element-drawer-parser, org-element-dynamic-block-parser,
  org-element-footnote-definition-parser,
  org-element-plain-list-parser, org-element-quote-block-parser,
  org-element-special-block-parser, org-element-babel-call-parser,
  org-element-comment-parser, org-element-comment-block-parser,
  org-element-example-block-parser, org-element-export-block-parser,
  org-element-fixed-width-parser, org-element-horizontal-rule-parser,
  org-element-keyword-parser, org-element-latex-environment-parser,
  org-element-paragraph-parser, org-element-property-drawer-parser,
  org-element-src-block-parser, org-element-table-parser,
  org-element-verse-block-parser): Change signature. Now use an
  additional argument: affiliated.
(org-element--current-element): Skip affiliated keywords and pass them
  as an argument to parsers.  It prevents to walk through these
  keywords twice: the first time to get to the first line of the
  element, and a second time to collect the affiliated keywords.
* contrib/lisp/org-export.el (org-export-get-caption): Update function
  since multiple affiliated keywords are now reversed.
* testing/lisp/test-org-element.el: Update tests.
2012-09-20 20:08:16 +02:00
Nicolas Goaziou 7c40e0c6ba Merge branch 'maint' 2012-09-20 19:14:43 +02:00
Nicolas Goaziou fd5cc62ca5 org-element: Fix inline-src-block parsing at the beginning of an item
* lisp/org-element.el (org-element-inline-src-block-successor): Fix
  inline-src-block parsing at the beginning of an item.
* testing/lisp/test-org-element.el: Add test.
2012-09-20 19:13:40 +02:00
Bastien Guerry 7a909d1684 Merge branch 'maint' 2012-09-20 00:52:41 +02:00
Fabrice Niessen 8447ea8341 Don't force the <style> tag to be present in `org-agenda-export-html-style'
* org-agenda.el (org-agenda-write-buffer-name): Remove the
test for the presence of <style> tag.

TINYCHANGE
2012-09-20 00:52:33 +02:00
Bastien Guerry 279aeb37cc Merge branch 'master' of orgmode.org:org-mode 2012-09-19 17:52:31 +02:00
Eric Schulte 99c0b2d9c4 adding :eps header argument to ditaa code blocks
Use of this header argument will change the back-end engine from
ditaa.jar to a combination of DitaaEps.jar and epstopdf.

This patch is based off of ob-ditaa-eps.el sent to the mailing list by
Arne Babenhauserheide (IMK).
2012-09-19 08:11:17 -06:00
Bastien Guerry 69f2588f60 Merge branch 'maint' 2012-09-19 12:29:36 +02:00
Bastien Guerry 0d73ee4f30 org.el (org-cycle-hook): Fix tiny typo in docstring
* org.el (org-cycle-hook): Fix tiny typo in docstring.
2012-09-19 12:29:27 +02:00
Bastien Guerry b913f5c7ef Merge branch 'maint' 2012-09-19 11:44:18 +02:00
Bastien Guerry 6cff4db20c org.el: Add docstrings
* org.el (org-time-string-to-time)
(org-time-string-to-seconds, org-end-of-subtree): Add a
dosctring.
2012-09-19 11:44:07 +02:00
Bastien Guerry d186577678 org.el (org-entry-put): Fix bug when updating the last clock
* org.el (org-entry-put): Fix bug when updating the last clock.
2012-09-19 11:39:32 +02:00
Bastien Guerry f3202903d6 New option `org-use-last-clock-out-time-as-effective-time'
* org.el (org-use-last-clock-out-time-as-effective-time): New option.
(org-current-effective-time): Use the new option.

* org-clock.el (org-clock-get-last-clock-out-time): New
function.

When set to `t', this new option will take the time of the last clock out
timestamp and use it when changing/logging the todo state.

Thanks to Gaizka Villate who suggested this.
2012-09-19 11:36:32 +02:00
Bastien Guerry 5940b7aa65 Merge branch 'maint' 2012-09-19 10:51:30 +02:00
Bastien Guerry 7babf1f1a0 org-freemind.el (org-freemind-write-node): Enhance links conversion in nodes
* org-freemind.el (org-freemind-write-node): Enhance links
conversion in nodes.

Thanks to Bill Day for requesting this.
2012-09-19 10:46:14 +02:00
Bastien Guerry 09ad83efe9 org-freemind.el (org-freemind-write-node): Convert links in nodes
* org-freemind.el (org-freemind-write-node): Convert links in
nodes.

Thanks to Bill Day for reporting this.
2012-09-19 09:22:12 +02:00
Bastien Guerry 4600e9eca8 Merge branch 'maint' 2012-09-18 17:18:55 +02:00
Bastien Guerry 5b8999b708 org.el: Use "capture" instead of "remember" in docstrings.
* org.el (org-link-to-org-use-id, org-directory)
(org-default-notes-file, org-reverse-note-order)
(org-extend-today-until, org-finish-function)
(org-store-link-functions): Use "capture" instead of
"remember" in docstrings.  Also use the `org-capture' group
when it makes sense.
2012-09-18 17:18:33 +02:00
Bastien Guerry 48ca87cd4a org.el (org-toggle-inline-images): Only send a message when called interactively
* org.el (org-toggle-inline-images): Only send a message when
called interactively.
2012-09-18 16:27:57 +02:00
Bastien Guerry 9c7a081f21 Merge branch 'maint' 2012-09-18 16:06:54 +02:00
Bastien Guerry b81485d5ff org-agenda.el: Fix bug when showing indirect agenda in another frame
* org-agenda.el (org-agenda-tree-to-indirect-buffer): Find the
correct agenda buffer.  Don't split the agenda window when the
indirect buffer is displayed in another frame.

Thanks Viktor Rosenfeld for reporting this.
2012-09-18 16:06:46 +02:00
Bastien Guerry 8205e25c08 Merge branch 'maint' 2012-09-18 12:25:30 +02:00
Bastien Guerry 90565f2ede org.el (org-mode): Try to set the org-hide face correctly
* org.el (org-mode): Try to set the org-hide face correctly.

Thanks to Arne Babenhauserheide for reporting a related problem.
2012-09-18 12:24:05 +02:00
Bastien Guerry 0ca6614154 org-exp.el (org-export): Set the mark correctly when exporting a subtree
* org-exp.el (org-export): Set the mark correctly when
exporting a subtree.

Thanks to Tyler Smith for reporting this problem.
2012-09-18 11:09:25 +02:00
Bastien Guerry a82797356c org-agenda.el: Fix the display of the number of commands for block agendas
* org-agenda.el (org-agenda-get-restriction-and-command): Fix
the display of the number of commands for block agendas.

Thanks to Sébastien Vauban for reporting this.
2012-09-18 09:09:41 +02:00
Bastien Guerry 6cc7ff1092 org-agenda.el: Allow `org-agenda-finalize-hook' to modify the buffer
* org-agenda.el (org-agenda-before-write-hook)
(org-agenda-add-entry-text-maxlines): Enhance phrasing.
(org-agenda-finalize-hook, org-agenda-mode-hook): Tell that
the buffer is writable when the hook is called.
(org-agenda-finalize): Allow org-agenda-finalize-hook to
modify the buffer.

Thanks to Moritz Ulrich and to Aaron Ecay for triggering this fix.
2012-09-18 08:40:11 +02:00
Bastien Guerry 7cf6bbeeac Merge branch 'maint' 2012-09-17 19:02:35 +02:00
Bastien Guerry a67676809c org-agenda.el: Fix the declaration/check of org-habit variables
* org-agenda.el (org-habit-show-all-today): Only use defvar
to silent the byte-compiler.
(org-agenda-get-scheduled): Check whether some org-habit.el
options have been defined.

Thanks to Robert Horn for reporting this.
2012-09-17 18:57:58 +02:00
Bastien Guerry 2791177308 Fix two compiler warnings 2012-09-17 18:44:58 +02:00
Bastien Guerry e109fac771 Fix two compiler warnings 2012-09-17 18:44:42 +02:00
Bastien Guerry 3c0155c6e4 Merge branch 'maint' 2012-09-17 18:42:19 +02:00
Bastien Guerry d66cbad3d9 org-capture.el: Fix bug in `org-capture-string'
* org-capture.el (org-capture-entry): New variable.
(org-capture-string, org-capture): Use it to possibly skip the
interactive prompt for a capture template.
2012-09-17 18:42:11 +02:00
Nicolas Goaziou a5756f5e1d ob-exp: More accurate white space handling when evaluating inline code
* lisp/ob-exp.el (org-babel-exp-non-block-elements): More accurate
white space handling when evaluating inline-src-block, babel-call and
inline-babel-call elements or objects.  Also removed use of
`org-babel-examplize-region' since it would never be called anyway
(return value from `org-babel-exp-do-export' is never nil).
2012-09-16 00:07:15 +02:00
Bastien Guerry 275412a4a2 Merge branch 'maint' 2012-09-14 09:39:07 +02:00
Abdó Roig-Maranges cb34324a82 Fix the ltxpng path for HTML and ODT exporters
* org-html.el (org-export-html-preprocess)
(org-export-html-format-image): Use
`org-latex-preview-ltxpng-directory'.

* org-odt.el (org-export-odt-do-preprocess-latex-fragments):
Ditto.

Commit 8474115b20 breaks LaTeX
image exports as HTML and ODT.  This fixes it.
2012-09-14 09:38:10 +02:00