1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Commit Graph

6225 Commits

Author SHA1 Message Date
Nicolas Goaziou
daa687411d Merge branch 'maint' 2012-03-03 13:01:59 +01:00
Nicolas Goaziou
c8020dd42e org-footnote: Clean-up `org-footnote-normalize'
* lisp/org-footnote.el (org-footnote-normalize): Remove an useless
  part of the function.
(org-insert-footnote-reference-near-definition): Remove function.
2012-03-03 13:00:46 +01:00
Nicolas Goaziou
baa7321d17 Merge branch 'maint' 2012-03-02 22:38:26 +01:00
Nicolas Goaziou
6b91eb9e65 org-footnote: Fix normalization of inline footnotes with no footnote section
* lisp/org-footnote.el (org-footnote-normalize): Fix normalization of
  inline footnotes with no footnote section.
* testing/lisp/test-org-footnote.el: New test file.

Thanks to Samuel Wales for reporting this.
2012-03-02 22:37:12 +01:00
David Maus
144606dbaf Merge branch 'maint' 2012-03-02 17:30:03 +01:00
David Maus
e1ac0cb9cd org-bbdb: Check for BBDB version depending on available functions
* org-bbdb.el (org-bbdb-old): Replace `defvar' after loading 'bbdb to
check for old or new version by a check for the required function in
`org-bbdb-open' and `org-bbdb-store-link'.
(org-bbdb-store-link, org-bbdb-open): Check which version of bbdb is
to be used.

This is a follow up of ddf4f1e7a9.

Instead of depending on the loading of bbdb we do a check for the
required function in `org-bbdb-open' and `org-bbdb-store-link'.
2012-03-02 17:29:35 +01:00
Eric Schulte
451f7cc31f Merge branch 'origin-maint' 2012-03-01 13:15:06 -07:00
Eric Schulte
5bcf0c16da Don't miss a code block when there are confounding spaces after the result name.
* lisp/ob.el (org-babel-find-named-result): Don't miss a code block
  when there are confounding spaces after the result name.
2012-03-01 13:15:00 -07:00
Eric Schulte
38ba103b75 Merge branch 'origin-maint' 2012-03-01 13:06:22 -07:00
Eric Schulte
3e6f5620c6 Fixed call line matching regular expressions
* lisp/ob-lob.el (org-babel-block-lob-one-liner-regexp): Less greedy
  regular expressions.
  (org-babel-inline-lob-one-liner-regexp): Less greedy regular
  expressions.
2012-03-01 13:05:52 -07:00
Eric Schulte
1ed518109e Merge branch 'origin-maint' 2012-03-01 11:38:24 -07:00
Eric Schulte
9e3b41d1a4 Fixed bug in examplization
* lisp/ob.el (org-babel-examplize-region): Fixed bug in examplization.
2012-03-01 11:38:05 -07:00
Nicolas Goaziou
933c0fa441 Implement numbered cross-references
* lisp/org.el (org-link-search): Search for #+name affiliated keywords
  and invisible targets.
* contrib/lisp/org-element.el (org-element-link-parser): Remove "ref"
  links relative part.
(org-element-target-parser): Move property name from `:raw-value' to
`:value'.
(org-element-recursive-objects): Remove targets from tables.  Cells
are not parsed unless explicitely asked by back-end developer, too
late.  A target wouldn't be noticed in time.  One solution could be to
parse every table, but that's time consumming.
(org-element-object-restrictions): Target are not recursive anymore.
* contrib/lisp/org-export.el (org-export-resolve-fuzzy-link): Find
  elements with a matching "#+name: path" affiliated keyword.
(org-export-get-ordinal): Make special cases for headlines, items,
footnotes definitions and references.
(org-export-resolve-ref-link): Removed function.
* EXPERIMENTAL/org-e-latex.el (org-e-latex-link): Handle
  cross-reference numbers.
(org-e-latex-target): Targets have no contents.
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii--describe-links): Ignore
  fuzzy links in link description at the end of the section.
(org-e-ascii-link): Handle cross-reference numbers.
* testing/contrib/lisp/test-org-export.el: Add tests.
* testing/lisp/test-org.el: Add tests.
2012-03-01 14:49:53 +01:00
Jambunathan K
7c8e9125cb Merge remote-tracking branch 'origin/maint' 2012-03-01 19:19:29 +05:30
Jambunathan K
8506c90c4b org-lparse.el: Correctly handle footnote refs in a list item
* org-lparse.el (org-lparse-end-footnote-definition): Cleanup
newlines in a transcoded footnote definition.  This ensures
that the line that is currently being processed by
`org-do-lparse' loop doesn't get broken up into multiple
lines.  Fix for the following bug -
2012-03-01 19:16:04 +05:30
Nicolas Goaziou
f0af36a348 Merge branch 'maint' 2012-02-29 23:06:17 +01:00
Jambunathan K
f6727a9dde org-footnote: Workaround a limitation in the ODT exporter
* lisp/org-footnote.el (org-footnote-normalize): Force a paragraph
break after the last footnote definition.  This is an an
implicit assumption made by the org-lparse.el library.  With
this change, footnote definitions can reliably be exported
with ODT backend.  See
http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg01013.html.
2012-02-29 22:48:17 +01:00
Eric Schulte
7fa08ef095 fix a recursive load error, Thanks to Richard Hansen for pointing this out
* lisp/ob-ditaa.el (org-ditaa-jar-path): Fix a recursive load error.
2012-02-29 13:23:29 -07:00
Nicolas Goaziou
b2fb61cd56 Merge branch 'maint' 2012-02-29 21:04:52 +01:00
Nicolas Goaziou
bdb66b4c61 org-list: Fix small bug
* lisp/org-list.el (org-list-struct): Fix small bug introduced by
  commit 8b7a3f2498.
* testing/lisp/test-org-list.el: Add test.
2012-02-29 21:04:15 +01:00
Eric Schulte
e5fa93c9be fix two build complaints 2012-02-29 09:28:34 -07:00
Eric Schulte
deb376ff4f remove duplicate definition of org-ditaa-jar-path
* lisp/ob-ditaa.el (org-ditaa-jar-path): Already defined in
  org-exp-blocks.el.
* lisp/org-exp-blocks.el (org-ditaa-jar-path): Declare appropriately
  for the fact that this is really now a Babel thing -- even if it is
  used here and the definition should remain here for reasons of load
  dependencies.
2012-02-29 09:26:27 -07:00
Eric Schulte
5061de6ee3 integrating ob-scala and ob-io into Org-mode, with code cleanup 2012-02-28 19:45:01 -07:00
Andrzej Lichnerowicz
806ce38c57 support for execution of Scala code blocks 2012-02-28 19:39:50 -07:00
Andrzej Lichnerowicz
f66908cca1 support for execution of IO code blocks 2012-02-28 19:38:05 -07:00
David Maus
ab36517016 Merge branch 'maint' 2012-02-27 21:32:57 +01:00
David Maus
ddf4f1e7a9 org-bbdb: Wrap defvar org-bbdb-old in eval-after-load
* org-bbdb.el (org-bbdb-old): Wrap `defvar' so the variable gets
  defined after bbdb was loaded.

Thanks to Nick Dokos for reporting this glitch in
<8273.1330161610@alphaville>.
2012-02-27 21:22:39 +01:00
Eric Schulte
8748096674 Merge branch 'origin-maint' 2012-02-26 10:10:23 -07:00
Eric Schulte
a8234eb7f1 Don't add spurious preceding newline if caption is not above a longtable
* lisp/org-latex.el (org-export-latex-tables): Don't add spurious
  preceding newline if caption is not above a longtable.
2012-02-26 10:09:49 -07:00
Jambunathan K
73f2ff2acc Merge remote-tracking branch 'origin/maint' 2012-02-26 00:55:00 +05:30
Jambunathan K
580218709b org-odt.el: Fix a regression in handling TOC
* lisp/org-odt.el (org-odt-insert-toc): Remove this stray,
dysfunctional routine.  This possibly has crept in because of the
broken merges between "maint" and "origin" branches.
(org-odt-begin-table): Don't emit an empty paragraph when a table is
neither labelled or captioned.
(org-odt-init-outfile): Remove reference to an unused variable.
2012-02-26 00:43:59 +05:30
Viktor Rosenfeld
bd3b1aee2f add support for MonetDB to SQL code blocks
* lisp/ob-sql.el(org-babel-execute:sql): Add support for MonetDB to
  SQL code blocks.

  Hi,

  the attached patch adds support for evaluating SQL blocks on MonetDB.
  The MonetDB client normally requires the password to be inputted on the
  console. To get around this, you have to use a dotfile ~/.monetdb with
  authentification data. Note that this file is ignored if you specify a
  user on the cmdline. See
  http://www.monetdb.org/Documentation/mclient-man-page for details.

  A usage example follows.

  Setup MonetDB test database and authentification data

  #+BEGIN_SRC sh :results output verbatim
  MONETDB_DIR=$HOME/unix/var/monetdb/demodb
  monetdbd create $MONETDB_DIR
  monetdbd start $MONETDB_DIR
  monetdb create demodb
  monetdb release demodb
  cat > ~/.monetdb <<EOF
  user=monetdb
  password=monetdb
  EOF
  #+END_SRC

  #+RESULTS:
  : created database in maintenance mode: demodb
  : taken database out of maintenance mode: demodb

  Data is returned without column names (the default return format
  cannot be parsed by Babel).

  #+BEGIN_SRC sql :engine monetdb :cmdline demodb
  CREATE TABLE foo ( bar INTEGER );
  SELECT 'Table count', count(*) FROM foo;
  #+END_SRC

  #+RESULTS:
  | Table count | 0 |

  The parameter "-i" is required on the command line in order to use
  special client commands. Also note that a newline is required at the
  end if the last line contains a special client command.

  #+BEGIN_SRC sql :engine monetdb :cmdline demodb -i :results output
  verbatim
  \d
  \?

  #+END_SRC

  #+RESULTS:
  #+begin_example
  TABLE  sys.foo
  \?      - show this message
  \<file  - read input from file
  \>file  - save response in file, or stdout if no file is given
  \|cmd   - pipe result to process, or stop when no command is given
  \h      - show the readline history
  \D table- dumps the table, or the complete database if none given.
  \d[Stvsfn]+ [obj] - list database objects, or describe if obj given
  \A      - enable auto commit
  \a      - disable auto commit
  \e      - echo the query in sql formatting mode
  \f      - format using a built-in renderer {csv,tab,raw,sql,xml}
  \w#     - set maximal page width (-1=unlimited, 0=terminal width,
  >0=limit to num)
  \r#     - set maximum rows per page (-1=raw)
  \L file - save client/server interaction
  \X      - trace mclient code
  \q      - terminate session
  #+end_example

  Have fun!
2012-02-25 09:44:18 -07:00
Andreas Leha
87216ffa56 enhancements to org-babel-goto-named-src-block
> attached is a patch that enhances org-babel-goto-named-src-block (bound
> to C-c C-v g by default).  Included are two enhancements:
>
>  1. the point is pushed to the org-mark-ring, such that returning with
>     C-c & becomes possible
>  2. the target src block is guessed from
>      a) noweb-reference
>      b) #+call:
>      c) #+results:
>      d) symbol-at-point
>     if one of these is found (in that order)

* lisp/ob.el (org-babel-goto-named-src-block): Pushing the point to
  the org-mark-ring and guessing at the code block name to jump to.
2012-02-25 09:36:15 -07:00
David Maus
2adf4b059b Merge branch 'maint' 2012-02-25 11:13:58 +01:00
David Maus
89949e69a3 org-agenda: Fix handling of indirect buffer and window
* org-agenda.el (org-agenda-tree-to-indirect-buffer): Fix handling of
indirect buffer and window.

Check if the window of last indirect buffer is still live and properly
handle the case of `org-last-indirect-buffer' being nil.

Changes suggested by Dave Abrahams in <m2boow1q9e.fsf@boostpro.com>.
2012-02-25 11:13:33 +01:00
Nicolas Goaziou
9ae171a86e org-footnote: Allow footnotes in verse blocks
* lisp/org-footnote.el (org-footnote-forbidden-blocks): Allow
  footnotes in verse blocks.
2012-02-24 09:44:36 +01:00
Nicolas Goaziou
a356059f38 org-footnote: Allow footnotes in verse blocks
* lisp/org-footnote.el (org-footnote-forbidden-blocks): Allow
  footnotes in verse blocks.
2012-02-24 09:42:15 +01:00
Nicolas Goaziou
a39d94b38e Merge branch 'maint' 2012-02-22 09:31:10 +01:00
Nicolas Goaziou
e2a5eb44cb org-exp: Ignore table rows defining parameters for formulas during export
* lisp/org-exp.el (org-table-clean-before-export): Ignore table rows
  defining parameters for formulas during export.
2012-02-22 09:29:03 +01:00
Nicolas Goaziou
3869bf1b0b org-list: Whitespace cleanup 2012-02-21 11:59:12 +01:00
Nicolas Goaziou
387bd87c73 org-list: Implement a function to return an item sequence number
* lisp/org-list.el (org-list-get-item-number): New function.
2012-02-20 16:07:14 +01:00
Jambunathan K
92da128bf9 Pull up ODT files from "maint" to "master" levels
2012-01-17   Jambunathan K   <kjambunathan@gmail.com>

* etc/styles/OrgOdtContentTemplate.xml
(OrgIndentedSection-Level-*): New section styles. These
sections are indented to the same level as the corresponding
list entries.  These sections hold tables that occur within a
list.
(OrgTable): Increased relative width from 90% to 96% for
aesthetic reasons.

* lisp/org-odt.el (org-odt-table-indentedp): New variable
(org-odt-begin-table): Modified.  If the table is within a
list, temporarily leave the list and begin an indented section
before emitting the table.
(org-odt-end-table): Modified.  If the table was within a
list, close the indented section and re-open the list
immediately after ending the table.
(org-odt-continue-list, org-odt-discontinue-list): Helper
routines to temporarily discontinue and continue a list.
(org-odt-list-stack-stashed): New variable to hold the state
of a pending list.
(org-odt-begin-list, org-odt-begin-list-item)
(org-odt-end-list-item): Modified. Handle nitty-gritties for
continuing a list and list item.
(org-odt-section-count): New variable that keeps track of
section count.  Used in conjunction with naming of sections.
(org-odt-begin-section, org-odt-end-section): New defuns.
(org-odt-init-outfile): Initialize
`org-odt-list-stack-stashed' and `org-odt-section-count'.

* lisp/org-lparse.el (org-lparse-list-item-count): Removed. Was a
superfluous variable.
(org-lparse-list-level): Removed.  Now derived from
`org-lparse-list-stack'.
(org-lparse-list-stack): New.  List that records the list
types - ordered, unordered or descriptive - in the following
order: self, parent, grand-parent etc.
(org-do-lparse): Added, removed above let-bound vars.
Disallowed regular tables within list-table block.
(org-lparse-begin-list, org-lparse-end-list)
(org-lparse-begin-list-item, org-lparse-end-list-item):
Propagate above changes.

OpenDocument doesn't permit tables to occur in the middle of a
list.  Use list continuations and indented sections to typeset
indented tables.

Fixes the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00515.html

Add support for indented tables in ODT export

2012-01-20   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-format-textbox): Honor user-specified
width in captioned images.

Fix for bug reported here:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00641.html

Honor user-specified width in captioned images

2012-01-23   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-table-style-format): New.  Template for
auto-generated table styles.
(org-odt-automatic-styles, org-odt-object-counters): New
variables.
(org-odt-add-automatic-style): New function.
(org-odt-write-automatic-styles): New function.  Create
automatic styles for tables that have custom :rel-width.
(org-odt-begin-table): Parse attributes specified with
"#+ATTR_ODT: " option and use it to create an automatic table
style.
(org-odt-save-as-outfile): Call
`org-odt-add-write-automatic-styles'.
(org-odt-init-outfile): Init newly add variables.
(org-odt-section-count): Remove it.
(org-odt-begin-section): Use `org-odt-add-automatic-style' to
generate an automatic section name.

Customize table width using :rel-width option.  For example,
to create a table of width 60% use:

    #+attr_odt: :rel-width 60
    | A | B |
    |---+---|
    |   |   |

org-odt.el: Put table width under user-control

2012-01-23   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-label-styles): Add a new style.
(org-odt-category-map-alist):  Use it.

Andreas Leha writes:

The following snippet exports correctly to LaTeX and to html, but
produces the text "Figure Figure" in odt.

Could the behaviour be synchronized?

=== example.org ==========================
* Test ref
  plot(1:10, 1:10)

Here is a reference to Figure \ref{fig:bar}
=== example.org ==========================

org-odt.el: Make label references consistent with LaTeX export

2012-01-24   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-entity-frame-styles): Add frame params
for images that are anchored as character.
(org-export-odt-format-image): Handle new anchor type
"as-char".
(org-export-odt-default-image-sizes-alist): Misc. change.
(org-export-odt-format-formula): Misc. change.

With this change, one can use the below snippet to produce
images that are laid out side-by-side.
    #+ATTR_ODT: :width 7 :height 7 :anchor as-char
    #+header: :file foo.png
    [[./foo.png]]
    #+caption: bar
    #+ATTR_ODT: :width 7 :height 7 :anchor as-char
    #+header: :file bar.png
    [[./bar.png]]

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00677.html.

org-odt.el: Allow images to be anchored as characters

2012-01-24   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-export-odt-format-formula): Use :style
property to specify custom table styles.

Continuation of the earlier commit titled: "Put table width
under user-control".

org-odt.el: Fix regression in typesetting of MathML formulae

2012-01-27   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-odt-format-preamble): Don't insert TOC here.
Delay it till the end of export.
(org-odt-begin-document-body): Make a note of the default
position of TOC in `org-lparse-dyn-first-heading-pos'.
(org-odt-insert-toc): Insert TOC as directed by
[TABLE-OF-CONTENTS] line or at the default position.
(org-odt-end-export): Call `org-odt-insert-toc'.

Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00974.html

org-odt.el: Honor "[TABLE-OF-CONTENTS]" directive

2012-01-27   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Fix earlier commit

2012-01-30   Jambunathan K   <kjambunathan@gmail.com>

* OrgOdtStyles.xml (OrgTitlePage): New page style.  Include no
footer.  Use "OrgFrontMatterPage" for the following page.
(OrgFrontMatterPage): New page style.  Include a footer that
displays page numbers in Roman style.  Use mirrored pages.
Use "OrgFrontMatterPage" for the following page.
(OrgPage): New page style.  Include a footer that displays
page numbers.  Use mirrored pages.  Use "OrgPage" for the
following page.
(OrgFirstPage): New page style.  Include a footer that
displays page numbers.  Right page only.  Use "OrgPage" for
the following page.
(Standard): Modify to include a footer that displays page
numbers.  Use mirrored pages.  Use "Standard" for the
following page.

None of the above page styles have a header.

The newly added page styles are not used as yet.

org-odt.el: By default, include page numbers in the page footer

2012-01-31   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Do `clear-image-cache' before `create-image'

2012-02-03   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-lparse.el (org-lparse-do-convert): Replace
`call-process' with `shell-command-to-string'.

* lisp/org-odt.el (org-export-odt-convert-processes): Add a new
converter which depends solely on LibreOffice and nothing
else.
(org-export-odt-convert-process): Make the above native
converter the default.

Thanks to Giles for introducing the "--convert-to" option of
soffice.exe.  The option seems to be a fairly recent
development.

http://imperfectsoftware.blogspot.in/2012/01/one-of-my-less-enjoyable-tasks-is-to.html

With this change, one can export to pdf via odt by a simple
  (setq org-export-odt-preferred-output-format "pdf")
There is no need to install additional converters.

org-odt.el: Make LibreOffice the default converter

2012-02-09   Jambunathan K   <kjambunathan@gmail.com>

* org-odt.el (org-export-odt-convert-capabilities): Change the
default value.

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00293.html.

Offer "docx" as an option in `org-export-odt-preferred-output-format'

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Fix indentation

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

org-odt.el: Tag all custom variables with Emacs version

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

* lisp/org-odt.el (org-export-odt-convert-processes): Re-define
(org-export-odt-convert-capabilities): Fix an accidental
regression.

* lisp/org-lparse.el (org-lparse-do-convert): Related change.

Simplify definition of `org-export-odt-convert-processes'

2012-02-12   Jambunathan K   <kjambunathan@gmail.com>

Retire support for BasicODConverter

2012-02-14   Jambunathan K   <kjambunathan@gmail.com>

* org-odt.el (org-export-as-odt-to-buffer)
(org-replace-region-by-odt, org-export-region-as-odt): Remove
these interactive functions.  They are of questionable value.

org-odt.el: Remove interactive functions of questionable value

2012-02-15   Jambunathan K   <kjambunathan@gmail.com>

Improve converting from ODT to other formats

2012-02-15   Jambunathan K   <kjambunathan@gmail.com>

* org-odt.el (org-export-odt-image-size-probe-method)
(org-odt-do-image-size): Use imagemagick preferentially to
determine image sizes.

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00288.html

org-odt.el: Use imagemagick to determine image sizes

2012-02-16   Jambunathan K   <kjambunathan@gmail.com>

* org.texi (Top, OpenDocument Text export)
(ODT export commands, Extending ODT export)
(Images in ODT export, Tables in ODT export)
(Configuring a document converter): Add or Update.

org.texi: Update ODT section
2012-02-20 10:25:31 +05:30
Eric Schulte
3de3c470d8 Merge branch 'origin-maint'
Conflicts:
	contrib/lisp/org-mac-link-grabber.el
	doc/org.texi
	lisp/org-odt.el
	testing/lisp/test-ob.el
2012-02-19 09:36:13 -07:00
Nicolas Goaziou
8b7a3f2498 org-list: Remove two defcustoms
* lisp/org-list.el (org-list-ending-method, org-list-end-regexp):
  Removed variables.
(org-in-item-p, org-list-separating-blank-lines-number,
org-list-parse-list, org-list-struct): Apply changes.
* lisp/org-exp.el (org-export-mark-list-end,
  org-export-mark-list-properties): Apply changes.
* lisp/org-latex.el (org-export-latex-lists): Apply changes.
* doc/org.texi (Plain lists): Document removal.

Conflicts:

	lisp/org-list.el
2012-02-19 09:16:21 -07:00
Nicolas Goaziou
4fd652d361 Correctly unfold headlines containing an inlinetask
* lisp/org.el (org-cycle-internal-local): Correctly unfold headlines
  containing an inlinetask.

Based on a patch from Marc-Oliver Ihm.
2012-02-19 09:15:19 -07:00
Martyn Jago
50a35c42db Fix org-babel-result-end' command to provide consistent result removal where result is type wrap'.
* lisp/ob.el:

Fix `org-babel-result-end' command to provide consistent result
removal where result is type `wrap'. Prior to this fix
multiple (org-ctrl-c-ctrl-c) commands will add multiple newlines to
the end of results (one newline per block execution).

This fixes the test `test-ob/org-babel-remove-result--results-wrap'

* testing/lisp/test-ob.el:

Uncomment test since it now passes.

Conflicts:

	testing/lisp/test-ob.el
2012-02-19 08:27:56 -07:00
Bastien Guerry
d2a0a5378b org.el: Fix missing angle brackets for muse export style.
* org.el (org-structure-template-alist): Fix missing angle
brackets for muse export style.

Thanks to Eric S Fraga for this fix.

Conflicts:

	lisp/org.el
2012-02-19 08:25:59 -07:00
Bastien Guerry
d5ca0780f9 Fix typos and spelling mistakes.
Thanks to Paul Eggert for this fixes in Emacs trunk.
2012-02-19 08:23:42 -07:00
Bastien Guerry
fd6f9c7d46 Copyright, license, and header fixes.
Thanks to Glenn Morris for this fix in Emacs trunk.

Conflicts:

	lisp/ob-emacs-lisp.el
	lisp/ob-perl.el
	lisp/ob-python.el
	lisp/ob-ruby.el
	lisp/ob-screen.el
	lisp/org-eshell.el
	lisp/org-mouse.el
2012-02-19 08:21:03 -07:00
Bastien Guerry
f5e5c5811c More fixes to the copyright year...
Conflicts:

	lisp/ob-awk.el
	lisp/ob-fortran.el
	lisp/ob-java.el
	lisp/org-eshell.el
2012-02-19 08:18:53 -07:00
Bastien Guerry
aca43d4162 More copyright year fixes. 2012-02-19 08:16:42 -07:00
Bastien Guerry
01f7b698a7 More copyright year fixes. 2012-02-19 08:16:27 -07:00
David Maus
ff2b00b7ac Use `with-selected-window' to select calendar window
* org.el (org-recenter-calendar): Use `with-selected-window' to select
calendar window and save currently selected window and current buffer.

Fixes a bug reported by Thomas Morgan in <mid:87obsxwpvc.fsf@ziiuu.com>.
2012-02-19 08:06:20 -07:00
Toby S. Cubitt
2d4b9c05f2 Fix bug in org-goto `outline-path-completion' interface
* lisp/org.el (org-goto): call org-refile-get-location with NO-EXCLUDE
argument set, otherwise not only are headlines in the current subtree
excluded, but it throws an error if point happens not to be within a
subtree (e.g. at start of buffer).

TINYCHANGE
2012-02-19 08:06:02 -07:00
David Maus
37e35d2bb5 Fix highlighting in sparse-tree
* org.el (org-scan-tags): Fix highlighting in sparse-tree.

`org-get-heading' uses `org-heading-regexp' introduced by
dfcb6faef1 but `org-scan-tags' assumed
match groups of the old regular expression.

This should fix a bug reported by Suvayu Ali in
<20120209032255.431e8197@kuru.dyndns-at-home.com>.
2012-02-19 08:05:57 -07:00
David Maus
79105c48e2 Moved `org-in-clocktable-p' from org-clock.el to org.el
* org-clock.el (org-in-clocktable-p): Moved to org.el.
* org.el (org-in-clocktable-p): New function. Moved from org-clock.el

Fixes a bug reported by suvayu ali in
<CAMXnza2W9VSJ2d-dDmsByNmTVgxnt1Onp=J5S=TsFEi8MOVNtg@mail.gmail.com>.

`org-context' depends on the function but org.el does not depend on
org-clock.el.
2012-02-19 08:05:53 -07:00
David Maus
4b84ca41d7 Don't format tags in title if title headline does not have tags
* org-exp.el (org-export-get-title-from-subtree): Don't format tags in
title if title headline does not have tags.

Fixes a bug reported by John Hendy in
<CA+M2ft_UnBVfUbmoUX6J2MY7e_9w+7an5n23rAarpnnQnaV=ZA@mail.gmail.com>.
2012-02-19 08:05:48 -07:00
Bastien Guerry
2bbb8b99f4 org.el: Fix bug: hide drawers in inline tasks too.
* org.el (org-cycle-internal-local): Fix bug: hide drawers in
inline tasks too.
2012-02-19 08:04:38 -07:00
Jambunathan K
2ac428a21d org-odt.el: Honor "[TABLE-OF-CONTENTS]" directive
* lisp/org-odt.el (org-odt-format-preamble): Don't insert TOC here.
Delay it till the end of export.
(org-odt-begin-document-body): Make a note of the default
position of TOC in `org-lparse-dyn-first-heading-pos'.
(org-odt-insert-toc): Insert TOC as directed by
[TABLE-OF-CONTENTS] line or at the default position.
(org-odt-end-export): Call `org-odt-insert-toc'.

Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00974.html
2012-02-19 08:04:31 -07:00
Bastien Guerry
8c16d85476 org.el: `org-preview-latex-fragment' requires a buffer file name.
* org.el (org-preview-latex-fragment): Throw an error when
called from a non-file buffer.

This take care of this bug:
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3768
2012-02-19 08:04:26 -07:00
David Maus
6bd7c7d042 Don't search for position in existing list if :exact-position
* org-capture.el (org-capture-place-item): Don't search for
position in existing list if :exact-position was supplied.

This fixes a bug reported by François Pinard in
<http://thread.gmane.org/gmane.emacs.orgmode/49995>.
2012-02-19 08:04:20 -07:00
Jambunathan K
4da551b600 Honor user-specified width in captioned images
* lisp/org-odt.el (org-odt-format-textbox): Honor user-specified
width in captioned images.

Fix for bug reported here:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00641.html
2012-02-19 08:03:45 -07:00
Jambunathan K
e9fd334eb4 Add support for indented tables in ODT export
* etc/styles/OrgOdtContentTemplate.xml
(OrgIndentedSection-Level-*): New section styles. These
sections are indented to the same level as the corresponding
list entries.  These sections hold tables that occur within a
list.
(OrgTable): Increased relative width from 90% to 96% for
aesthetic reasons.

* lisp/org-odt.el (org-odt-table-indentedp): New variable
(org-odt-begin-table): Modified.  If the table is within a
list, temporarily leave the list and begin an indented section
before emitting the table.
(org-odt-end-table): Modified.  If the table was within a
list, close the indented section and re-open the list
immediately after ending the table.
(org-odt-continue-list, org-odt-discontinue-list): Helper
routines to temporarily discontinue and continue a list.
(org-odt-list-stack-stashed): New variable to hold the state
of a pending list.
(org-odt-begin-list, org-odt-begin-list-item)
(org-odt-end-list-item): Modified. Handle nitty-gritties for
continuing a list and list item.
(org-odt-section-count): New variable that keeps track of
section count.  Used in conjunction with naming of sections.
(org-odt-begin-section, org-odt-end-section): New defuns.
(org-odt-init-outfile): Initialize
`org-odt-list-stack-stashed' and `org-odt-section-count'.

* lisp/org-lparse.el (org-lparse-list-item-count): Removed. Was a
superfluous variable.
(org-lparse-list-level): Removed.  Now derived from
`org-lparse-list-stack'.
(org-lparse-list-stack): New.  List that records the list
types - ordered, unordered or descriptive - in the following
order: self, parent, grand-parent etc.
(org-do-lparse): Added, removed above let-bound vars.
Disallowed regular tables within list-table block.
(org-lparse-begin-list, org-lparse-end-list)
(org-lparse-begin-list-item, org-lparse-end-list-item):
Propagate above changes.

OpenDocument doesn't permit tables to occur in the middle of a
list.  Use list continuations and indented sections to typeset
indented tables.

Fixes the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00515.html
2012-02-19 08:03:39 -07:00
Eric Schulte
2239d74fd9 Merge branch 'origin-maint' 2012-02-18 14:50:31 -07:00
Eric Schulte
60176c84e5 specify "," as default sqlite output seperator
* lisp/ob-sqlite.el (org-babel-execute:sqlite): Specify the use of ","
  as the separator to `org-table-convert-region'.  Fixes errors when
  only one result per line of output.
2012-02-18 14:49:59 -07:00
Eric Schulte
5a24348778 Merge branch 'origin-maint' 2012-02-18 10:39:04 -07:00
Eric Schulte
19f1bf6bce unified stripping of protective commas -- idempotent org-edit-src-code
* lisp/ob.el (org-babel-strip-protective-commas): Use
  `org-strip-protective-commas'.
* lisp/org-exp.el (org-export-select-backend-specific-text): Use
  `org-strip-protective-commas'.
* lisp/org-src.el (org-edit-src-code): Use
  `org-strip-protective-commas'.
* lisp/org.el (org-strip-protective-commas): Single definition for
  this functionality.
2012-02-18 10:38:32 -07:00
David Maus
5e2d781f5a Merge branch 'f/org-capture-prepare-finalize-hook' 2012-02-18 18:27:35 +01:00
Eric Schulte
ebfef5c0a5 Merge branch 'origin-maint' 2012-02-18 09:26:12 -07:00
Eric Schulte
e744db1ad1 mention ob-sqlite in the comments of ob-sql
* lisp/ob-sql.el: Mention ob-sqlite in the comments of ob-sql.
2012-02-18 09:26:02 -07:00
David Maus
f737fbdc6e New hook: Run before the finalization process starts
* org-capture.el (org-capture-prepare-finalize-hook): New hook. Run
before the finalization process starts.
(org-capture-finalize): Run new hook.
2012-02-18 16:41:30 +01:00
Eric Schulte
c67705a708 Merge branch 'origin-maint' 2012-02-18 08:28:50 -07:00
Eric Schulte
bf238997a9 Generalize to multiple "prop+" properties.
* lisp/org.el (org-entry-get): Generalize to multiple "prop+" properties.
2012-02-18 08:28:40 -07:00
Eric Schulte
5935b59698 Rebinding org-edit-src-save in the org-src-mode-map.
* lisp/org-src.el (org-src-mode-map): Rebinding org-edit-src-save in
  the org-src-mode-map.
2012-02-18 08:08:24 -07:00
David Maus
eed72c5556 Use `with-selected-window' to select calendar window
* org.el (org-recenter-calendar): Use `with-selected-window' to select
calendar window and save currently selected window and current buffer.

Fixes a bug reported by Thomas Morgan in <mid:87obsxwpvc.fsf@ziiuu.com>.
2012-02-18 11:21:05 +01:00
Nicolas Goaziou
cf87d15483 org-list: Remove two defcustoms
* lisp/org-list.el (org-list-ending-method, org-list-end-regexp):
  Removed variables.
(org-in-item-p, org-list-separating-blank-lines-number,
org-list-parse-list, org-list-struct): Apply changes.
* lisp/org-exp.el (org-export-mark-list-end,
  org-export-mark-list-properties): Apply changes.
* lisp/org-latex.el (org-export-latex-lists): Apply changes.
* doc/org.texi (Plain lists): Document removal.
2012-02-17 00:04:34 +01:00
Eric Schulte
a521a7a9a7 Accumulate properties from subtree property drawers.
* lisp/org.el (org-entry-get): Accumulate properties from subtree
  property drawers.
2012-02-15 08:12:35 -07:00
Eric Schulte
51923ff2bc Accumulate properties from subtree property drawers.
* lisp/org.el (org-entry-get): Accumulate properties from subtree
  property drawers.
2012-02-15 08:02:06 -07:00
Jambunathan K
c195392f59 org-odt.el: Use imagemagick to determine image sizes
* org-odt.el (org-export-odt-image-size-probe-method)
(org-odt-do-image-size): Use imagemagick preferentially to
determine image sizes.

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00288.html
2012-02-15 09:54:07 +05:30
Jambunathan K
4657454381 Improve converting from ODT to other formats 2012-02-15 01:17:49 +05:30
Jambunathan K
f9c46584b7 org-odt.el: Remove interactive functions of questionable value
* org-odt.el (org-export-as-odt-to-buffer)
(org-replace-region-by-odt, org-export-region-as-odt): Remove
these interactive functions.  They are of questionable value.
2012-02-14 12:14:55 +05:30
Toby S. Cubitt
30f06ae2b5 Fix bug in org-goto `outline-path-completion' interface
* lisp/org.el (org-goto): call org-refile-get-location with NO-EXCLUDE
argument set, otherwise not only are headlines in the current subtree
excluded, but it throws an error if point happens not to be within a
subtree (e.g. at start of buffer).

TINYCHANGE
2012-02-13 16:19:06 +01:00
Bastien Guerry
762c3047a8 Merge branch 'add-version-tag' 2012-02-13 16:17:24 +01:00
Bastien Guerry
04971de4b9 Add version tag "24.1" for options introduced since Emacs 23.4 (and <= 24.1)
* org-exp.el (org-export-kill-product-buffer-when-displayed)
(org-export-initial-scope, org-export-date-timestamp-format)
(org-export-with-tasks, org-export-email-info)
(org-export-table-remove-empty-lines): Add version tag.

* org-mobile.el (org-mobile-files-exclude-regexp)
(org-mobile-use-encryption, org-mobile-encryption-tempfile)
(org-mobile-encryption-password, org-mobile-agendas): Add
version tag.

* ob-plantuml.el (org-plantuml-jar-path): Add version tag.

* org.el (org-babel-load-languages, org-clone-delete-id)
(org-log-buffer-setup-hook)
(org-loop-over-headlines-in-active-region)
(org-use-sub-superscripts, org-startup-with-beamer-mode)
(org-startup-with-inline-images, org-ctrl-k-protect-subtree)
(org-catch-invisible-edits)
(org-link-search-must-match-exact-headline)
(org-confirm-shell-link-not-regexp)
(org-confirm-elisp-link-not-regexp, org-log-refile)
(org-refile-use-cache)
(org-refile-active-region-within-subtree)
(org-todo-repeat-to-state, org-get-priority-function)
(org-agenda-jump-prefer-future)
(org-read-date-force-compatible-dates)
(org-use-effective-time)
(org-complete-tags-always-offer-all-agenda-tags)
(org-properties-postprocess-alist)
(org-format-latex-signal-error)
(org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command)
(org-export-latex-default-packages-alist)
(org-hidden-keywords, org-pretty-entities)
(org-pretty-entities-include-sub-superscripts)
(org-src-fontify-natively, org-effort-durations)
(org-speed-command-hook): Add version tag.

* org-html.el (org-export-html-footnote-separator)
(org-export-html-mathjax-options)
(org-export-html-mathjax-template)
(org-export-html-headline-anchor-format)
(org-export-html-preamble-format)
(org-export-html-postamble-format)
(org-export-html-table-align-individual-fields)
(org-export-html-protect-char-alist, org-export-html-divs):
Add version tag.

* org-ctags.el (org-ctags-path-to-ctags)
(org-ctags-open-link-functions)
(org-ctags-new-topic-template): Add version tag.

* ob-exp.el (org-export-babel-evaluate): Add version tag.

* org-beamer.el (org-beamer-use-parts)
(org-beamer-frame-level, org-beamer-frame-default-options)
(org-beamer-column-view-format, org-beamer-themes)
(org-beamer-environments-extra, org-beamer-fragile-re)
(org-beamer-outline-frame-title)
(org-beamer-outline-frame-options): Add version tag.

* org-wl.el (org-wl-link-remove-filter)
(org-wl-shimbun-prefer-web-links)
(org-wl-nntp-prefer-web-links, org-wl-disable-folder-check)
(org-wl-namazu-default-index): Add version tag.

* org-clock.el (org-task-overrun-text)
(org-clocktable-defaults, org-clock-clocktable-formatter)
(org-clock-clocktable-language-setup)
(org-clock-report-include-clocking-task)
(org-clock-resolve-expert): Add version tag.

* ob-lob.el (org-babel-lob-files): Add version tag.

* org-freemind.el (org-freemind-node-css-style): Add version
tag.

* org-archive.el (org-archive-reversed-order)
(org-archive-subtree-add-inherited-tags): Add version tag.

* org-bibtex.el (org-bibtex-autogen-keys, org-bibtex-prefix)
(org-bibtex-treat-headline-as-title)
(org-bibtex-export-arbitrary-fields)
(org-bibtex-key-property, org-bibtex-tags)
(org-bibtex-tags-are-keywords, org-bibtex-no-export-tags)
(org-bibtex-type-property-name): Add version tag.

* org-timer.el (org-timer-default-timer): Add version tag.

* org-taskjuggler.el (org-export-taskjuggler-extension)
(org-export-taskjuggler-project-tag)
(org-export-taskjuggler-resource-tag)
(org-export-taskjuggler-target-version)
(org-export-taskjuggler-default-project-version)
(org-export-taskjuggler-default-project-duration)
(org-export-taskjuggler-default-reports)
(org-export-taskjuggler-default-global-properties): Add
version tag.

* org-habit.el (org-habit-today-glyph)
(org-habit-completed-glyph): Add version tag.

* org-list.el (org-alphabetical-lists)
(org-list-ending-method, org-list-end-regexp)
(org-list-automatic-rules, org-list-use-circular-motion)
(org-list-indent-offset): Add version tag.

* ob-picolisp.el (org-babel-picolisp-cmd): Add version tag.

* org-icalendar.el (org-icalendar-alarm-time)
(org-icalendar-combined-description)
(org-icalendar-honor-noexport-tag)
(org-icalendar-date-time-format): Add version tag.

* org-src.el (org-src-tab-acts-natively): Add version tag.

* org-exp-blocks.el (org-export-blocks-postblock-hook): Add
version tag.

* org-table.el (org-table-exit-follow-field-mode-when-leaving-table)
(org-table-fix-formulas-confirm)
(org-table-duration-custom-format)
(org-table-formula-field-format): Add version tag.

* org-publish.el (org-publish-sitemap-sort-files)
(org-publish-sitemap-sort-folders)
(org-publish-sitemap-sort-ignore-case)
(org-publish-sitemap-date-format)
(org-publish-sitemap-file-entry-format): Add version tag.

* ob-js.el (org-babel-js-cmd): Add version tag.

* org-docbook.el (org-export-docbook-footnote-separator)
(org-export-docbook-xslt-stylesheet): Add version tag.

* org-entities.el (org-entities-ascii-explanatory)
(org-entities-user): Add version tag.

* ob.el (org-confirm-babel-evaluate)
(org-babel-no-eval-on-ctrl-c-ctrl-c): Add version tag.

* ob-tangle.el (org-babel-tangle-lang-exts)
(org-babel-post-tangle-hook, org-babel-pre-tangle-hook)
(org-babel-tangle-body-hook)
(org-babel-tangle-comment-format-beg)
(org-babel-tangle-comment-format-end)
(org-babel-process-comment-text): Add version tag.

* org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
Add version tag.

* org-crypt.el (org-crypt-disable-auto-save): Add version tag.

* org-inlinetask.el (org-inlinetask-default-state): Add
version tag.

* ob-scheme.el (org-babel-scheme-cmd): Add version tag.

* ob-lisp.el (org-babel-lisp-dir-fmt): Add version tag.

* org-attach.el (org-attach-store-link-p): Add version tag.

* org-capture.el (org-capture-templates)
(org-capture-before-finalize-hook)
(org-capture-after-finalize-hook): Add version tag.

* org-agenda.el (org-agenda-skip-deadline-prewarning-if-scheduled)
(org-agenda-time-leading-zero, org-agenda-follow-indirect)
(org-agenda-menu-two-column, org-agenda-menu-show-matcher)
(org-agenda-timegrid-use-ampm)
(org-agenda-remove-timeranges-from-blocks)
(org-agenda-inactive-leader, org-agenda-current-time-string)
(org-agenda-show-current-time-in-grid)
(org-agenda-search-view-force-full-words)
(org-agenda-search-view-always-boolean)
(org-agenda-clock-consistency-checks)
(org-agenda-include-deadlines)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-day-face-function)
(org-agenda-category-icon-alist)
(org-agenda-bulk-custom-functions)
(org-agenda-insert-diary-extract-time): Add version tag.

* org-latex.el (org-export-latex-inputenc-alist)
(org-export-latex-tag-markup)
(org-export-latex-timestamp-inactive-markup)
(org-export-latex-href-format)
(org-export-latex-hyperref-format)
(org-export-latex-footnote-separator)
(org-export-latex-quotes)
(org-export-latex-table-caption-above)
(org-export-latex-listings-w-names)
(org-export-latex-minted-langs)
(org-export-latex-listings-options)
(org-export-latex-minted-options)
(org-latex-default-figure-position, org-export-pdf-logfiles):
Add version tag.

* org-faces.el (org-faces-easy-properties)
(org-fontify-quote-and-verse-blocks, org-cycle-level-faces):
Add version tag.

* ob-ditaa.el (org-ditaa-jar-option): Add version tag.

Thanks to Glenn Morris for reporting this.
2012-02-13 15:49:28 +01:00
Nicolas Goaziou
d869973c9d Correctly unfold headlines containing an inlinetask
* lisp/org.el (org-cycle-internal-local): Correctly unfold headlines
  containing an inlinetask.

Based on a patch from Marc-Oliver Ihm.
2012-02-13 11:22:37 +01:00
Bernt Hansen
df0a988a92 Fix J in agenda when clock out hook clocks in again
* org-clock.el (org-clock-out): Do not delete the current clocking task
when org-clock-out-hook clocks in another task

My clock out hook keeps the clock running by automatically clocking in
a new task (the parent task, or the default task).  This sets a new
clocking task which was then clobbered at the end of org-clock-out
so that J in the agenda would return

    "No running clock, use `C-c C-x C-j' to jump to the most recent one"

We now detect that another task is clocked in and skip clearing the
org-clock-current-task variable used by the agenda to determine if
the clock is currently running.
2012-02-12 19:44:23 +01:00
David Maus
1fd0234a30 Fix highlighting in sparse-tree
* org.el (org-scan-tags): Fix highlighting in sparse-tree.

`org-get-heading' uses `org-heading-regexp' introduced by
dfcb6faef1 but `org-scan-tags' assumed
match groups of the old regular expression.

This should fix a bug reported by Suvayu Ali in
<20120209032255.431e8197@kuru.dyndns-at-home.com>.
2012-02-12 19:38:20 +01:00
Jambunathan K
eda5eb1f3a Retire support for BasicODConverter 2012-02-12 16:59:37 +05:30
Jambunathan K
21ccc6def6 Simplify definition of `org-export-odt-convert-processes'
* lisp/org-odt.el (org-export-odt-convert-processes): Re-define
(org-export-odt-convert-capabilities): Fix an accidental
regression.

* lisp/org-lparse.el (org-lparse-do-convert): Related change.
2012-02-12 16:39:07 +05:30
Jambunathan K
c04b68a73c org-odt.el: Tag all custom variables with Emacs version 2012-02-12 13:06:47 +05:30
Jambunathan K
c39167c51c org-odt.el: Fix indentation 2012-02-12 12:53:17 +05:30
Jambunathan K
41c2456385 Offer "docx" as an option in `org-export-odt-preferred-output-format'
* org-odt.el (org-export-odt-convert-capabilities): Change the
default value.

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00293.html.
2012-02-09 00:59:52 +05:30
David Maus
c9a510cf8e Moved `org-in-clocktable-p' from org-clock.el to org.el
* org-clock.el (org-in-clocktable-p): Moved to org.el.
* org.el (org-in-clocktable-p): New function. Moved from org-clock.el

Fixes a bug reported by suvayu ali in
<CAMXnza2W9VSJ2d-dDmsByNmTVgxnt1Onp=J5S=TsFEi8MOVNtg@mail.gmail.com>.

`org-context' depends on the function but org.el does not depend on
org-clock.el.
2012-02-08 20:09:48 +01:00
David Maus
a561b3b77e Don't format tags in title if title headline does not have tags
* org-exp.el (org-export-get-title-from-subtree): Don't format tags in
title if title headline does not have tags.

Fixes a bug reported by John Hendy in
<CA+M2ft_UnBVfUbmoUX6J2MY7e_9w+7an5n23rAarpnnQnaV=ZA@mail.gmail.com>.
2012-02-08 19:27:32 +01:00
Nicolas Goaziou
c4b233453c Merge branch 'maint' 2012-02-07 08:43:41 +01:00
Nicolas Goaziou
b3721c2a66 org-footnote: Fix bogus defvar declares
* lisp/org-footnote.el (org-blank-before-new-entry,
  org-export-footnotes-seen, org-export-footnotes-data): Fix bogus
  declarations.

This fixes bug #10745.  Thanks to Steve Revilak for the report and to
Glenn Morris for the solution.
2012-02-07 08:43:09 +01:00
Nicolas Goaziou
2402d7a192 Merge branch 'maint' 2012-02-04 16:38:02 +01:00
Nicolas Goaziou
dc5d61f03a Fix special C-a and C-e behaviour with visual lines
* lisp/org.el (org-beginning-of-line, org-end-of-line): Fix special
  C-a and C-e behaviour with visual lines.
2012-02-04 16:32:34 +01:00
Eric Schulte
171317ffb5 Merge branch 'origin-maint' 2012-02-03 10:28:16 -07:00
Eric Schulte
df13cc7375 changed the name of exporting comment blocks
* lisp/org-exp-blocks.el (org-export-blocks): Changed the name of
  exporting comment blocks given that it seems regular comment blocks
  no longer export.
2012-02-03 10:25:52 -07:00
Eric Schulte
c55718c377 wrapping new org-current-export-file -> buffer login into a single function
* lisp/ob-exp.el (org-babel-exp-get-export-buffer): Access current
  export buffer.
  (org-babel-exp-in-export-file): Access current export buffer.
  (org-babel-exp-src-block): Access current export buffer.
  (org-babel-exp-inline-src-blocks): Access current export buffer.

Conflicts:

	lisp/ob-exp.el (org-babel-exp-in-export-file): Resolving
	conflicts.
2012-02-03 09:35:57 -07:00
Nicolas Goaziou
d2a63a1b17 ob-exp: Allow org-current-export-file to contain a buffer name
* lisp/ob-exp.el (org-babel-exp-in-export-file,
org-babel-exp-src-block, org-babel-exp-inline-src-blocks): Allow
org-current-export-file to contain a buffer.

This allows to resolve references from a buffer not visiting any file
(i.e. a temporary buffer) during export process.

Conflicts:

	lisp/ob-exp.el (org-babel-exp-in-export-file): Allow
	org-current-export-file to contain a buffer name.
2012-02-03 09:33:09 -07:00
Jambunathan K
9b820def5b org-odt.el: Make LibreOffice the default converter
* lisp/org-lparse.el (org-lparse-do-convert): Replace
`call-process' with `shell-command-to-string'.

* lisp/org-odt.el (org-export-odt-convert-processes): Add a new
converter which depends solely on LibreOffice and nothing
else.
(org-export-odt-convert-process): Make the above native
converter the default.

Thanks to Giles for introducing the "--convert-to" option of
soffice.exe.  The option seems to be a fairly recent
development.

http://imperfectsoftware.blogspot.in/2012/01/one-of-my-less-enjoyable-tasks-is-to.html

With this change, one can export to pdf via odt by a simple
  (setq org-export-odt-preferred-output-format "pdf")
There is no need to install additional converters.
2012-02-03 02:21:10 +05:30
Nicolas Goaziou
e30e13b8c7 Merge branch 'maint' 2012-02-02 21:26:21 +01:00
Nicolas Goaziou
d10792510f org-footnote: Better blank lines control when inserting a footnote
* lisp/org-footnote.el (org-footnote-create-definition): Fix space
  insertion when creating a new footnote. This fixes newline munching
  when `org-footnote-section' is nil and blank lines stacking when it
  isn't nil.

Thanks to Eric Abrahamsen for reporting this.
2012-02-02 21:22:17 +01:00
Nicolas Goaziou
6de9f14cf5 Merge branch 'maint' 2012-02-02 20:41:20 +01:00
Nicolas Goaziou
acd743bdc0 org-footnote: Fix export bug introduced by previous commit
* lisp/org-footnote.el (org-footnote-normalize): Make sure that
  footnotes are moved to a single place during export.
2012-02-02 20:39:40 +01:00
Bastien Guerry
fb31480013 org.el: Prevent the display of messages when cycling from with a Gnus article buffer.
* org.el (org-cycle-internal-global): Prevent the display of
messages when cycling from with a Gnus article buffer.
2012-02-02 15:56:30 +01:00
Nicolas Goaziou
36cc7b4983 Merge branch 'maint' 2012-02-02 10:03:42 +01:00
Nicolas Goaziou
b032a6d51b org-footnote: Fix normalization when no footnote section is defined
* lisp/org-footnote.el (org-footnote-normalize): Ensure footnote
  definition will be inserted at the end of the section corresponding
  to to its first reference.
2012-02-02 10:01:50 +01:00
Nicolas Goaziou
6c0da676af org-footnote: Fix definition ending retrieval with no footnote section
* lisp/org-footnote.el (org-footnote-at-definition-p): Make sure to
  move point at the beginning of the separator before skiping white
  spaces.  Refactor code.
2012-02-02 09:08:28 +01:00
Eric Schulte
a3e5f97ee7 New strip-export noweb header argument value
* lisp/ob-exp.el (org-babel-exp-src-block): Strip noweb references on
  export when "strip-export".
* lisp/ob.el (org-babel-common-header-args-w-values): New noweb
  header value.
  (org-babel-merge-params): New noweb header value.
  (org-babel-noweb-p): New noweb header value.
* testing/examples/babel.org (an): Testing new noweb header value.
* testing/lisp/test-ob-exp.el (ob-exp/noweb-strip-export-ensure-strips):
  Testing new noweb header value.
* doc/org.texi (noweb): Document new noweb header value.
2012-02-01 08:19:29 -07:00
Eric Schulte
4b59c36b03 adding default argument to org-babel-noweb-wrap
This makes it easier to keep consistent behavior.

* lisp/ob-tangle.el (org-babel-tangle-clean): Just use default value.
* lisp/ob.el (org-babel-noweb-wrap): Add default value.
  (org-babel-expand-noweb-references): Just use default value.
2012-02-01 08:19:29 -07:00
Bastien Guerry
04ecf18db0 Merge branch 'maint' of orgmode.org:org-mode into maint 2012-02-01 00:10:06 +01:00
Nicolas Goaziou
646b3f846a Merge branch 'maint' 2012-01-31 20:23:07 +01:00
Nicolas Goaziou
182970cf8e org-exp: Fix export error with code blocks within lists
* lisp/org-exp.el (org-export-select-backend-specific-text): Always
  preserve original indentation as a text property so that lists do
  not get broken by indentation at column 0.
2012-01-31 20:21:44 +01:00
Bastien Guerry
1ec188b00a Merge branch 'maint' of orgmode.org:org-mode into maint 2012-01-31 09:27:47 +01:00
Jambunathan K
171ead5dc8 org-odt.el: Do clear-image-cache' before create-image' 2012-01-31 11:34:56 +05:30
Eric Schulte
c90ea7a979 Merge branch 'origin-maint' 2012-01-30 18:36:31 -07:00
Eric Schulte
900b988742 fix bug introduced by 794319dfd9 2012-01-30 18:35:49 -07:00
Eric Schulte
4743d7146a Merge branch 'origin-maint'
Conflicts:
	lisp/ob.el
2012-01-30 18:33:50 -07:00
Eric Schulte
7b59410c30 don't allow newlines in source names in noweb references
* lisp/ob.el (org-babel-expand-noweb-references): Don't allow newlines
  in source names in noweb references.
2012-01-30 18:27:33 -07:00
Nicolas Goaziou
0c99c8757d Prevent auto-fill from creating Org line breaks
* lisp/org.el (org-fill-line-break-nobreak-p): New function.
(org-set-autofill-regexps): Add previous function to
`fill-nobreak-predicate'.
2012-01-30 22:58:33 +01:00
Vitalie Spinu
ae87b6e5f2 inhibit R evaluation visibility regardless of local user customization
* lisp/ob-R.el (org-babel-R-evaluate-session): Inhibit R evaluation
  visibility regardless of local user customization.
2012-01-30 09:32:56 -07:00
Vitalie Spinu
794319dfd9 inhibit R evaluation visibility regardless of local user customization
* lisp/ob-R.el (org-babel-R-evaluate-session): Inhibit R evaluation
  visibility regardless of local user customization.
2012-01-30 09:31:40 -07:00
Carsten Dominik
a7210f9772 Merge branch 'hide-initial-star-in-inline-tasks' 2012-01-30 09:00:39 +01:00
Carsten Dominik
88c07b546d Make the display of the first star in an inline task optional
* lisp/org-inlinetask.el (org-inlinetask-show-first-star): New option.
(org-inlinetask-fontify): Honor `org-inlinetask-show-first-star'.
* lisp/org-indent.el (org-indent-set-line-properties): Honor
`org-inlinetask-show-first-star'.
2012-01-30 07:55:51 +01:00
Bastien Guerry
9706566dbd org.el: Ensure `org-drawers' doesn't contain duplicates.
* org.el (org-set-regexps-and-options): Ensure `org-drawers'
doesn't contain duplicates.

Thanks to Achim Gratz for spotting this problem.
2012-01-29 10:47:16 +01:00
Bastien Guerry
1c8eb5cc96 org.el: Make `org-metaright' indent drawers and blocks.
* org.el (org-at-drawer-p): Normalize the docstring to match
other `org-at-*-p' docstrings.
(org-indent-block, org-indent-drawer, org-at-block-p): New
functions.
(org-metaright): Use the new functions to indent a drawer or a
block depending on the context.  Also update the docstring.
2012-01-29 00:53:46 +01:00
Bastien Guerry
5bb59a3fdf Let #+DRAWERS append new drawers to `org-drawers', instead of replacing them.
* org.el (org-set-regexps-and-options): Set the value of
`org-drawers' by adding the value of the infile #+DRAWERS
option to that of the existing `org-drawers'.

* org.texi (Drawers): Clearly states that #+DRAWERS will add
drawers to the one originally listed in `org-drawers'.
2012-01-29 00:47:50 +01:00
Bastien Guerry
3639bf7593 org-feed.el: Add all default drawers in the commentary section.
Otherwise people might thing PROPERTIES LOGBOOK and the only two
default drawers.
2012-01-29 00:45:31 +01:00
Bastien Guerry
bb28480169 org.el: Fix bug: hide drawers in inline tasks too.
* org.el (org-cycle-internal-local): Fix bug: hide drawers in
inline tasks too.
2012-01-29 00:18:46 +01:00
Bastien Guerry
263cbb6cc7 Use org-show-entry' for org-inlinetask-toggle-visibility'.
* org-inlinetask.el (org-inlinetask-toggle-visibility): Use
`org-show-entry' instead of `outline-flag-region' to keep the
drawers folded when unfolding an inline task.

Thanks to Viktor Rosenfeld for requiring this.
2012-01-28 16:12:49 +01:00
Torsten Anders
10186915cc org-beamer.el: Add support and keybinding for the `exampleblock' environment.
* org-beamer.el (org-beamer-environments-default): Add support
and keybinding for the `exampleblock' environment.

TINYCHANGE
2012-01-28 15:57:43 +01:00
Bastien Guerry
2c92878470 Merge branch 'maint' 2012-01-28 15:48:17 +01:00
Michael Brand
d9ac2ffa37 Link to Org file: regard startup view state
* lisp/org.el (org-open-link-from-string): Regard `reference-buffer'
when setting `org-inhibit-startup'.

When opening a link to another Org file not yet opened (first close it
if opened) before this patch:
1) When point is on the line with the link and the line is not a
   heading then the target file is opened with the target file startup
   view state, e. g. the default OVERVIEW.
2) When point is on the heading of the entry of which the link is part
   of then the target file is opened with "SHOW ALL". But it is
   expected to regard the target file startup view state like case 1).
Note: Only in case 2) `org-open-at-point' uses
`org-offer-links-in-entry' and from there `org-open-link-from-string'.

example current buffer with link:
#+BEGIN_SRC org
  ,* section
  ,  [[file:myfile.org::*mytarget]]
#+END_SRC

example target file myfile.org:
#+BEGIN_SRC org
  ,* mytarget
  ,  text
  ,*** subsection
#+END_SRC
2012-01-28 15:48:04 +01:00
Eric Schulte
742c4e976b Merge branch 'origin-maint' 2012-01-27 16:31:11 -07:00
Eric Schulte
843ac278f9 Don't insert extra space between inline src block and results on export.
* lisp/ob-exp.el (org-babel-exp-non-block-elements): Don't insert
  extra space between inline src block and results on export.
2012-01-27 16:29:03 -07:00
Eric Schulte
3451d35fcd allow *any* punctuation to proceed an inline src block
Thanks to Martyn Jago for this change.

* lisp/ob.el (org-babel-get-inline-src-block-matches): Allow *any*
  punctuation to proceed an inline src block.
2012-01-27 16:21:49 -07:00
Eric Schulte
25019d8147 Merge branch 'origin-maint' 2012-01-27 16:17:37 -07:00
Eric Schulte
8c69417861 add ( to the list of characters allowed to proceed an inline src block
* lisp/ob.el (org-babel-get-inline-src-block-matches): Add ( to the
  list of characters allowed to proceed an inline src block.
2012-01-27 16:17:21 -07:00
Eric Schulte
3d25553588 allow customization of the noweb reference syntax
Thanks to Sean O'Halpin for suggesting this change.

* lisp/ob-tangle.el (org-babel-tangle-clean): Use the customizable
  noweb wrappers.
* lisp/ob.el (org-babel-noweb-wrap-start): Begin a noweb reference.
  (org-babel-noweb-wrap-end): End a noweb reference.
  (org-babel-noweb-wrap): Apply the customizable noweb wrappers.
  (org-babel-expand-noweb-references): Use the customizable noweb
  wrappers.
2012-01-27 16:04:09 -07:00
Nicolas Goaziou
0e7f2d6e26 Fix error when using a special C-a at an empty item
* lisp/org.el (org-beginning-of-line): Handle case when there's no
  character after box.
2012-01-27 16:04:59 +01:00
Jambunathan K
4beec074d0 org-odt.el: Fix earlier commit 2012-01-27 13:13:27 +05:30
Jambunathan K
90beabb7ab org-odt.el: Honor "[TABLE-OF-CONTENTS]" directive
* lisp/org-odt.el (org-odt-format-preamble): Don't insert TOC here.
Delay it till the end of export.
(org-odt-begin-document-body): Make a note of the default
position of TOC in `org-lparse-dyn-first-heading-pos'.
(org-odt-insert-toc): Insert TOC as directed by
[TABLE-OF-CONTENTS] line or at the default position.
(org-odt-end-export): Call `org-odt-insert-toc'.

Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00974.html
2012-01-27 12:50:19 +05:30
Bastien Guerry
25ddcb9c35 org.el: `org-preview-latex-fragment' requires a buffer file name.
* org.el (org-preview-latex-fragment): Throw an error when
called from a non-file buffer.

This take care of this bug:
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3768
2012-01-26 09:24:51 +01:00
Bastien Guerry
471ddbd14e Improve `org-insert-drawer' and related documentation.
* org.el (org-insert-property-drawer): Not an interactive
command anymore.
(org-insert-drawer): With a prefix argument, insert a property
drawer.  Check for headline within the region before inserting
the drawer.  Don't include special drawers in the completion
table.
(org-mode-map): New keybinding `C-c C-x d' for
`org-insert-drawer'.

* org.texi (Drawers): How to insert/complete drawers.

Thanks to Nicolas Goaziou for the discussion and the patch.
2012-01-26 09:18:10 +01:00
Bastien Guerry
c06003863a org.el: Small code cleanup. 2012-01-25 16:55:41 +01:00
Bastien Guerry
01c23e4707 Enhance ̀org-insert-drawer': completion and region support.
* org.el (org-insert-drawer): Support completion over known
drawer names and inserting a drawer around the current region.
2012-01-25 15:25:09 +01:00
Bastien Guerry
cf3e3e39f9 New function `org-insert-drawer'.
* org.el (org-insert-drawer): New function.
(org-insert-property-drawer): Use it.

Thanks to Olaf Dietsche for this patch.
2012-01-25 15:05:53 +01:00
Bastien Guerry
aee6f9008a New function org-mark-list' bound to C-c C-@'.
* org-list.el (org-mark-list): New function.

* org.el (org-mode-map): Add a keybinding for the new function.
2012-01-25 13:52:20 +01:00
Bastien Guerry
1742683e4f Let pcomplete handle drawers.
* org-pcomplete.el (pcomplete/org-mode/drawer): New function
to complete drawer at point.
(org-thing-at-point): Use it.

Thanks to Nick Dokos for a request in this area.
2012-01-25 10:01:39 +01:00
Bastien Guerry
d1e58716dd org.el: Use `newline-and-indent' when in a property drawer.
* org.el (org-meta-return): Use `newline-and-indent' when in a
property drawer.
2012-01-25 09:59:43 +01:00
Bastien Guerry
624b69345c Docfix for `org-structure-template-alist'.
* org.el (org-structure-template-alist): Fix docstring: the
feature is not experimental anymore.
2012-01-25 07:55:16 +01:00
Martyn Jago
c82ca2f19a Fix org-babel-result-end' command to provide consistent result removal where result is type wrap'.
* lisp/ob.el:

Fix `org-babel-result-end' command to provide consistent result
removal where result is type `wrap'. Prior to this fix
multiple (org-ctrl-c-ctrl-c) commands will add multiple newlines to
the end of results (one newline per block execution).

This fixes the test `test-ob/org-babel-remove-result--results-wrap'

* testing/lisp/test-ob.el:

Uncomment test since it now passes.
2012-01-24 09:36:40 -07:00
Bastien Guerry
551ad25135 Merge branch 'master' of orgmode.org:org-mode 2012-01-24 17:20:28 +01:00
Eric Schulte
afb9860487 Merge branch 'origin-maint' 2012-01-24 09:17:08 -07:00
Gregor Zattler
58b74e078b Document max number of stars in headings in docstring of org-inlinetask-minlevel
Clocking only works with headings indented with less than `30' stars
(hardcoded `lmax' value in `org-clock-sum').  Since especially inline
tasks may dupe someone into using more stars, document the limit in
the docsring of `org-inlinetask-min-level'.
2012-01-24 17:10:21 +01:00
Bastien Guerry
c74fe88c01 org-agenda.el: Allow `C-u' to display the item without unfolding drawers and logbooks.
* org-agenda.el (org-agenda-show-and-scroll-up): Allow `C-u'
to display the item without unfolding drawers and logbooks.
2012-01-24 17:03:03 +01:00
Bastien Guerry
314bd75c13 org-src.el: Make sure `buffer-file-name' is always nil.
* org-src.el (org-edit-src-code): Make sure `buffer-file-name'
is always nil.

Thanks to Leo Alekseyev in hunting this down.
2012-01-24 16:23:34 +01:00
Bastien Guerry
3fa9b64a67 org.el: Fix missing angle brackets for muse export style.
* org.el (org-structure-template-alist): Fix missing angle
brackets for muse export style.

Thanks to Eric S Fraga for this fix.
2012-01-24 15:42:36 +01:00
Bastien Guerry
9b299af837 Use [...] in the `org-read-date' overlay when inserting inactive timestamps.
* org.el (org-read-date): New parameter `inactive' when
reading for insertion of inactive timestamps.
(org-time-stamp, org-read-date-display): Use the new
parameter.

Thanks to François Pinard for this suggestion.
2012-01-24 15:34:54 +01:00
Eric Schulte
1bb2a3c23a fixed two issues with noweb reference expansion
* lisp/ob.el (org-babel-expand-noweb-references): Only allow
  reference names which start and end with non-whitespace characters.
  Also, raise errors as appropriate given org-babel-noweb-error-langs.
2012-01-24 07:23:43 -07:00
Bastien Guerry
cc7acb65ff org-src.el: Save and restore `buffer-undo-list' after editing.
* org-src.el (org-src-in-org-buffer): Save and restore
`buffer-undo-list' after editing.

Thanks to Peter Danenberg for this fix.
2012-01-24 14:59:54 +01:00
Eric Schulte
2395c3eff1 Merge branch 'origin-maint' 2012-01-24 00:02:52 -07:00
Eric Schulte
11d31e89c4 replace org-babel-noweb-separator variable with :noweb-sep header argument
* doc/org.texi (noweb-sep): Document new header argument.
* lisp/ob.el (org-babel-common-header-args-w-values): Add new header
  argument.
  (org-babel-expand-noweb-references): Use header argument rather than
  customization variable.
2012-01-23 23:57:51 -07:00
David Maus
cda38d182a Don't search for position in existing list if :exact-position
* org-capture.el (org-capture-place-item): Don't search for
position in existing list if :exact-position was supplied.

This fixes a bug reported by François Pinard in
<http://thread.gmane.org/gmane.emacs.orgmode/49995>.
2012-01-24 06:41:49 +01:00
Eric Schulte
fce92180d1 Merge branch 'origin-maint' 2012-01-23 19:43:28 -07:00
Eric Schulte
269a509615 customizable noweb reference separator
* lisp/ob.el (org-babel-noweb-separator): Custom variable for
  accumulated noweb references.
  (org-babel-expand-noweb-references): Allow separator for noweb
  references.
* doc/org.texi (noweb-ref): Documentation of this new custom variable.
2012-01-23 19:42:06 -07:00
Nicolas Goaziou
c31067803f In an item, special position for C-a is after check-box, if any
* lisp/org.el (org-beginning-of-line): In an item, special position
  for C-a is after check-box, if any.
(org-special-ctrl-a/e): Modify doc-string accordingly.
2012-01-23 22:15:15 +01:00
Jambunathan K
1634baf695 org-odt.el: Fix regression in typesetting of MathML formulae
* lisp/org-odt.el (org-export-odt-format-formula): Use :style
property to specify custom table styles.

Continuation of the earlier commit titled: "Put table width
under user-control".
2012-01-24 01:54:30 +05:30
Eric Schulte
527e6844cc optionally export additional information with call lines
* lisp/ob-exp.el (org-babel-exp-call-line-template): Control export of
  additional call line information.
  (org-babel-exp-non-block-elements): Fancier call line export.
* testing/examples/babel.org (an): Example data to test new call line
  export.
* testing/lisp/test-ob-exp.el (ob-exp/export-call-line-information):
  Test new call line export.
2012-01-23 12:53:15 -07:00
Jambunathan K
1d99fd7010 org-odt.el: Allow images to be anchored as characters
* lisp/org-odt.el (org-odt-entity-frame-styles): Add frame params
for images that are anchored as character.
(org-export-odt-format-image): Handle new anchor type
"as-char".
(org-export-odt-default-image-sizes-alist): Misc. change.
(org-export-odt-format-formula): Misc. change.

With this change, one can use the below snippet to produce
images that are laid out side-by-side.
    #+ATTR_ODT: :width 7 :height 7 :anchor as-char
    #+header: :file foo.png
    [[./foo.png]]
    #+caption: bar
    #+ATTR_ODT: :width 7 :height 7 :anchor as-char
    #+header: :file bar.png
    [[./bar.png]]

See http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00677.html.
2012-01-24 01:15:34 +05:30
Eric Schulte
a9510349ea Merge branch 'origin-maint' 2012-01-23 11:07:36 -07:00
Eric Schulte
978fd46069 don't report valid header arguments as suspicious
* lisp/ob.el (org-babel-check-src-block): Don't report valid header
  arguments as suspicious.
2012-01-23 11:07:27 -07:00
Eric Schulte
d3538624e7 Merge branch 'origin-maint'
Conflicts:
	lisp/ob-exp.el
	testing/examples/babel.org
2012-01-23 10:46:03 -07:00
Eric Schulte
43abeaa488 evaluate all executables in buffer order on export
* lisp/ob-exp.el (org-babel-exp-non-block-elements): Map over both
  inline src blocks and call lines on export.
2012-01-23 10:39:38 -07:00
Jambunathan K
f24dbe15c1 org-odt.el: Make label references consistent with LaTeX export
* lisp/org-odt.el (org-odt-label-styles): Add a new style.
(org-odt-category-map-alist):  Use it.

Andreas Leha writes:

The following snippet exports correctly to LaTeX and to html, but
produces the text "Figure Figure" in odt.

Could the behaviour be synchronized?

=== example.org ==========================
* Test ref
  plot(1:10, 1:10)

Here is a reference to Figure \ref{fig:bar}
=== example.org ==========================
2012-01-23 13:31:33 +05:30
Jambunathan K
f9d2422002 org-odt.el: Put table width under user-control
* lisp/org-odt.el (org-odt-table-style-format): New.  Template for
auto-generated table styles.
(org-odt-automatic-styles, org-odt-object-counters): New
variables.
(org-odt-add-automatic-style): New function.
(org-odt-write-automatic-styles): New function.  Create
automatic styles for tables that have custom :rel-width.
(org-odt-begin-table): Parse attributes specified with
"#+ATTR_ODT: " option and use it to create an automatic table
style.
(org-odt-save-as-outfile): Call
`org-odt-add-write-automatic-styles'.
(org-odt-init-outfile): Init newly add variables.
(org-odt-section-count): Remove it.
(org-odt-begin-section): Use `org-odt-add-automatic-style' to
generate an automatic section name.

Customize table width using :rel-width option.  For example,
to create a table of width 60% use:

    #+attr_odt: :rel-width 60
    | A | B |
    |---+---|
    |   |   |
2012-01-23 12:25:11 +05:30
Eric Schulte
10f26fb805 Merge branch 'origin-maint' 2012-01-20 12:00:31 -07:00
Eric Schulte
4f5b6317b5 correctly position point when mapping hits an inline code block
* lisp/ob.el (org-babel-map-executables): Correctly position point when
  mapping hits an inline code block.
2012-01-20 11:59:53 -07:00
Litvinov Sergey
f92facd890 Map "screen" to shell-script-mode 2012-01-20 11:47:13 -07:00
Eric Schulte
97e8e03eea Ensure params are incorporated *before* checking if evaluation is legal
* lisp/ob.el (org-babel-execute-src-block): Ensure params are
  incorporated *before* checking if evaluation is legal.
2012-01-20 11:44:12 -07:00
Eric Schulte
5a0bf5e7d1 Ensure markers are used during lob export
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Ensure `end' is a
  marker so it is updated as required during export.
2012-01-20 11:32:49 -07:00
Eric Schulte
5852cf7fbf tangle the parent buffer of a code edit buffer
* lisp/org-src.el (org-src-in-org-buffer): Run commands in the parent
  buffer.
  (org-edit-src-save): Use new macro.
  (org-src-tangle): Tangle the parent buffer.
2012-01-20 11:00:46 -07:00
Eric Schulte
041c68f586 Merge branch 'maint' of orgmode.org:org-mode into origin-maint 2012-01-20 10:55:32 -07:00
Konrad Hinsen
f2a9d83824 Support for links to IMAP folders in org-vm.el 2012-01-20 17:06:04 +01:00
Bastien Guerry
d19a347a8b org.el: Fix bug in done headline fontification.
* org.el (org-set-font-lock-defaults): Fix bug in done
headline fontification.

Thanks to Brian J. Carlson for pointing this error and
a solution.
2012-01-20 16:45:53 +01:00
Bastien Guerry
c79c5767d3 org.el: Fix bug in done headline fontification.
* org.el (org-set-font-lock-defaults): Fix bug in done
headline fontification.

Thanks to Brian J. Carlson for pointing this error and
a solution.
2012-01-20 16:44:25 +01:00
Bastien Guerry
fd233c0491 org.el (org-return): Act normally when in code blocks.
* org.el (org-return): Act normally when in code blocks.

Thanks to Sébastien Vauban for spotting this.
2012-01-20 16:32:03 +01:00
Bastien Guerry
ed1a701cf5 org.el: `org-context' now returns :clocktable and :src-block.
* org.el (org-in-src-block-p): New function.
(org-context): Return new contexts :clocktable and :src-block.
2012-01-20 16:28:04 +01:00
Bastien Guerry
d447fe8792 org.el: Make ̀C-u C-c C-q' do the right thing even when point is before the first heading.
* org.el (org-set-tags-command, org-set-tags): Make ̀C-u C-c
C-q' do the right thing even when point is before the first
heading.

Thanks to François Pinard for mentioning this.
2012-01-20 15:44:16 +01:00
Eric Schulte
bded90ba48 Disambiguate intersection name.
* lisp/ob.el (org-babel-noweb-p): Disambiguate intersection name.
2012-01-19 15:04:36 -07:00
Jambunathan K
5bbc0a593e Honor user-specified width in captioned images
* lisp/org-odt.el (org-odt-format-textbox): Honor user-specified
width in captioned images.

Fix for bug reported here:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00641.html
2012-01-20 00:12:11 +05:30
Eric Schulte
3be1f755b0 Merge branch 'origin-maint' 2012-01-19 11:07:41 -07:00
Eric Schulte
70c58b93f1 Revert "remove #+name and #+result hiding"
This reverts commit 8a8a56c277.
2012-01-19 11:07:12 -07:00
Eric Schulte
b44c08dd45 remove all calls to `gensym'
* lisp/ob.el (org-babel-map-src-blocks): Replace gensym with make-symbol.
  (org-babel-map-inline-src-blocks): Replace gensym with make-symbol.
  (org-babel-map-call-lines): Replace gensym with make-symbol.
  (org-babel-map-executables): Replace gensym with make-symbol.
2012-01-19 11:07:11 -07:00
Bastien Guerry
95e71f5705 Revert "Honour existing restrictions when visiting tasks from the agenda"
This reverts commit 8f93a75cac.
2012-01-19 16:21:50 +01:00
Bastien Guerry
3a6c081367 Revert "Honour existing restrictions when regenerating the agenda"
This reverts commit a0a26cddda.
2012-01-19 16:20:12 +01:00
Bastien Guerry
9b9f2d0d8d Revert "Honour existing restrictions when clocking in from the agenda"
This reverts commit c41a6f5a33.
2012-01-19 16:20:07 +01:00