Commit Graph

5360 Commits

Author SHA1 Message Date
Nicolas Goaziou 9495979cdd org-footnote: fix doc-string typo 2011-07-14 09:49:50 +02:00
Nicolas Goaziou 31e92984bc Correctly export lists in footnotes (take 2)
* lisp/org-exp.el (org-export-preprocess-string): add the possibility
  to call recursively the function. Also change order of some function
  calls. Comment export process for footnotes.
* lisp/org-footnote.el (org-footnote-normalize): change the export
  specific parameter to hold properties of export. Thus, the function
  can send every footnote definition in the buffer through
  `org-export-process-string'.
2011-07-13 18:15:52 +02:00
Nicolas Goaziou 743e3e7fcc org-latex: fix interpreted latex commands and snippets in footnotes
* lisp/org-latex.el (org-export-latex-preprocess): first insert
  footnotes in the temporary buffer so their contents can properly be
  protected from further transformations if required.
2011-07-12 11:54:32 +02:00
Nicolas Goaziou 108bd48e25 org-list: introduce a variable to distinguish sub-items better
* lisp/org-list.el (org-list-indent-offset): new variable.
(org-list-struct-fix-ind): make use of the new variable.
2011-07-12 09:12:19 +02:00
Nicolas Goaziou aad4a7d4d3 Complete default values for check-boxes in LaTeX exporter
* lisp/org-latex.el (org-export-latex-list-parameters): complete
  default value with cbtrans option.
* lisp/org-list.el (org-list-to-latex): set a more consistent default
  value.
2011-07-12 09:12:19 +02:00
Nicolas Goaziou 90ef02a02b org-list: move and rename org-list-exchange-items
* lisp/org-list.el (org-list-swap-items): move it to a meaningful
  position in source code (i.e. before any function using it), and
  rename it to an easier name.
2011-07-12 09:12:19 +02:00
Nicolas Goaziou 688a29c0d6 org-list: change heuristics for number of lines separating items
* lisp/org-list.el (org-list-separating-blank-lines-number): if there
  are blank lines already in the whole list, add a blank line.
2011-07-12 09:12:19 +02:00
Nicolas Goaziou 41355053e6 org-list: introduce a variable to consider lists as rings
* lisp/org-list.el (org-list-use-circular-move): new variable.
(org-previous-item, org-next-item): make use of the new variable.
(org-move-item-down, org-move-item-up): make use of the new
variable. Simplify code.
2011-07-12 09:12:13 +02:00
Nicolas Goaziou 6338eb72a6 org-list: add a new method on lists (org-list-send-item)
* lisp/org-list.el (org-list-delete-item, org-list-send-item): new
  functions.
2011-07-12 09:09:34 +02:00
Bastien Guerry 1029a92517 org-agenda.el: New variable for custom bulk action functions.
* org-agenda.el (org-agenda-bulk-custom-functions): New
variable for custom bulk action functions.
(org-agenda-bulk-action): Use it.

Thanks to Julien Cubizolles for triggering this idea.
2011-07-12 08:31:36 +02:00
Bastien Guerry 0b0684aa95 org-latex.el: Delete trailing whitespaces. 2011-07-12 08:31:07 +02:00
Bastien Guerry 2b9afb9e63 org-latex.el: New defcustom `org-export-latex-quotes' to control quotes.
* org-latex.el (org-export-latex-quotes): New defcustom.
(org-export-latex-quotation-marks): Use it.

This allows users to define what quotes they want to use as a
replacement of english double-quotes while exporting to LaTeX.

In particular, if you use the csquote package, you can configure
Org to output something like \endquote{some quoted text} instead
of "some quoted text".

Thanks to Frederik for bringing this issue up, and to Thomas S.
Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-12 08:30:34 +02:00
Bastien Guerry 9fc6daa3d2 org-capture.el: Delete trailing whitespace. 2011-07-12 08:29:55 +02:00
Bastien Guerry 17603418ab org-capture.el: Fix bug about insert blank line when aborting.
* org-capture.el (org-capture-finalize): bugfix about
inserted blank line when killing the capture buffer and
`org-blank-before-new-entry' tells to not insert anything
before a heading.

Thanks to Leo for reporting this.
2011-07-12 08:29:02 +02:00
Bastien Guerry 462c0d1e86 org.el: cosmetic changes in docstring. 2011-07-12 00:54:14 +02:00
Bastien Guerry d9ceb9df09 org-taskjuggler.el: cosmetic changes. 2011-07-11 17:02:42 +02:00
Bastien Guerry 1f0a4e4f1a org-html.el: Fix :group for two defcustoms.
(org-export-html-before-content-div)
(org-export-html-content-div): Fix :group.

Thanks to Jambunathan for spotting this.
2011-07-11 13:41:34 +02:00
Bastien Guerry d20aa46a49 org-html.el: New defcustom: `org-export-html-before-content-div'
(org-export-html-before-content-div): New defcustom for
arbitrary HTML code placed before the main div container.
2011-07-11 13:40:36 +02:00
Bastien Guerry 22ed19061a Rename `org-export-content-div' to `org-export-html-content-div'.
* org-html.el (org-export-html-content-div): Rename from
`org-export-content-div'.
(org-export-as-html): Use new name.

Thanks to Jambunathan for spotting this.
2011-07-11 13:33:21 +02:00
Bastien Guerry 1fa21737be * org-latex.el (org-export-latex-header-defs-re): Delete. 2011-07-11 13:29:34 +02:00
Bastien 9a2bf02346 `org-set-property' to use the last set property as default prompt
I'm testing whether patchwork catches the patches again.

You are free to test the feature as well :)

>From 2064e28c44ffc6f4020c8a5ec46e0d6bcf559c01 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Mon, 11 Jul 2011 12:10:32 +0200
Subject: [PATCH] Make `org-set-property' defaults to the last set property.

* org.el (org-last-set-property): New variable.
(org-read-property-name): Use the new variable: the prompt
defaults to the last property set, unless there is a property
in the line at point.
2011-07-11 12:25:57 +02:00
Bastien Guerry badec64cbf Bufix: remove useless whitespace added after planning.
(org-add-planning-info): Bufix: remove useless whitespace
added after planning.
2011-07-11 12:23:47 +02:00
David Maus 6b12ff2e2f Fix docstrings, consistently refer to capture, not remember
* org-capture.el (org-capture-before-finalize-hook)
(org-capture-after-finalize-hook, org-capture-mode-map)
(org-capture-mode, org-capture-goto-last-stored): Fix docstring,
consistently refer to capture, not remember.
2011-07-10 19:30:40 +02:00
Eric Schulte 52a14c5e2e ob-clojure: respects "scalar" and "verbatim" results params
* lisp/ob-clojure.el (org-babel-execute:clojure): Respects "scalar"
  and "verbatim" results params.
2011-07-10 09:42:54 -06:00
Eric Schulte c6e69cd85b ob: enforce "verbatim" as synonym for "scalar"
* lisp/ob-awk.el (org-babel-execute:awk): Use "verbatim" as synonym
  for "scalar".
* lisp/ob-sh.el (org-babel-sh-evaluate): Use "verbatim" as synonym for
  "scalar".
* lisp/ob-sqlite.el (org-babel-execute:sqlite): Use "verbatim" as
  synonym for "scalar".
* lisp/ob.el (org-babel-merge-params): Use "verbatim" as synonym for
  "scalar".
2011-07-10 09:42:54 -06:00
Eric Schulte cef17b6340 ob-clojure: parse odd parens when nested isnide lists
* lisp/ob.el (org-babel-script-escape): Parse odd parens when nested
  isnide lists.
2011-07-10 09:42:54 -06:00
Eric Schulte c1465c5d00 ob-clojure: no longer force results into elisp if they don't naturally fit
* lisp/ob-clojure.el (org-babel-execute:clojure): No longer force
  results into elisp if they don't naturally fit.
2011-07-10 09:42:54 -06:00
Eric Schulte f0ab1bda95 ob-clojure: Stop re-reading already parsed lisp results.
* lisp/ob-clojure.el (org-babel-execute:clojure): Stop re-reading
  already parsed lisp results.
2011-07-10 09:42:54 -06:00
Nicolas Goaziou ecabda5603 org-list: docstring update
* lisp/org-list.el (org-plain-list-ordered-item-terminator): remove
  incorrect assumption.
2011-07-10 10:40:03 +02:00
Nicolas Goaziou dc85f45194 More forbidden blocks for lists and footnotes
* lisp/org-footnote.el (org-footnote-forbidden-blocks): add missing
  exporter specific blocks.
* lisp/org-list.el (org-list-forbidden-blocks): ditto.
2011-07-10 10:33:25 +02:00
Bastien Guerry 3018219cca org-latex.el: bugfix about exporting narrowed tables.
* org-latex.el (org-export-latex-tables): Bugfix: remove
properties from fields.

Thanks to Frederik for reporting this.
2011-07-10 00:28:33 +02:00
Bastien Guerry d406defd61 org-clock.el: Fix bug in `org-clock-timestamps-change'. 2011-07-09 23:54:49 +02:00
Bastien Guerry fd12e700b0 Minor code cleanup. 2011-07-09 18:12:18 +02:00
Benjamin Andresen a493b4d489 Fix calc-eval date(<timestamp>) 2011-07-09 17:47:41 +02:00
Bastien Guerry f65e63d094 Fix tiny spelling mistake. 2011-07-09 17:38:59 +02:00
Bastien Guerry db731a9715 Allow synchronous update of timestamps in CLOCK log.
* org.el (org-shiftcontrolup, org-shiftcontroldown): New
commands to use `org-clock-timestamps-change'.

* org-clock.el (org-clock-timestamps-change)
(org-clock-timestamps-down, org-clock-timestamps-up)
(org-at-clock-log-p): New functions to let the user update
clock log timestamps while keeping the same clock duration.

Thanks to Rainer Stengele for this idea.
2011-07-09 17:38:21 +02:00
Bastien Guerry a4bbc54d15 org.el: org-timestamp-up/down: mention time changes.
* org.el (org-timestamp-up, org-timestamp-down): mention time
changes in the docstring.
2011-07-09 15:26:29 +02:00
Bastien Guerry 65b64bea53 org-clock.el: new hook to remove empty clock drawer.
* org-clock.el (org-clock-remove-empty-clock-drawer): New
function to remove empty clock drawer.
(org-clock-out-hook): Add the new function as a hook.
2011-07-09 15:20:31 +02:00
Bastien Guerry 516b2fbb87 org.el: remove CLOCK: and empty drawers from clones. 2011-07-09 15:04:39 +02:00
Nicolas Goaziou e98a2e4b4d org-footnote: refuse to insert a footnote in an inappropriate context 2011-07-08 18:08:34 +02:00
Nicolas Goaziou d29fcc50ea org-list: make use of new `org-in-block-p' function
* lisp/org-list.el (org-list-in-valid-context-p): use `org-in-block-p'.
2011-07-08 18:08:34 +02:00
Nicolas Goaziou abe9550309 Forbid footnotes in some contexts
* lisp/org.el (org-in-block-p): new function.
* lisp/org-footnote.el (org-footnote-forbidden-blocks): new variable.
(org-footnote-in-valid-context-p): new function.
(org-footnote-at-reference-p): use new function. Allow inline
footnotes to start at bol.
2011-07-08 18:08:34 +02:00
Bastien Guerry b7cbf687de ob-lilypond.el: delete useless comment. 2011-07-08 17:54:44 +02:00
Matthew Sauer 4693a3632f Fix ob-lilypond.el compiler error: org-babel-tangle undefined function 2011-07-08 17:33:12 +02:00
Bastien Guerry 0c7f3726fa org-ascii.el: fix `org-export-as-utf8'.
* org-ascii.el (org-export-as-utf8): fix call to
`org-called-interactively-p': it requires an argument.  Also
fix the docstring.
2011-07-08 11:56:24 +02:00
Bastien Guerry 0a0fb300f3 Merge branch 'master' of orgmode.org:org-mode 2011-07-08 09:59:28 +02:00
Tassilo Horn dc59011473 org-mobile.el: Fix org-mobile-push with custom functions 2011-07-08 08:30:31 +02:00
Eric Schulte 197d23cc6f ob-lilypond: add to make file and fix compiler warnings
* Makefile (LISPF): Adding ob-lilypond.el.
* lisp/ob-lilypond.el (show-all): Declaring function from outline.el.
  (org-babel-default-header-args:lilypond): Declared.
  (ly-process-basic): Use the appropriate prefix for the temporary
  file, and don't call a function from ob-dot.el.
  (ly-version): Let-bind a free variable.
2011-07-07 19:34:08 -06:00
Bastien Guerry 8567831ff8 org-footnote.el: silent compiler warning.
Declare  `org-bracket-link-regexp'.

Thanks to Achim Gratz for catching this.
2011-07-06 22:58:40 +02:00
Bastien Guerry 9c05a7c781 Bump to version 7.6 2011-07-06 21:06:03 +02:00
Bastien Guerry ff038caae5 Revert "Silence byte-compiler with a new alias: filter-buffer-substring-functions."
This reverts commit 5a2eec3207.

The replacement of `buffer-substring-filters' by
`filter-buffer-substring-functions' requires some rewriting
of functions like `org-indent-remove-properties-from-string'.
2011-07-06 20:56:39 +02:00
Bastien Guerry 737241402a org-indent.el: tiny docstring fix. 2011-07-06 20:49:55 +02:00
Bastien Guerry 382e69ee6c org-publish.el: fix bug in `org-publish-cache-file-needs-publishing'.
* install/git/org-mode/lisp/org-publish.el
(org-publish-cache-file-needs-publishing): only check against .org
files.
2011-07-06 19:21:50 +02:00
Bastien Guerry 7a88eaec29 New face: org-default.
* install/git/org-mode/lisp/org.el (org-mode): Use org-default as
the default face in org-mode.

* install/git/org-mode/lisp/org-faces.el (org-default): New face.

M-x customize-face RET org-default RET lets the user define a default
face for org-mode.
2011-07-06 17:25:29 +02:00
Bastien Guerry c6b22dee33 org-publish.el: Take #+INCLUDE: directives into account.
* install/git/org-mode/lisp/org-publish.el
(org-publish-cache-file-needs-publishing): Takes care of more
recently included files, returning `t' in case the file including
them needs to be republished.
2011-07-06 17:04:07 +02:00
Martyn Jago 514ed6b79c ob-lilypond: more consistent behavior with other code block languages
>    Hi
>
>    I've added functionality to make ob-lilypond act in a consistent
>    org-babel way by default (think ob-dot).
>
>    The previous modus operandi is now known as arrange-mode and is
>    selected by setting ly-arrange-mode to t
>
>    More details including examples are at
>    http://github.com/mjago/ob-lilypond
2011-07-06 07:17:29 -06:00
Bastien Guerry c86a84828d EXPERIMENTAL/org-export.el: Delete redundant function.
`org-export-export-preprocess-string' was a dummy copy of
`org-export-preprocess-string', adapted for specific needs
of org-mw-export.  We now use `org-export-preprocess-string'
directly.  This requires a minor change in this latter function:
if :for-backend is not explicitely passed, then the let binding
of `org-export-current-backend' falls back on the previous value
of org-export-current-backend'.
2011-07-06 12:56:53 +02:00
Nicolas Goaziou 301b3450fe org-exp: remove tasks before normalizing footnotes
* lisp/org-exp.el (org-export-preprocess-string): if the last subtree
  is a task, footnotes may be removed along with the subtree. This
  patch ensures footnotes are put at the end of the buffer after the
  subtree has been removed.
2011-07-05 20:42:15 +02:00
Nicolas Goaziou de0fcdffa4 org-footnote: distinguish footnotes from links
* lisp/org-footnote.el (org-footnote-at-reference-p): verify that what
  looks like a footnote doesn't belong to a link.
(org-footnote-next-reference-or-definition): check more strictly
footnote definitions.
2011-07-05 14:01:44 +02:00
Bastien Guerry 5a2eec3207 Silence byte-compiler with a new alias: filter-buffer-substring-functions.
When `filter-buffer-substring-functions' is not a known variable to
Emacs (for versions < 24.1), we alias it to `buffer-substring-filters'.
2011-07-05 12:00:15 +02:00
Bastien Guerry 330ed08feb org.el: fix `org-end-of-meta-data-and-drawers'
Back to the previous version of `org-end-of-meta-data-and-drawers',
with a better fix.

Thanks to Eric Abrahamsen for this.
2011-07-05 11:05:20 +02:00
Deech 5a5036cc13 Ignore errors when launching a language's mode when tangling a source block.
The lua-mode for instance was throwing errors that killed the tangling process.

* lisp/ob-tangle.el (org-babel-tangle): Ignore errors thrown by
  language modes.
2011-07-04 15:00:17 -06:00
Eric S Fraga 9f056593a5 org-table.el: Er... fix the previous fix about time formulas computation.
The error was introduced by Bastien, not Maciek Starzyk.  Bzg was
trying to fix things manually too hastily :)
2011-07-04 12:23:25 +02:00
Bastien Guerry b9af1d0cd5 ob-ref.el: declare two functions.
Declare `org-id-find-id-in-file' and `org-show-context'.

Thanks to Achim Gratz for spotting this.
2011-07-04 11:05:07 +02:00
Rémi Vanicat 5a20035809 org-agenda.el: fix bug in org-diary-class.
calendar-absolute-from-gregorian returns a number of day and
should not be used here.
2011-07-04 11:00:54 +02:00
Maciek Starzyk 429b1cc81a org-table.el: Fix bug in formula duration computation. 2011-07-04 10:51:29 +02:00
Bastien Guerry 71eff05694 org-footnote.el: fix a few compiler warnings.
Thanks to Achim Gratz for catching them.
2011-07-03 21:32:41 +02:00
Eric Schulte e409a859ff ob-python: inhibit return of the eoe string during session evaluation
* lisp/ob-python.el (org-babel-python-evaluate-session): Inhibit
  return of the eoe string during session evaluation.
2011-07-03 12:12:11 -06:00
Eric Schulte fcede7c577 ob-python: enough newlines to ensure a return when ":results output :session"
* lisp/ob-python.el (org-babel-python-evaluate-session): Enough
  newlines to ensure a return when ":results output :session".
2011-07-03 12:08:13 -06:00
Eric Schulte 9e7ef71da3 ob-python: more robust session evaluation
* lisp/ob-python.el (org-babel-python-evaluate-session): Introduced a
  new local function for sending input with a slight delay to allow
  pythong to re-draw the prompt.  No longer removing newlines inside
  code block bodies (was due to a defective regexp).
2011-07-03 09:19:50 -06:00
Bastien Guerry 16faa2b6c1 org-macs.el: new function `org-format-seconds'.
* install/git/org-mode/lisp/org-table.el
(org-table-time-seconds-to-string): use `org-format-seconds'
instead of `format-seconds'.

* install/git/org-mode/lisp/org-macs.el (org-format-seconds):
handle case where `format-seconds' does not exist.
2011-07-03 13:23:09 +02:00
Bastien Guerry a14815aa92 org-publish.el: delete trailing whitespaces. 2011-07-03 13:07:27 +02:00
David Maus 60d24c01ea Properly handle relative symlinks when publishing
* org-publish.el (org-publish-cache-ctime-of-src): Properly handle
relative symlinks.

At Thu, 07 Apr 2011 01:11:00 -0400,
Nick Dokos wrote:
>
> org-publish-cache-ctime-of-src tries (but does not always succeed) to
> deal with symlinks: file-symlink-p returns the target as a string, but
> if the target is relative to the symlink, that's not going to fly.
> e.g. if c is a symlink like this
>
>     /a/b/c->../d/f
>
> then (file-symlink-p "/a/b/c") -> "../d/f"
> but if the current directory is any place other than /a/b, the target
> will not be found, the file attributes are going to be nil and
> the function will blow up.
2011-07-03 13:06:52 +02:00
David Maus c4066dca8e Use function argument instead of dynamically scoped symbol
* org-latex.el (org-export-latex-preprocess): Use function argument
instead of dynamically scoped symbol.

Export options are passed to org-export-preprocess-string which passes
them down to backend specific preprocessor. The :footnotes option is
included.
2011-07-03 13:05:19 +02:00
David Maus 813f8028dd Use org-string-match-p for backward compatibility with Emacs22
* org-freemind.el (org-freemind-convert-links-helper)
(org-freemind-convert-text-p, org-freemind-write-mm-buffer)
(org-freemind-get-node-style): Use org-string-match-p for backward
compatibility with Emacs22.
2011-07-03 13:05:11 +02:00
David Maus 97538eb9ec Add missing :group keyword in defcustom
* org-html.el (org-export-html-protect-char-alist): Add missing :group
keyword in defcustom.
2011-07-03 13:05:05 +02:00
David Maus 4f17b5362a Call kill-buffer with argument nil
* ob-haskell.el (org-babel-haskell-export-to-lhs): Call kill-buffer
with argument indiciating to kill current buffer. Emacs 22
compatibility.

GNU Emacs 22.3.2 (i686-pc-linux-gnu) of 2011-05-28 on x60s

C-h f kill-buffer RET

kill-buffer is an interactive built-in function in `C source code'.
It is bound to C-x k.
(kill-buffer buffer)

Kill the buffer buffer.
The argument may be a buffer or the name of a buffer.
With a nil argument, kill the current buffer.
2011-07-03 13:04:46 +02:00
David Maus eaa724404b Toggle partial-completion-mode only if it is turned on
* org-macs.el (org-without-partial-completion): Toggle
partial-completion-mode only if it is turned on.
2011-07-02 16:51:55 +02:00
Bastien Guerry 43a380708e org.el: tiny fix to org-add-planning-info. 2011-07-02 15:23:25 +02:00
Bastien Guerry 5fb8c750fb org.el: fix issues with timestamps: insert them at the same position.
* install/git/org-mode/lisp/org.el (org-add-planning-info): fix
issues with timestamps not being inserted at the same position.
2011-07-02 15:13:03 +02:00
Bastien Guerry 2e20cf9358 org-table.el: return correct duration string for Calc formulas. 2011-07-02 13:34:22 +02:00
Bastien Guerry 12687ad200 org-table.el: Implement computation of durations with "T" flag
* install/git/org-mode/lisp/org-table.el
(org-table-time-string-to-seconds)
(org-table-time-seconds-to-string): New functions.
(org-table-eval-formula): Implement the "T" (time) flag for
computing durations.
2011-07-02 13:08:54 +02:00
Bastien Guerry da086f9606 Bugfix `org-without-partial-completion' (again).
Er... We need to call ,@body when partial-completion-mode is nil.
2011-07-02 12:15:20 +02:00
Bastien Guerry 65815f64a4 Fix `org-without-partial-completion' again.
This uses the macro David Maus suggests.  In particular, it doesn't
use the (let (pc-mode ...)) binding, which, as David states, could
cause leakage if the pc-mode variable is used within ,@body.
2011-07-02 11:25:56 +02:00
Bastien Guerry 467435dba7 Don't include org-lparse.el in the list of contributed modules.
This modules is a dependancy of org-odt.el, which is the real
library users want to load.
2011-07-02 11:15:57 +02:00
Jambunathan K 67be9be326 Add org-lparse and org-odt as contrib modules
--

>From 9b97d19c1184d3cf2cc82831e3d29067cf91f014 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Sat, 2 Jul 2011 01:56:01 +0530
Subject: [PATCH] Add org-lparse and org-odt as contrib modules

* lisp/org.el (org-modules): Add org-lparse and org-odt as
contrib modules.
* contrib/README: Ditto
2011-07-02 11:13:22 +02:00
Eric Schulte 9c0ddffdc4 fix typo 2011-07-01 17:37:30 -07:00
Eric Schulte ca4472063a org: fontify #+header lines
* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Include header
  lines.
  (org-additional-option-like-keywords): Include data as a synonym for
  results.
2011-07-01 13:12:03 -07:00
Eric Schulte 6ddad0a91a ob: not including export-variable headers in cache sha1
* lisp/ob.el (org-babel-sha1-hash): Improving code layout and removing
  export-variable headers in cache sha1.
2011-07-01 12:56:22 -07:00
Martyn Jago dacf18e80a ob-lilypond: test suite, all tests passing 2011-07-01 12:22:33 -07:00
Eric Schulte 0b6eb6de3c ob-ref: don't let org-id rescan all IDs when trying to resolve a reference
* lisp/ob-ref.el (org-babel-ref-goto-headline-id): Don't let org-id
  rescan all IDs when trying to resolve a reference.
2011-07-01 12:09:34 -07:00
Julien Barnier 549a521256 Fix some #+ blocks fontification when there is no lang attribute
* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src blocks
lang attribute

When there is no lang attribute to a block (for quote, verse or others), the
lang variable is not nil, but an empty string.
2011-07-01 17:28:32 +02:00
Eric S Fraga ca07a5ba62 * Allow for a different markup for inactive time stamps on latex export 2011-07-01 11:03:58 +02:00
Bastien Guerry 0461d55c41 Merge branch 'master' of orgmode.org:org-mode 2011-07-01 09:38:47 +02:00
Eric Schulte 311b09d926 ob-org: expanding variables in Org-mode text
* lisp/ob-org.el (org-babel-expand-body:org): Implemented this
  function, only action is to expand variables.
  (org-babel-execute:org): Uses the new body-expansion function.
2011-06-30 15:23:46 -07:00
Nicolas Goaziou 934aae8812 Allow white spaces between the counter and the check-box in an item
* lisp/org-list.el (org-list-full-item-re): allow counter and
  check-box to be separated by white spaces.
(org-list-struct-apply-struct): reflect changes made to
`org-list-full-item-re'.
* lisp/org-html.el (org-html-export-list-line): recognize spaces
  between counter and check-boxes as valid.
* lisp/org-docbook.el (org-export-docbook-list-line): ditto.
2011-06-30 22:57:18 +02:00
Nicolas Goaziou e070ebe6b0 org-list: org-list-insert-item respects its POS argument value
* lisp/org-list.el (org-list-insert-item): make sure point is moved
  to the specified POS before starting the function.
2011-06-30 20:35:56 +02:00
Eric Schulte 0e4d6f3e77 moving ob-lilypond into the core of Org-mode 2011-06-30 11:06:22 -07:00
Nicolas Goaziou ffa016ba3d Fix some glitches in footnotes fontification
* lisp/org.el (org-activate-footnote-links): properly fontify inline
  footnotes.
(org-set-font-lock-defaults): apply changes to previous function.
2011-06-30 19:29:14 +02:00
Nicolas Goaziou bab6c5bf5a org-footnote: find correct reference when two footnotes are side-by-side
* lisp/org-footnote.el (org-footnote-at-reference-p): first check if
  point is at the beginning of a footnote. Indeed `org-in-regexp'
  first checks backwards and might find an incorrect footnote if they
  are side-by-side.
2011-06-30 19:14:18 +02:00
Michael Brand d298908394 Allow to disable the agenda block separator per block
* org-agenda.el (org-agenda-compact-blocks): Improve docstring.
(org-agenda-block-separator): Add nil to docstring and customization.
(org-prepare-agenda): Skip agenda block separator additionally if
org-agenda-block-separator is nil.
(org-agenda-overriding-header): Improve docstring.

This change allows to disable the agenda block separator only and also
per block only.  (The variable org-agenda-compact-blocks non-nil
disables agenda block separators together with the line containing the
agenda span name and week number and does this globally for all blocks
and all custom agenda commands.)
2011-06-30 18:40:48 +02:00
Bastien Guerry dbde087a21 org.el: don't escape image links with no description.
(org-make-link-string): Don't escape image links when no description
is provided by the user.  Otherwise those images won't be recognized
as images when trying to display inline pictures.
2011-06-30 18:40:24 +02:00
Bastien Guerry f0bbfe50aa org.el: (org-end-of-meta-data-and-drawers): simplify. 2011-06-30 18:01:38 +02:00
Bastien Guerry 9c582ceed8 org.el: Remove useless `org-without-partial-completion'.
* org.el (org-set-tags): Remove useless `org-without-partial-completion'.
2011-06-30 17:06:13 +02:00
Bastien Guerry db052b7de9 Revert "Fix binding problem in org-without-partial-completion."
This reverts commit ed8627de92.
2011-06-30 10:42:26 +02:00
Eric Schulte f06e712834 org-footnote: declare function for the compiler
* lisp/org-footnote.el (org-fill-paragraph): Declare function for the
  compiler.
2011-06-29 16:33:39 -07:00
Eric Schulte 802a127544 ob-ref: declare function for compiler
* lisp/ob-ref.el (org-narrow-to-subtree): Declare unknown function.
2011-06-29 16:30:34 -07:00
Eric Schulte 0a0969303a ob: declare variable to appease compiler
* lisp/ob.el (org-babel-inline-lob-one-liner-regexp): Declare variable
  to appease compiler.
2011-06-29 16:29:19 -07:00
Michael Markert b3e8b3f87c adding optional argument KIND to all org-called-interactively-p function invocations
* lisp/ob.el (org-babel-sha1-hash): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
* lisp/org-agenda.el (org-agenda-redo): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
  (org-agenda-show-1): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-agenda-set-tags): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
* lisp/org-ascii.el (org-export-as-latin1): Adding optional argument
  KIND to all org-called-interactively-p function invocations.
  (org-export-as-latin1-to-buffer): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
  (org-export-as-utf8-to-buffer): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-export-region-as-ascii): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
* lisp/org-docbook.el (org-export-region-as-docbook): Adding optional
  argument KIND to all org-called-interactively-p function
  invocations.
* lisp/org-html.el (org-export-region-as-html): Adding optional
  argument KIND to all org-called-interactively-p function
  invocations.
* lisp/org-latex.el (org-export-region-as-latex): Adding optional
  argument KIND to all org-called-interactively-p function
  invocations.
* lisp/org-table.el (org-table-blank-field): Adding optional argument
  KIND to all org-called-interactively-p function invocations.
  (org-table-current-column): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-current-dline): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-sort-lines): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-sum): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-rotate-recalc-marks): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
  (org-table-eval-formula): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (orgtbl-send-table): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
* lisp/org.el (org-mode): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-copy-subtree): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-paste-subtree): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-store-link): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-todo): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-occur): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
2011-06-29 16:22:58 -07:00
Michael Markert c5a6d3a974 org-macs: Determine on macro expand which interactive predicate we need.
Signed-off-by: Michael Markert <markert.michael@googlemail.com>
2011-06-29 16:22:43 -07:00
Bastien Guerry 2b7dbee193 Replace interactive-p with the org-called-interactively-p macro.
Interactive-p is an obsolete function as of Emacs 23.2.
`org-called-interactively-p' takes care of the current (x)Emacs
version and use either `interactive-p' (for XEmacs and Emacs<23.2)
or `called-interactively-p'.
2011-06-29 18:24:08 +02:00
Nicolas Goaziou 560804b4d8 org-footnote: better action on footnotes with no definition associated
* lisp/org-footnote.el (org-footnote-action): offer to create
  definition when none is found.
2011-06-29 15:26:22 +02:00
Nicolas Goaziou 66537c520c org-footnote: strenghten footnotes regexp
* lisp/org-footnote.el (org-footnote-re): avoid matching inactive
  time-stamps or check-box cookies.
(org-footnote-next-reference-or-definition): adapt to the new regexp.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou 56b558d15a org-exp: normalize footnotes after removing commented subtrees
* lisp/org-exp.el (org-export-preprocess-string): if the last subtree
  is commented, footnotes inserted during normalizing at the end of
  the buffer may get deleted. This patch ensures deletion comes first,
  normalization second.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou 39d4bfa0e8 Rename org-export-footnotes-markers to org-export-footnotes-seen
* lisp/org-exp.el (org-export-footnotes-data): change docstring.
(org-export-footnotes-seen): renamed from
org-export-footnotes-markers.
* lisp/org-ascii.el (org-export-as-ascii): apply change.
* lisp/org-docbook.el (org-export-as-docbook): apply change.
* lisp/org-footnote.el (org-footnote-normalize): apply change.
* lisp/org-html.el (org-export-as-html): apply change.
* lisp/org-latex.el (org-export-as-latex): apply change.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou a9e0449f23 org-latex: properly get definition of footnotes during export
* lisp/org-latex.el (org-export-latex-preprocess): rely on
  `org-export-footnotes-markers' to retreive definition of the current
  footnote during export.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou 06a4c2c8d0 org-footnote: better normalization during export
* lisp/org-footnote.el (org-footnote-normalize): remember footnotes
  seen so far by the exporter when choosing the new marker.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou 28bfc26024 org-footnote: update changes for odt exporter
* lisp/org-footnote.el (org-footnote-normalize): make use of
  `org-footnote-insert-pos-for-preprocessor'.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou 30944f228e Add properties to footnotes during export
* lisp/org-footnote.el (org-footnote-normalize): add `org-footnote'
  property to footnote markers when preparing for exportation.
* lisp/org-html.el (org-export-as-html): read new property to decide
  when to export a footnote.
* lisp/org-docbook.el (org-export-as-docbook): read new property to
  decide when to export a footnote.
* lisp/org-latex.el (org-export-latex-preprocess): ensure footnote at
  column 0 cannot end a list containing it by adding
  `original-indentation' property to it.
2011-06-29 12:00:43 +02:00
Nicolas Goaziou 6eee91a117 org-latex: correct bugs in footnote export
* lisp/org-exp (org-export-preprocess-string): normalize footnotes
  before marking lists ending.
* lisp/org-latex.el (org-export-latex-preprocess): work with labels as
  strings and not as numbers.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 789380330a Insert a customizable separator between footnotes
* lisp/org-docbook.el (org-export-docbook-footnote-separator): new
  variable
  (org-export-as-docbook): add a separator between footnotes.
* lisp/org-html.el (org-export-html-footnote-separator): new variable.
  (org-export-as-html): add a separator between footnotes.
* lisp/org-latex.el (org-export-latex-footnote-separator): new
  variable.
  (org-export-latex-preprocess): add a separator between footnotes.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou ab9c52fd79 Improve footnotes handling in exporters
* lisp/org-exp.el (org-export-footnotes-markers,
  org-export-footnotes-data): new variables.
  (org-export-preprocess-string): use a more explicit argument.

* lisp/org-html.el (org-export-as-html): initialize new variables.

* lisp/org-docbook.el (org-export-as-docbook): initialize new variables.

* lisp/org-latex.el (org-export-latex-footmark-seen): new variable.
  (org-export-as-latex): initialize new variables.
  (org-export-latex-preprocess): allow to export two or more footnotes
  in a row. Also permit to have footnotes refering to previously
  defined footnotes.

* lisp/org-ascii.el (org-export-as-ascii): feed org-footnote-normalize
  with data so it can normalize footnotes before first headline, or
  footnotes with their definition outside exported region.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 9c31654077 org-footnote: remove unnecessary checks in footnotes regexps
* lisp/org-footnote.el (org-footnote-goto-definition): now,
  determining if point is at a footnote reference is entirely
  determined by `org-footnote-at-reference-p'. No need to check if
  pattern isn't at beginning of the line elsewhere.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou c9d01b3bbd org-footnote: refactor code 2011-06-29 12:00:42 +02:00
Nicolas Goaziou 1eac25a438 Adjust fontification of footnotes
* lisp/org-footnote.el (org-footnote-next-reference-or-definition):
  new function.
* lisp/org.el (org-activate-footnote-links): activate the whole
  footnote, but only fontify its label.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 460d093da8 org-footnote: rewrite normalize function
* lisp/org-footnote.el (org-footnote-normalize): make use of changes
  to `org-footnote-at-reference-p' and creation of various functions..
  Also comment code.
  (org-footnote-get-next-reference, org-footnote-delete-references,
  org-footnote-delete-definitions): new functions
  (org-footnote-goto-previous-reference, org-footnote-all-labels,
  org-insert-footnote-reference-near-definition, org-footnote-delete):
  rewrite to use org-footnote-get-next-reference.
2011-06-29 12:00:42 +02:00
Nicolas Goaziou 62fe76b5dc org-footnote: parse footnotes references with more accuracy
* lisp/org-footnote.el (org-footnote-re): don't end an inline footnote
  at unrelated closing square brackets.
  (org-footnote-at-reference-p): improve accuracy of the function to
  determine if point is at a reference and to extract definition of an
  inline footnote.
  (org-footnote-all-labels, org-footnote-action, org-footnote-delete,
  org-footnote-auto-adjust-maybe): make use of previous function.
2011-06-29 12:00:42 +02:00
Julian Gehring e01e160f31 org-html: fix typo in doc
Hi,

this patch fixes a typo in the documentation of org-html.

Best
Julian

>From 40483bb63d236595d6982dca26a2a3d80bfd39bc Mon Sep 17 00:00:00 2001
From: Julian Gehring <julian.gehring@googlemail.com>
Date: Wed, 29 Jun 2011 10:31:21 +0200
Subject: [PATCH] org-html: fix typo in doc
2011-06-29 11:27:16 +02:00
Bastien Guerry 22f34369fd Merge branch 'master' of orgmode.org:org-mode 2011-06-29 01:56:51 +02:00
Bastien Guerry 7311ac5d4f Keep warning cookie when timestamping/rescheduling/redeadlining.
* install/git/org-mode/lisp/org.el (org-deadline, org-schedule):
keep warning cookie when rescheduling/redeadlining.
(org-time-stamp): Fix problem with warning cookie.
2011-06-29 01:56:40 +02:00
Eric Schulte 0bcdf0b72b ob-clojure: force escaping of clojure source into elisp source
* lisp/ob-clojure.el (org-babel-execute:clojure): Force escaping of
  clojure source into elisp source.
2011-06-28 16:39:02 -07:00
Eric Schulte b055f0d372 ob: escaping scripts now treats {} in the same manner as []
* lisp/ob.el (org-babel-script-escape): Treats {} in the same manner
  as [] and allows for forcing string conversion.
2011-06-28 16:38:30 -07:00
Eric Schulte 20044297a4 exp: strip protective commas from literal code blocks
* lisp/org-exp.el (org-export-select-backend-specific-text): Strip
  protective commas from literal code blocks.
2011-06-28 15:43:20 -07:00
Eric Schulte cb67a439b1 ob-ref: bug fix in new function
* lisp/ob-ref.el (org-babel-ref-goto-headline-id): Fix bug.
2011-06-28 14:20:10 -07:00
Eric Schulte 5b7646ce08 ob: expand noweb references to headline contents
* lisp/ob-ref.el (org-babel-ref-goto-headline-id): Split out into its
  own function.
  (org-babel-ref-headline-body): Split out into its own function.
  (org-babel-ref-resolve): Using new functions, and alignment.
* lisp/ob.el (org-babel-ref-goto-headline-id): Declare function.
  (org-babel-ref-headline-body): Declare function.
  (org-babel-expand-noweb-references): Now expands noweb references to
  headlines during expansion.
2011-06-28 13:04:58 -07:00
Eric Schulte a2cf4b43f2 ob-ref: resolve variable references to headline contents
* lisp/ob-ref.el (org-babel-ref-resolve): Now resolves references to
  headlines by either global or custom id, in which case the contents
  of the headline are returned literally.
2011-06-28 13:04:58 -07:00
Eric Schulte ef42f3cc9c ob-lob: inline calls should export even when preceeded by an "="
* lisp/ob-exp.el (org-babel-in-example-or-verbatim): Also check for in
  verbatim emphasis.
  (org-babel-exp-lob-one-liners): Cleaner checking for escaped call
  lines.
2011-06-28 13:04:57 -07:00
Nicolas Goaziou cc76e76509 org-list: fix bug with item cycling
* lisp/org-list.el (org-cycle-item-indentation): cycling back to
  original position deleted any additional information in the item,
  like a counter or a tag.
2011-06-28 20:26:49 +02:00
Nicolas Goaziou c4086ad1e4 org-list: doc-strings white-spaces fixes 2011-06-28 20:26:49 +02:00
Bastien Guerry f9cc3f525b org.el: make org-time-stamp also keep warning periods.
... not only repeaters.

Thanks to Karl Voit for spotting this.
2011-06-28 19:27:12 +02:00
Laurence Mitchell 8d93fc8a3b lisp/org-latex.el: Convert quotes to their LaTeX equivalents
Convert quotes to their LaTeX equivalents using
org-export-latex-quotation-marks.
2011-06-28 19:18:02 +02:00
Bastien Guerry ed8627de92 Fix binding problem in org-without-partial-completion.
Thanks to Paul Sexton for spotting this.
2011-06-28 18:47:56 +02:00
Pieter Praet 7bae223536 org-crypt: make org-decrypt disable auto-save-mode (configurable)
As auto-save-mode can only cause leakage when there's actual decrypted
data lying around, don't check for it (and potentially cause annoyance)
on init, but only when org-decrypt-entry is called.

* lisp/org-crypt.el:
  - add defcustom `org-crypt-disable-auto-save'
  - `org-decrypt-entry': before decrypting, check whether
    `auto-save-mode' is enabled for the current buffer, and act
    on it according to how `org-crypt-disable-auto-save' is set.
  - remove comment re "encrypt[ing] Org auto-saved buffers"
  - remove on-init check for `auto-save-default'
2011-06-28 12:04:16 +02:00
Eric Schulte 27c3cad589 ob: preserve the order of variable parameters
* lisp/ob.el (org-babel-merge-params): Ensure variable parameters are
  not reversed.

* lisp/ob-ref.el (org-babel-ref-split-args): Ensure variable
  parameters are not reversed.
2011-06-27 11:31:12 -07:00
Eric Schulte d1f0ae650f ob: fix results insertion for inline blocks which happen to start a line
* lisp/ob.el (org-babel-insert-result): Fix results insertion for
  inline blocks which happen to start a line.
2011-06-27 10:36:27 -07:00
Eric Schulte acec7eb7c3 ob-lob: fix the logic checking if a call line is commented
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Fix the logic
  checking if a call line is commented.
2011-06-27 10:36:27 -07:00
Bastien Guerry d7c693c1ff org.el: fix bug about repeater not kept when using org-time-stamp
Thanks to Karl Voit for reporting this.
2011-06-27 18:22:37 +02:00
Vincent Belaïche 6d18e03519 * org.el (org-read-property-name): Propose default property name.
Propose default property name value by looking at whether current line
is already some property setting.
2011-06-27 12:35:08 +02:00
Achim Gratz d37223562d Introduce CLOCK_INTO_DRAWER property like the existing LOG_INTO_DRAWER
* lisp/org.el (defcustom org-log-into-drawer): correct typo
* lisp/org-clock.el: new function org-clock-into-drawer to change
  the location of clock events based on properties CLOCK_INTO_DRAWER
  or, as fallback, LOG_INTO_DRAWER, like it is already possible for
  state change logs.
* lisp/org-clock.el (org-clock-jump-to-current-clock): add statement
  to let clause to bind org-clock-into-drawer to result of function
  eval
* lisp/org-clock.el (org-clock-find-position): add statement
  to let clause to bind org-clock-into-drawer to result of function
  eval, change let to let* since the binding is used later in the
  same clause
* doc/org.texi: document that both CLOCK_INTO_DRAWER and
  LOG_INTO_DRAWER can be used to override the contents of variable
  org-clock-into-drawer (or if unset, org-log-into-drawer)
* doc/org.texi: @xref->@pxref
2011-06-27 12:12:23 +02:00
Eric Schulte 85cabe1eab ob-lob: ensure 'cl is loaded during compilation so we can use flet
* lisp/ob-lob.el (require): Ensure 'cl is loaded during compilation so
  we can use flet.
2011-06-26 17:13:18 -07:00
Eric Schulte 4e0387a766 ob-lob: correctly indent results of non-inline call lines.
* lisp/ob-lob.el (org-babel-lob-get-info): Correctly indent results of
  non-inline call lines.
2011-06-25 17:56:40 -07:00
Eric Schulte dceaf7da4f ob-exp: don't export inline call_ blocks which aren't whitespace padded
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't export inline
  call_ blocks which aren't whitespace padded.
2011-06-25 17:45:06 -07:00
Eric Schulte 9e686bd681 ob: ensure that un-named variables are assigned correctly
* lisp/ob.el (org-babel-merge-params): Do not reverse variable order,
  and be sure to increment variable index as appropriate.
2011-06-25 15:20:05 -07:00
Eric Schulte 7cfca9a969 ob-lob: fixed problem in inline call line regexp
* lisp/ob-lob.el (org-babel-inline-lob-one-liner-regexp): Updated to
  successfully match optional trailing header arguments in square
  brackets.
  (org-babel-lob-get-info): Updated to match the new regexp.
2011-06-25 15:06:28 -07:00
Eric Schulte 36164f0607 ob: fix empty-argument bug introduced by recent inline call lines
* lisp/ob-lob.el (org-babel-lob-get-info): If the arguments are empty,
  then allow them to be so.
2011-06-25 14:25:18 -07:00
Eric Schulte 1b95d2e9ce ob: unnamed variables are assigned in order
* lisp/ob.el (org-babel-merge-params): If variables are not named they
  are assigned in order.
2011-06-25 14:11:53 -07:00
Eric Schulte 4127e53cda ob: remove code comments pointing to online documentation
* lisp/ob.el: Remove code comment about online documentation.
* lisp/ob-exp.el: Remove code comment about online documentation.
* lisp/ob-lob.el: Remove code comment about online documentation.
2011-06-25 13:17:31 -07:00
Jambunathan K 7adb6675d7 org-export-format-source-code-or-example: Fix commit f0177f (org-odt)
* lisp/org-exp.el (org-export-format-source-code-or-example):
Fix signature of org-<backend>-format-source-code-or-example
function.
2011-06-25 10:53:14 +02:00
Eric Schulte 3d60c1a1d8 ob: replace call to called-interactively-p with backwards-compatible interactive-p
* lisp/ob.el (org-babel-sha1-hash): Replace call to
  called-interactively-p with backwards-compatible interactive-p.
2011-06-24 19:48:10 -07:00
Eric Schulte 5c3def4713 ob: export of inline call blocks
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Appropriate
  replacement of inline call blocks with their results.
2011-06-24 15:16:11 -07:00
Eric Schulte 6c771d236d ob: inserting inline call block results appropriately
* lisp/ob-lob.el (org-babel-inline-lob-one-liner-regexp): Removing
  this trailing space ensures that the insertion of the results looks
  nice.
* lisp/ob.el (org-babel-insert-result): Insert inline lob line results
  as inline results.
2011-06-24 14:53:30 -07:00
Eric Schulte 825f6d382d ob-exp: introducing inline call lines to the export engine
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Calculate length
  appropriately given the style (block or inline) of the lob line.
* lisp/ob-lob.el (org-babel-block-lob-one-liner-regexp): New regexp
  specific for block lob lines.
  (org-babel-inline-lob-one-liner-regexp): New regexp specific for
  inline lob lines.
  (org-babel-lob-one-liner-regexp): Combination of two lob regexps.
  (org-babel-lob-get-info): Return info from *either* the block or
  inline lob lines.
2011-06-24 14:44:28 -07:00
Eric Schulte 6323bbded9 ob-exp: fixed a bug in exportation of #+call lines
* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Corrected the
  structure of the resulting info list.
* lisp/ob-lob.el (org-babel-default-lob-header-args): Export the
  results of call lines by default.
2011-06-24 13:53:25 -07:00
Niels Giesen d3100fd13f * lisp/org-icalendar.el (org-print-icalendar-entries): Add 'uid text
property based on the ID property of the org entry to the first
  character of the diary entry.

This text property can be used by `icalendar--create-uid', instead
of creating a uid by itself.

NOTE: `icalendar--create-uid' should be patched to pick up this uid.

TINYCHANGE
2011-06-24 17:22:24 +02:00
Bastien Guerry dad5a348ad org-crypt.el: reduce the warning time from 5 to 1 second. 2011-06-24 12:53:19 +02:00
Carsten Dominik 95fa250e60 Merge branch 'Jambu' 2011-06-24 10:03:11 +02:00
Carsten Dominik 67893d3158 Declare a function to keep compiler happy 2011-06-24 06:47:32 +02:00
Jambunathan K fd2e471a6f Control insertion point for footnote definitions during pre-process
PATCH-5/5 org-odt compatibility patch

From 22c4feee78ff9a1ab7cc48275ec29d322a3472a1 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Thu, 23 Jun 2011 13:17:18 +0530
Subject: [PATCH 5/5] Control insertion point for footnote definitions during pre-process.

* lisp/org-footnote.el
(org-footnote-insert-pos-for-preprocessor): New variable.
(org-footnote-normalize): Use it.
2011-06-23 23:10:45 +02:00
Jambunathan K 01c2f06ea4 Simplify org-export-format-source-code-or-example
PATCH-4/5 org-odt compatibility patch

Addtional Note: Diff looks primarily because of
un-indentation. Effective changes are just couple of lines.

From 923402f12f30a39d54e16c0b105db2b1f20c2a7c Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Thu, 23 Jun 2011 12:06:33 +0530
Subject: [PATCH 4/5] Simplify org-export-format-source-code-or-example.

* lisp/org-exp.el (org-export-format-source-code-or-example):
Simplify. Also add `org-native-text' as a text property to the
formatted text and throw error for unknown backends.
2011-06-23 23:10:24 +02:00
Jambunathan K f0177f4a11 Support custom formatters for marking up source or example blocks
PATCH-3/5 org-odt compatibility patch

From a7881b8d146ddb27452b00ff19c345899d356536 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Thu, 23 Jun 2011 11:24:32 +0530
Subject: [PATCH 3/5] Support custom formatters for marking up source or example blocks.

* lisp/org-exp.el (org-export-format-source-code-or-example):
Add support for:
- custom formatters for existing backends
- seamless plugging in of new backends.
2011-06-23 23:10:09 +02:00
Jambunathan K 67da474db5 org-exp.el: Allow easy plugging in of new backends
PATCH-2/5: org-odt compatibility

From 2bc4854fb86a96b69e53db00603e0b2f8f47fe08 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Thu, 23 Jun 2011 02:16:30 +0530
Subject: [PATCH 2/5] org-exp.el: Allow easy plugging in of new backends.

* lisp/org-exp.el (org-export-backends): New variable.
(org-export-select-backend-specific-text): Use above
variable. Also mark text between #+BACKEND and
#+BEGIN_BACKEND...#+END_BACKEND with org-native-text
property. This text property is currently used only by the new
line-oriented generic exporter (which is not yet part of the
repo).
2011-06-23 23:09:53 +02:00
Jambunathan K aca61a173c org-export: Reserve a slot for OpenDocumentExporter
PATCH-1/5 for org-odt compatibility

From 06379ccef996e8dabd8dcced6cbe430aacdef3f0 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Thu, 23 Jun 2011 01:53:37 +0530
Subject: [PATCH 1/5] org-export: Reserve a slot for OpenDocumentExporter.

* lisp/org-exp.el (org-export): Reserve keys 'o' and 'O' for
OpenDocumentText export and bind them to org-export-as-odt and
org-export-as-odt-and-open.
2011-06-23 23:09:35 +02:00
Eric Schulte 40d80baa1b ob-exp: less verbose when in batch mode
* lisp/ob-exp.el (org-babel-exp-src-block): Less verbose when in batch
  mode.
2011-06-22 19:12:20 -07:00
Eric Schulte 93bcee0f98 ob-clojure: treat vectors as elisp lists
* lisp/ob-clojure.el (org-babel-execute:clojure): Convert vectors to
  lists before reading into emacs-lisp.
2011-06-21 15:45:19 -07:00
Eric Schulte 4a0e5cf88f initialize variable from ob-tangle in language files that use it
* lisp/ob-C.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-asymptote.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-awk.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-clojure.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-haskell.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-latex.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-lisp.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-ocaml.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-perl.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-python.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-ruby.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-tangle.el (ob-tangle): initialize variable from ob-tangle.
2011-06-21 15:45:19 -07:00
Carsten Dominik e860e08e58 Merge branch 'master' of orgmode.org:org-mode 2011-06-21 20:07:08 +02:00
Eric Schulte 3f3fc513b7 ob-emacs-lisp: respects ":results verbatim"
* lisp/ob-emacs-lisp.el (org-babel-execute:emacs-lisp): Respects ":results verbatim".
2011-06-21 10:38:11 -07:00
Carsten Dominik 6413de8e91 Introduce alias for diary-float
* lisp/org-agenda.el (org-float): Aliases for `diary-float'.

This is just to make sure that all the diary sexp functions
have org- equivalents.  org-float is just an alias because no
arguments need to be switched around.
2011-06-21 15:43:14 +02:00
Eric Schulte 56de599c00 ob-python: Send RET after every line w/session evaluation
* lisp/ob-python.el (org-babel-python-evaluate-session): Send
  comint-send-input after every line when interacting with an
  interactive python process.
2011-06-20 19:18:59 -07:00
Nicolas Goaziou a0bc3bdebc org-list: fix update of check-boxes cookies in whole trees
* lisp/org-list.el (org-reset-checkbox-state-subtree): make the
  command more robust, and correctly update check-boxes in the whole
  sub-tree.
(org-update-checkbox-count): fix bug accumulating count of checkboxes
when walking a subtree.
(org-update-checkbox-count-maybe): add an optional argument passed to
org-update-checkbox-count.

Thanks to Paul Mead for the report.
2011-06-20 21:59:58 +02:00
Bastien Guerry 8608b6651d Fix doubled-word typo.
Thanks to Jim Meyering <jim@meyering.net> for this upstream fixes.
2011-06-20 15:38:24 +02:00
Ted Zlatanov b3aad7ffa8 Do not error out on fontification errors
* org.el (org-fontify-meta-lines-and-blocks): Ignore errors.

Signed-off-by: Julien Danjou <julien@danjou.info>
2011-06-20 11:23:44 +02:00
Eric Schulte adf16ffdd7 ob-emacs-lisp: respect the ":results scalar" header argument combination
* lisp/ob-emacs-lisp.el (org-babel-execute:emacs-lisp): Respect the
  ":results scalar" header argument combination.
2011-06-19 16:06:55 -07:00
Dan Davison 4f3a31dd97 Fix a bug in in-buffer src fontification
* lisp/org-src.el: Append a space character to copied text so that the
                   final text property change is picked up correctly
2011-06-17 16:51:29 -07:00
Eric Schulte f422849557 Merge branch 'master' of orgmode.org:org-mode 2011-06-17 16:41:55 -07:00
Eric Schulte e4204fc3fe tangle: ob-tangle now tangles only the current block when called with a prefix argument
* lisp/ob-tangle.el (org-babel-tangle-file): Use the new argument list
  to org-babel-tangle.
  (org-babel-tangle): Now when called with a prefix argument, only the
  current code block is tangled.
2011-06-17 16:41:50 -07:00
Nicolas Goaziou 432c53a474 org-list: add a way to configure transitional check-boxes export
* lisp/org-list.el (org-list-parse-list): replace transitional
check-boxes with "[CBTRANS]" string during parsing.
(org-list-to-generic): use the new property `:cbtrans' to configure
export string for transitional check-boxes.
2011-06-17 15:11:49 +02:00
Eric Schulte db1c3f6a3e Revert "replacing calls to now-defunct function `interactive-p'"
This reverts commit 4f084e1467.
2011-06-16 21:32:54 -07:00
Eric Schulte fa59060617 Revert "Globally replace buffer-substring-filters with filter-buffer-substring-functions."
This reverts commit 66e8a4b09a.
2011-06-16 10:29:24 -07:00
Carsten Dominik 12d51dad7b Use a new function to mark anniversaries in Org diary files
* lisp/org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Use stable internal `org-anniversary' instead of diary-anniversary.
(org-class): New function.
(org-diary-class): Use `org-class'.
(org-anniversary, org-cyclic, org-date, org-block): New functions.

This patch provides stable alternatives for a number of diary
functions to be used in diary sexp entries. The corresponding diary-*
functions swap around their input arguments depending on
`calendar-date-style', which is unstable and evil.  The functions
provided here have a fixed order of arguments, the ISO order: year
month day.

Also, the `i a' key in the agenda now uses `org-anniversary' instead of
diary-anniversary.
2011-06-16 14:34:07 +02:00
Eric Schulte 01ebf445aa ob: adding noweb-ref to the list of header argument names
* lisp/ob.el (org-babel-header-arg-names): Adding noweb-ref to the
  list of header argument names.
2011-06-15 21:49:55 -07:00
Eric Schulte 8c37281cb6 ob-tangle: continued code blocks now implemented with the :noweb-ref header arg
Now *all* code blocks which either are named `ref-name' or have the
  :noweb-ref header argument value `ref-name' will have their bodies
  concatenated when resolving the noweb reference <<ref-name>>.

* lisp/ob.el (org-babel-expand-noweb-references): Concatenating all
  bodies with the appropriate name or :noweb-ref header argument.
2011-06-15 21:14:03 -07:00
Eric Schulte 23e7adbdaa Revert "ob-tangle: initial implementation of named code block combination"
This reverts commit 0e4f9da82e.
2011-06-15 20:18:33 -07:00
Eric Schulte e001901234 revert "ob-tangle: more sophisticated block combination during tangling" 2011-06-15 20:18:22 -07:00
Eric Schulte 39cd07aacf Revert "ob-tangle: no longer inserting newlines between appended code blocks"
This reverts commit 90f6765cdf.
2011-06-15 20:14:31 -07:00
Carsten Dominik faccb8d58c Make S-up/down/left/right in indented clocktable BEGIN lines
* lisp/org.el (org-find-dblock):
(org-clocktable-try-shift): Make regexp work also when #+begin
line is indentex.

Achim Gratz writes:

It wasn't possible to use S-up/down/left/right on the clocktable BEGIN
line when the whole table was indented.  Interestingly enough calling
the function directly would work, it turned out to be a regexp in org.el
that was still pinned to bol.  There was a second one further down that
is used to recognize dynamic blocks that got the same treatment.

TINYCHANGE
2011-06-15 08:55:09 +02:00
Eric Schulte 978cdf276d Babel: code block may have empty bodies, now passing all tests
* lisp/ob.el (org-babel-src-block-regexp): Babel: code block may have
  empty bodies.
* testing/lisp/test-ob-tangle.el
  (ob-tangle/no-excessive-id-insertion-on-tangle): Updated the ID.
* testing/lisp/test-ob.el (test-org-babel/src-block-regexp): Cleaned
  up the test.
  (test-org-babel/default-header-args): Removed trivial test.
  (test-org-babel/get-header): Indentation.
  (test-org-babel/sha1-hash): Updated Hash for new sorting schema.
2011-06-14 13:41:32 -07:00
Eric Schulte c83cfcc243 trick the compiler
* lisp/org-macs.el (org-without-partial-completion): Avoid calling by
  name a function unknown to the compiler but explicitly checked by
  program logic.
2011-06-14 13:06:03 -07:00
Eric Schulte a034526448 more small compiler errors
* lisp/org-mouse.el (org-agenda-earlier): Declaring previously unknown
  function.
  (org-agenda-later): Declaring previously unknown function.
  (org-agenda-mode-map): Declaring previously unknown variable.
* lisp/org.el (org-read-date-analyze): Explicitly ignore the return
  value of a function.
2011-06-14 12:51:13 -07:00
Eric Schulte 66e8a4b09a Globally replace buffer-substring-filters with filter-buffer-substring-functions.
* lisp/org-agenda.el (org-agenda-mode): Globally replace
  buffer-substring-filters with filter-buffer-substring-functions.
* lisp/org-indent.el (org-indent-mode): Globally replace
  buffer-substring-filters with filter-buffer-substring-functions.
2011-06-14 12:45:19 -07:00
Eric Schulte 94b325839c Replacing '(λ...) with #'(λ...).
* lisp/org-ascii.el (org-export-as-ascii): Replacing '(λ...) with #'(λ...).
* lisp/org-attach.el: Replacing '(λ...) with #'(λ...).
  (org-attach-commit): Replacing '(λ...) with #'(λ...).
* lisp/org-exp.el: Replacing '(λ...) with #'(λ...).
  (org-export-handle-include-files): Replacing '(λ...) with #'(λ...).
* lisp/org-html.el: Replacing '(λ...) with #'(λ...).
  (org-export-as-html): Replacing '(λ...) with #'(λ...).
* lisp/org-mouse.el: Replacing '(λ...) with #'(λ...).
  (org-mouse-popup-global-menu): Replacing '(λ...) with
  (org-mode-hook): Replacing '(λ...) with #'(λ...).
  (org-agenda-mode-hook): Replacing '(λ...) with #'(λ...).
* #'(λ...).Replacing '(λ...) with #'(λ...).
  (org-mouse-context-menu): Replacing '(λ...) with #'(λ...).
* lisp/org-src.el: Replacing '(λ...) with #'(λ...).
  (org-src-mode-configure-edit-buffer): Replacing '(λ...) with #'(λ...).
* lisp/org-table.el: Replacing '(λ...) with #'(λ...).
  (org-table-fix-formulas-confirm): Replacing '(λ...) with #'(λ...).
* lisp/org.el: Replacing '(λ...) with #'(λ...).
  (org-confirm-shell-link-function): Replacing '(λ...) with
  (org-category): Replacing '(λ...) with #'(λ...).
* #'(λ...).Replacing '(λ...) with #'(λ...).
  (org-time-stamp-rounding-minutes): Replacing '(λ...) with #'(λ...).
2011-06-14 12:01:04 -07:00
Eric Schulte f8abb11eff Declaring functions used by `org-open-file'
* lisp/org.el (mailcap-parse-mailcaps): Declaring functions used by
  `org-open-file'.
  (mailcap-extension-to-mime): Declaring functions used by
  `org-open-file'.
  (mailcap-mime-info): Declaring functions used by `org-open-file'.
2011-06-14 11:58:00 -07:00
Eric Schulte 4f084e1467 replacing calls to now-defunct function `interactive-p'
* lisp/org-agenda.el (org-agenda-redo): Replacing call to now-defunct
  function `interactive-p'.
  (org-agenda-show-1): Replacing call to now-defunct function
  `interactive-p'.
  (org-agenda-set-tags): Replacing call to now-defunct function `interactive-p'.
* lisp/org-ascii.el: Replacing call to now-defunct function
  `interactive-p'.
  (org-export-as-latin1): Replacing call to now-defunct function
  `interactive-p'.
  (org-export-as-latin1-to-buffer): Replacing call to now-defunct
  function `interactive-p'.
  (org-export-as-utf8): Replacing call to now-defunct function
  `interactive-p'.
  (org-export-as-utf8-to-buffer): Replacing call to now-defunct function
  `interactive-p'.
  (org-export-region-as-ascii): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function `interactive-p'.
* lisp/org-docbook.el: Replacing call to now-defunct function
  `interactive-p'.
  (org-export-region-as-docbook): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function `interactive-p'.
* lisp/org-html.el: Replacing call to now-defunct function
  `interactive-p'.
  (org-export-region-as-html): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function `interactive-p'.
* lisp/org-latex.el: Replacing call to now-defunct function
  `interactive-p'.
  (org-export-region-as-latex): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function `interactive-p'.
* lisp/org-macs.el: Replacing call to now-defunct function
  `interactive-p'.
  (org-called-interactively-p): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function `interactive-p'.
* lisp/org-table.el: Replacing call to now-defunct function
  `interactive-p'.
  (org-table-blank-field): Replacing call to now-defunct function
  `interactive-p'.
  (org-table-current-column): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function
  `interactive-p'.
  (org-table-current-dline): Replacing call to now-defunct function
  `interactive-p'.Replacing call to now-defunct function
  `interactive-p'.
  (org-table-sort-lines): Replacing call to now-defunct function
  `interactive-p'.
  (org-table-sum): Replacing call to now-defunct function
  `interactive-p'.
  (org-table-rotate-recalc-marks): Replacing call to now-defunct
  function `interactive-p'.
  (org-table-eval-formula): Replacing call to now-defunct function
  `interactive-p'.
  (orgtbl-send-table): Replacing call to now-defunct function `interactive-p'.
* lisp/org.el: Replacing call to now-defunct function `interactive-p'.
  (org-mode): Replacing call to now-defunct function `interactive-p'.
  (org-copy-subtree): Replacing call to now-defunct function
  `interactive-p'.
  (org-paste-subtree): Replacing call to now-defunct function
  `interactive-p'.
  (org-store-link): Replacing call to now-defunct function
  `interactive-p'.
  (org-todo): Replacing call to now-defunct function `interactive-p'.
  (org-occur): Replacing call to now-defunct function `interactive-p'.
2011-06-14 11:37:59 -07:00
Eric Schulte 95f9aa5ff5 fixing compiler warnings for Babel functions
* lisp/ob-R.el (ess-local-process-name): This variable wasn't known to
  be defined.
* lisp/ob-lisp.el (org-babel-lisp-dir-fmt): This defcustom now has a
  group specified.
* lisp/ob-tangle.el (org-bracket-link-regexp): This variable wasn't
  known to be defined.
  (org-babel-tangle-combine-named-blocks): Roll my own version of a
  forbidden common lisp function.
* lisp/ob.el (org-babel-sha1-hash): Using a non-deprecated version of
  called-interactively.
2011-06-14 11:23:56 -07:00
Eric Schulte 2601678dc0 replacing the "multicolumn" option for latex tables
This brings the behavior inline with the documentation.

* lisp/org-latex.el (org-export-latex-tables): Check for the
  "multiline" option and set the `floatp' option to true when
  multicolumn tables are requested.
2011-06-14 09:28:38 -07:00
Carsten Dominik 9108d3f0ee Merge branch 'master' of orgmode.org:org-mode 2011-06-14 14:56:07 +02:00
Carsten Dominik 1891ee5aaf Fix HTML export to make CUSTOM_ID links work again
* lisp/org-html.el (org-export-as-html):
(org-html-level-start): Only convert section number underscores to dashes.
2011-06-14 10:46:09 +02:00
Carsten Dominik 36dd7e2150 Fix bulk scattering command
* lisp/org-agenda.el (org-agenda-bulk-action): Fix bug caused by
`days-to-time, converting relative to 1 BC, while the code assumed it
would return a time relative to 1970.

For more information, see

http://thread.gmane.org/gmane.emacs.orgmode/42531
2011-06-14 10:39:58 +02:00
Eric Schulte 90f6765cdf ob-tangle: no longer inserting newlines between appended code blocks
* lisp/ob-tangle.el (org-babel-tangle-combine-named-blocks): No longer
  inserting newlines between appended code blocks.
2011-06-13 14:58:56 -07:00
Eric Schulte f1c0042967 removing two currently unused export variables
* lisp/ob-exp.el: We may no longer need to export names along with
  code blocks.
2011-06-13 14:58:19 -07:00
Eric Schulte f089a9e914 Merge branch 'master' of orgmode.org:org-mode 2011-06-13 14:06:09 -07:00
Eric Schulte 5d7e0b79c9 org-exp-blocks: Ensure balanced nested begin/end blocks in block bodies.
* lisp/org-exp-blocks.el (org-export-blocks-preprocess): Ensure
  balanced nested begin/end blocks in block bodies.
2011-06-13 14:05:59 -07:00
Dan Davison 3ed5915f01 Automatically use pdflatex -shell-escape for minted export
Patch by Bastien

* lisp/org-latex.el: Add -shell-escape to pdflatex commands
2011-06-11 13:40:14 -07:00
Eric Schulte 64c1304473 ob-tangle: more sophisticated block combination during tangling
Thanks to Neeum Zawan for suggesting this behavior

* lisp/ob-tangle.el (org-babel-tangle-named-block-combination): Block
  combination can now take a number of values.
  (org-babel-tangle-combine-named-blocks): More sophisticated block
  combination behavior.
2011-06-10 12:55:13 -06:00
Eric Schulte 0e4f9da82e ob-tangle: initial implementation of named code block combination
* lisp/ob-tangle.el (org-babel-tangle-do-combine-named-blocks):
  Switch to turn on the combination of code blocks of the same name.
  (org-babel-tangle-combine-named-blocks): Combine blocks of the same
  name.
2011-06-10 12:29:10 -06:00
Eric Schulte 3f90f26336 ob-ruby: xmpfilter result type for outputting annotated source code
Thanks to Avdi Grimm for suggesting this addition

* lisp/ob-ruby.el (xmp): Declaring this function to appease the
  compiler.
  (org-babel-execute:ruby): "xmp" result option for outputting
  annotated source code.
2011-06-10 10:49:04 -06:00
Nicolas Goaziou 889a487ae4 org-list: fix item's start number in LaTeX exporter
* lisp/org-list.el (org-list-to-latex): the enumerate environment in
latex increments the counter before using it. Therefore, org-mode
should set the enumeration counter to the desired value minus one.

Patch from Darlan Cavalcante Moreira
TINYCHANGE
2011-06-10 15:50:51 +02:00
Niels Giesen 1de29a0059 Fix reported file time for clock reports
Fix the format specification for clock tables.

Niels writes:

Bernt was right in that there were more arguments to format than the
format string specified. I guess I must not have noticed that there was
a call to format (all the other times properties columns are 'maybe
inserted' go directly to `insert-before-markers'), and I must have
forgotten to test the multifile case (I never used multifile clock
reports myself).

However, to keep the layout of the table consistent the *File time*
cells should be in the Headline column. Attached patch fixes this by
putting the (empty) properties cells *before* the *File time* cell.
2011-06-10 13:56:02 +02:00
Michael Brand 374b70a383 Bugfix for heading levels when toggling from list
* org.el (org-toggle-heading): More comments and fix number of stars
when toggling from list items.

TINYCHANGE
2011-06-09 21:11:20 +02:00
Christian Egli e6f90729a0 Taskjuggler: support the new effort durations
* lisp/org-taskjuggler.el (org-taskjuggler-clean-effort): handle any
effort that is accepted by `org-duration-string-to-minutes´.
* doc/org.texi (TaskJuggler export): Modified the example to reflect
the new effort durations.

The Effort property previously had no unit attached. With release 7.5
of orgmode you can now attach units to it such as 4h, 2d or 2m. This
patch enhances the exporter to accept the same effort specifications.

Note: This change is NOT BACKWARDS COMPATIBLE. Where the exporter
previously assumed a plain number was meant to be days, it now assumes
it to mean minutes. You will have to change existing effort
specifications from e.g. '2' to '2d'. A simple M-x
query-replace-regexp should do.
2011-06-08 17:03:23 +02:00
Nicolas Goaziou 51946c36d7 Keep byte-compiler happy 2011-06-06 20:46:31 +02:00
Julien Barnier c227da352a Fix sh block execution in session
Hi,

When evaluating shell code blocks in org-babel, the execution seems to hang
indefinitely. The following patch is trying to fix this problem by modifying
the way shell code is send to comint and the way the end-of-evaluation
indicator is looking for.

As I am far from an emacs lisp expert and as the patch modifies the widely use
org-babel-comint-with-output function, it certainly needs some testing. I've
made some tests with shell and R code blocks, but I'm not sure it's enough.

Thanks !

Julien

Fix sh block execution in a session

* lisp/ob-sh.el (org-babel-sh-evaluate) : when sending input to comint, wait
until previous line execution is finished
* lisp/ob-comint.el (org-babel-comint-with-output) : when looking for
end-of-evaluation indicator, search forward for the indicator before searching
forward for the prompt
2011-06-06 07:17:18 -06:00
Carsten Dominik 648affcbd4 Fix HTML entity for degree
* lisp/org-entities.el (org-entities): Fix HTML entity for degree.

Patch by Ult Stegemann.
2011-06-06 09:24:21 +02:00
Nicolas Goaziou ddeab1a8af Changes automatically made to cookies shouldn't move tags
* lisp/org.el (org-auto-align-tags): change docstring.
(org-update-parent-todo-statistics): keep tags aligned even when
statistics cookies are shifting them.
* lisp/org-list.el (org-update-checkbox-count): keep tags aligned even
when statistics cookies are shifting them.
2011-06-05 18:55:25 +02:00
Lawrence Mitchell cfb05268f4 lisp/ob.el: Don't modify babel info when hashing it
* lisp/ob.el (org-babel-sha1-hash): Don't modify info argument by
side-effect when sorting result-params list.

copy-sequence only does shallow copies, so if we're going to modify a
sub-list, we need to make sure we copy it first.
2011-06-03 07:04:02 -06:00
Lawrence Mitchell 3f61432898 lisp/ob.el: Fix org-babel-result-regexp to match users
* lisp/ob.el (org-babel-result-regexp): Use non-shy group around
org-babel-data-names.

By default regexp-opt returns a shy group around its arguments.  But
users of org-babel-result-regexp expect the third match-string to
contain the hash.  With a shy group, the second match-string contains
the hash.
2011-06-02 12:07:21 -06:00
Carsten Dominik cf708c72e5 Merge branch 'master' of orgmode.org:org-mode 2011-06-02 19:48:57 +02:00
Carsten Dominik 0db8830733 Fix issue with truncate-lines and visual-line-mode
* lisp/org.el (org-insert-link): Set truncate-line in the *Org Link* buffer
and make sure that it really is set there.

See http://thread.gmane.org/gmane.emacs.orgmode/42447
2011-06-02 19:48:36 +02:00
Eric Schulte fbfc2d1835 ob-lisp: more general handling of the default-directory value in lisp code
Once again, thanks to Mark Cox for raising these issues.

* lisp/ob-lisp.el (org-babel-lisp-dir-fmt): Defcustom for use in
  changing how/if the current directory is represented to lisp code.
  (org-babel-execute:lisp): More general handling of the default
  directory value.
2011-06-01 18:52:33 -06:00
Eric Schulte af677f6d06 Merge branch 'master' of orgmode.org:org-mode 2011-06-01 06:46:50 -06:00
Eric Schulte 459cbd4fd8 ob-lisp: setting *default-pathname-defaults* to the directory of the Org-mode file
Thanks to Mark Cox for suggesting this change.

* lisp/ob-lisp.el (org-babel-execute:lisp): Setting the value of
  *default-pathname-defaults* to either the value of the :dir header
  argument or the directory of the containing Org-mode file.
2011-06-01 06:41:08 -06:00
Eric Schulte cbd4a5b764 ob-lisp: re-arrange order of function nesting in lisp execution function
* lisp/ob-lisp.el (org-babel-execute:lisp): No real functional change,
  just aesthetic.
2011-06-01 06:32:10 -06:00
Carsten Dominik 32ac8dd0e5 More fixes to priority setting.
Patch by Michael Brand
2011-06-01 14:25:03 +02:00
Sébastien Delafond 1afcef3007 Do not run flyspell-checks on {todo,all-time,additional-option-like}-keywords
* org.el (org-mode-flyspell-verify): This is useful when using
  flyspell with a non-English dictionary, or if some of your
  keywords are in another language.

Signed-off-by: Julien Danjou <julien@danjou.info>
2011-06-01 13:51:31 +02:00
Carsten Dominik e05aa5552d Merge branch 'master' of orgmode.org:org-mode 2011-06-01 09:09:26 +02:00
David Maus e47fcaae35 Provide compatibility function for `activate-mark'
* org-exp.el (org-export): Use new compatibility function
  `org-activate-mark'.
* org-compat.el (org-activate-mark): New function. Provide
  `activate-mark' if not present (e.g. Emacs22).

Emacs 22 misses this function. Defun copied from Emac23's
`active-mark' but removed reference to customization variable
`select-active-regions' which is not present in Emacs22.
2011-06-01 09:05:24 +02:00
David Maus 48d970a916 Declare variable to keep byte compiler happy
* org-table.el (org-table-follow-field-mode): Declare variable to keep
  byte compiler happy.
2011-06-01 08:41:20 +02:00
David Maus da93c5d3f1 Declare function, silence byte compiler
* org-footnote.el (org-id-uuid): Declare function, silence byte
  compiler.
2011-06-01 08:30:52 +02:00
David Maus e144f53c9a Don't use equalp at run-time, compare downcased strings
* org-bibtex.el (org-bibtex-headline): Don't use equalp at run-time,
compare downcased strings.

Compiler complains about using `equalp' because other than for example
`concatenate' it is not declared 'inline.

Cf. [[info:cl#Declarations]] about the 'inline declaration

...
`inline'
     The `inline' DECL-SPEC lists one or more functions whose bodies
     should be expanded "in-line" into calling functions whenever the
     compiler is able to arrange for it.  For example, the Common Lisp
     function `cadr' is declared `inline' by this package so that the
     form `(cadr X)' will expand directly into `(car (cdr X))' when it
     is called in user functions, for a savings of one (relatively
     expensive) function call.

     The following declarations are all equivalent.  Note that the
     `defsubst' form is a convenient way to define a function and
     declare it inline all at once.

          (declaim (inline foo bar))
          (eval-when (compile load eval) (proclaim '(inline foo bar)))
          (defsubst foo (...) ...)       ; instead of defun

     *Please note:*  this declaration remains in effect after the
     containing source file is done.  It is correct to use it to
     request that a function you have defined should be inlined, but it
     is impolite to use it to request inlining of an external function.

     In Common Lisp, it is possible to use `(declare (inline ...))'
     before a particular call to a function to cause just that call to
     be inlined; the current byte compilers provide no way to implement
     this, so `(declare (inline ...))' is currently ignored by this
     package.
...

Thus other than `concatenate' `equalp' is stored as a function call at
run-time.
2011-06-01 08:30:52 +02:00
David Maus 9da7485a7b Declare variable to silence byte compiler
* org-bibtex.el (org-id-locations): Declare variable to silence byte
  compiler.
2011-06-01 08:30:52 +02:00
David Maus e33ba24640 Remove reference to non-existent configuration option
* org-id.el (org-id-locations): Fix docstring, remove reference to
  non-existent option.

The configuration option `org-id-use-hash' does not exist. Git bisect
and grepping for 'org-id-use-hash' showed that this string never ever
occured more than once, hence it was never there..
2011-06-01 08:30:52 +02:00
David Maus 00040e708c Use `delete-char' instead of `delete-backward-char'
* org.el (org-self-insert-command): Use `delete-char' instead of
  `delete-backward-char'.
* org-table.el (orgtbl-self-insert-command): Dto.

According to the doc string `delete-backward-char' "is meant for
interactive use only; from Lisp, better use `delete-char' with a
negated argument."
2011-06-01 08:30:20 +02:00
Carsten Dominik b637e261c4 Save match data when checking for table.el table
* lisp/org-latex.el (org-export-latex-special-chars): Save match data
when checking for table.el table.
2011-06-01 08:30:01 +02:00
David Maus f4f20ad5c8 Move defsubst `org-re-property' before its first use
* org.el (org-re-property): Move before its first use.
2011-06-01 06:47:03 +02:00
Eric Schulte 8d9f7c4208 Merge branch 'master' of orgmode.org:org-mode 2011-05-31 19:09:49 -06:00
Nicolas Goaziou 24221723a3 org-latex: ensure footnote contents cannot end a list
* lisp/org-latex.el (org-export-latex-preprocess): add
  `original-indentation' property to footnotes so they cannot possibly
  end a list by being less indented than the item they belong to.
2011-05-31 19:06:02 +02:00
Eric Schulte fa31c082d3 ob-lisp: moved `progn' wrapper out of `org-babel-expand-body:lisp'
Thanks to Mark Cox for suggesting this patch

* lisp/ob-lisp.el (org-babel-expand-body:lisp): No longer wraps
  biddies in `progn'.
  (org-babel-execute:lisp): Wraps bodies in `progn' as they are passed
  to swank.
2011-05-31 09:55:10 -06:00
Carsten Dominik 7c6323ef09 Add param :properties to list properties in clocktable
* doc/org.texi (The clock table): Document the :properties and :inherit-props
arguments for the clocktable.
* lisp/org-clock.el (org-clocktable-write-default): Implement adding property
columns to the clock table.

Patch by Niels Giesen.
2011-05-31 14:20:14 +02:00
Carsten Dominik 1beda3d3c8 Fix typo in code
* lisp/org.el (org-toggle-item): Move parenthesis to correct location.
2011-05-31 13:46:30 +02:00
Carsten Dominik 257ce858e7 Improve documentation and error handling with priorities
* lisp/org.el (org-default-priority):
(org-priority-start-cycle-with-default): Improve docstring.
(org-priority): Throw error when priority is out of range.

Patch by Michael Brand.
2011-05-31 13:37:04 +02:00