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

6084 commits

Author SHA1 Message Date
Carsten Dominik b40226a597 Test commit on new branch 2012-03-05 10:19:16 +01:00
Max Mikhanosha f969141505 Merge branch 'master' into max-sticky-agenda 2012-03-03 18:31:32 -05:00
Max Mikhanosha ed0859969b Fix exiting sticky agenda refresh with C-g, was forgetting what kind of agenda it was 2012-03-03 11:04:12 -05:00
Eric Schulte 9915dc8905 fix code block replacement with results
* lisp/ob.el (org-babel-find-named-result): Fix code block replacement
  with results.
2012-03-03 07:45:20 -07:00
Max Mikhanosha 1b3dc456e4 Automatically name sticky agenda buffers with keys used to invoke it, patch
by Carsten Dominik
2012-03-03 08:57:32 -05:00
Nicolas Goaziou 6dab0cd71f Merge branch 'maint' 2012-03-03 13:08:35 +01:00
Nicolas Goaziou 155ab73f77 org-footnote: Small fix to previous commit
* lisp/org-footnote.el (org-footnote-normalize): Do not normalize
  labels when sort-only is non-nil.
2012-03-03 13:07:59 +01:00
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
Max Mikhanosha 1bbf87a968 Apply Carsten's patch to prune org-agenda-local-vars list 2012-03-02 11:40:54 -05: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
Max Mikhanosha 68f802ca72 Re-create mulitple-agenda-buffers support, to avoid git rebase hell 2012-03-01 10:49:23 -05: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