1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-02 08:22:16 +00:00
Commit Graph

7850 Commits

Author SHA1 Message Date
Eric Schulte
03aa327d79 sh: allow passing references through STDIN of a shell script
* lisp/ob-sh.el (ob-ref): Uses ob-ref to resolve the value of the
  :stdin header argument.
  (org-babel-execute:sh): Use the :stdin header argument.
  (org-babel-sh-var-to-sh): Split the bulk of this function off into a
  new sub-function.
  (org-babel-sh-var-to-string): New function for converting elisp
  values to strings that make sense for parsing with sh.
  (org-babel-sh-evaluate): Adding "stdin" option to session and
  external evaluation options.
2011-05-25 09:52:08 -06:00
Paul Sexton
bd91803d0d Merge branch 'master' of orgmode.org:org-mode 2011-05-25 20:04:12 +12:00
Paul Sexton
69ba863ca0 org-drill.el: corrected errors in file (due to problematic merge) 2011-05-25 20:01:51 +12:00
Roland Kaufmann
33bae13aeb Fix markup problems when using references in source fragments
* lisp/org-exp.el (org-remove-formatting-on-newlines-in-region): New function.
(org-export-format-source-code-or-example): Call
`org-remove-formatting-on-newlines-in-region'.

TINYCHANGE
2011-05-25 09:39:47 +02:00
Paul Sexton
34fa86edf5 Merge branch 'master' of orgmode.org:org-mode 2011-05-25 11:46:09 +12:00
Paul Sexton
9938a6aa93 org-drill.el: fixed handling of cloze text in items with [[bracketed links]]
org-drill.el: fontification of cloze itext now works when first org
file is loaded.
org-drill:el: new cards - hidefirst, hidelast
2011-05-25 11:43:29 +12:00
David Maus
b6384bbcbe Prevent adding of extra space to value if property already exists
* org.el (org-entry-put): Prevent adding of extra space to value if
  property already exists.

Fixes a regression reported by Wujun Zhou.
2011-05-24 20:55:35 +02:00
Marcel van der Boom
7c4360823a Allow inactive timestamps in org-expiry
* contrib/lisp/org-expiry.el (org-expiry-inactive-timestamps): New option.
(org-expiry-insert-created):
(org-expiry-insert-expiry): Honor `org-expiry-inactive-timestamps'.

Attached is a patch to org-expiry.el in contrib/lisp to allow a
customization of the timestamps inserted by org-expiry for 'CREATED'
and 'EXPIRED' properties.

This patch is what is attached to the message displayed at [1]. I have
been using this patch for a while and it works fine. From searching it
looks like this patch was 'forgotten', but I may have overlooked
something.

If the patch was rejected, you can ignore me. If it was forgotten I'd
like to request to include it.

Thx,
marcel
2011-05-24 15:18:25 +02:00
Jambunathan K
fa12fe82e9 org-html.el: Fix export of table.el tables.
* lisp/org-html.el (org-export-as-html): Don't expand non-data
lines of table.el tables.
(org-html-expand): Removed the (buggy) test for non-data lines
in table.el tables. The test is now done as part of
org-export-as-html.
(org-format-table-table-html-using-table-generate-source):
Added test for spanning of cells in table.el tables using
table.el's own library routine. Optionlly Suppress export of
simple table.el tables.
(org-format-table-html): Removed the (buggy) test for spanned
table.el tables. The test is now done as part of
org-format-table-table-html-using-table-generate-source.
2011-05-24 15:05:59 +02:00
Carsten Dominik
4f27391197 Turn of LaTeX preprocessing for table.el tables
* lisp/org-latex.el (org-export-latex-special-chars): Do nothing in
table.el tables.

Table.el does its own protection of special characters.
2011-05-24 14:02:43 +02:00
Carsten Dominik
af7aefe945 * lisp/org-capture.el (org-capture): Ignore errors when creating a link.
Patch by Tassilo Horn.
2011-05-24 13:39:56 +02:00
Nick Dokos
438536f615 Change underscores to hyphens in section labels
* lisp/org-exp.el (org-export-define-heading-targets): Use dash instead
of underscore to make labels valid.

Currently, the section number (a string of the form "X.Y.Z") is used
to manufacture a section label of the form sec-X_Y_Z. Underscores are
overloaded however, both in org and in LaTeX, and cause conflicts with
some packages.  This patch changes underscores to hyphens in section
labels.

TINYCHANGE
2011-05-24 13:12:16 +02:00
Carsten Dominik
b91cbd95e7 Fix wanderlust interface for org-contact.el
Patches by Michael Markert.
2011-05-24 12:49:52 +02:00
Christophe Rhodes
3e4477249c Add "References" header in org-exp-bibtex
* contrib/lisp/org-exp-bibtex.el (org-export-bibtex-preprocess): include
hard-coded "<h2>References</h2>" in #+BEGIN_HTML block

I might be missing something, but while in LaTeX export org-exp-bibtex
produces a References header, in HTML export there's nothing -- which
looks a bit odd, particularly in documents with footnotes.  Attached is
a patch which simply includes an appropriate header.
Cheers,

Christophe
TINYCHANGE
2011-05-24 05:36:05 +02:00
Eric S Fraga
202d8f7bf2 Use format string for message
TINYCHANGE
2011-05-24 05:30:46 +02:00
Michael Markert
b29a9def65 Add docstring for `wl-get-from-header-content'.
TINYCHANGE
2011-05-24 05:20:30 +02:00
Michael Brand
cf0c163ea6 Small documentation fix
TINYCHANGE
2011-05-24 05:14:22 +02:00
Dan Davison
cec8711a44 Avoid race condition in ob-R code responsible for writing result to disk
Slight modification of patch by Christophe Rhodes

* lisp/ob-R.el (org-babel-R-write-object-command): Ensure that all
  data is written to the results file before Emacs notices that the file
  exists.
2011-05-20 13:30:45 -07:00
Paul Sexton
7af369da69 contrib/org-drill.el -- updated to version 2.3.2
contrib/org-drill.el -- added to choices for 'org-modules' variable
2011-05-21 00:13:35 +12:00
Eric Schulte
120e621443 remove when-let which isn't a real Emacs macro
* lisp/ob-exp.el (org-babel-exp-code): Remove usage of a macro which
  is defined locally on my system, but not globally in Emacs.
2011-05-19 11:05:41 -06:00
Eric Schulte
72c154e38e expand noweb refs when ":noweb yes" during export
* lisp/ob-exp.el (org-babel-exp-do-export): Use `org-babel-exp-code'
  to generate code block output.
  (org-babel-exp-code): Re-create the code block body for exporting
  source code.
2011-05-19 07:37:33 -06:00
Carsten Dominik
2a8fbc4b46 Bury calendar buffer
* lisp/org.el (org-read-date): Bury Calendar buffer after
using it for selecting a date.

Patch by Ben North

TINYCHANGE
2011-05-16 08:36:56 +02:00
Nicolas Goaziou
2500c6b1c8 org-list: fix heuristics for number of lines to insert with a new item
* lisp/org-list.el (org-list-separating-blank-lines-number): fix
  confusion between point and item beginning. Now, if no information
  is avalaible, truly follow user preference when it inserts blank
  lines manually.
  (org-list-insert-item): send correct argument to the preceding
  function.
2011-05-15 22:38:56 +02:00
Eric Schulte
2da0ba6024 ob: keep \n inside of the code block body
* lisp/ob.el (org-babel-src-block-regexp): Keep the now-mandatory
  newline inside of the code block body.
2011-05-14 08:12:23 -06:00
Sean O'Halpin
12faa69330 * lisp/ob.el: Avoid spurious matches to literal
"#+end_src" inside a source block.

Added newline to org-babel-src-block-regexp.
2011-05-14 08:11:07 -06:00
Nicolas Goaziou
3dfcaf013a Don't indent #+include lines
* lisp/org.el (org-indent-line-function): don't include #+include lines.
2011-05-14 14:32:32 +02:00
Eric Schulte
a2f29de861 Merge branch 'master' of orgmode.org:org-mode 2011-05-13 10:54:49 -06:00
Eric Schulte
7d12d45778 ob: new function to check header arguments for errors C-c C-v c
* doc/orgcard.tex: Adding line for org-babel-check-src-block.
* lisp/ob-keys.el (org-babel-key-bindings): Adding key sequence for
  org-babel-check-src-block.
* lisp/ob.el (org-babel-expand-src-block): Fit within 80 cols.
  (org-babel-edit-distance): Returns the edit distance of two strings.
  (org-babel-check-src-block): Check a code block for errors.
2011-05-13 10:54:44 -06:00
Carsten Dominik
1b262c9fc0 Fix bug in capture customization setup.
* lisp/org-capture.el (org-capture-templates): Fix bug in customization setup.

Patch by Giovanni Ridolfi

TINYCHANGE
2011-05-13 14:49:27 +02:00
Paul Sexton
ab075bb452 Merge branch 'master' of orgmode.org:org-mode 2011-05-13 22:45:26 +12:00
Paul Sexton
df1a730e25 Org-drill.el: new variable, org-drill-scope -- allows per-file customisation of sources for drill items. Minor changes to org-drill's "scope" argument.
Signed-off-by: Paul Sexton <psexton@xnet.co.nz>
2011-05-13 22:44:18 +12:00
Carsten Dominik
d6aba4db77 Fix braces bug in manual. 2011-05-11 12:33:41 +02:00
Manuel Giraud
d90f1c29b4 Document Sitemap sans extension
* doc/org.texi (Sitemap): Document `:sitemap-sans-extension' property.
2011-05-11 10:18:59 +02:00
Carsten Dominik
bffdfeb7fc Implement a minor mode for the editor following the cursor through the table
* doc/org.texi (Built-in table editor): Document the table field follow mode.
* lisp/org-table.el (org-table-exit-follow-field-mode-when-leaving-table):
New option.
(org-table-check-inside-data-field): New optional argument `noerror'.
When set, the function will only return nil instead of throwing an
error.
(org-table-edit-field): Interpret double prefix argument, and improve
the properties of the editing window.
(org-table-follow-field-mode): New minor mode.
(org-table-follow-fields-with-editor): New function.

The main purpose of this functionality is to make working with table
with long fields simpler, by always showing the full content of the
current field.  This functionality is based on the following
mailing list thread

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

and contains ideas by Jonny, Juan Pechiar, and Michael Brand.
2011-05-11 10:11:45 +02:00
Carsten Dominik
f73f0f6323 Merge branch 'master' of orgmode.org:org-mode 2011-05-11 10:10:47 +02:00
Carsten Dominik
af730fec0a Get rid of some compiler warnings 2011-05-11 10:10:24 +02:00
Paul Sexton
62d4dd68de Tiny bugfix to org-drill.el
Signed-off-by: Paul Sexton <psexton@xnet.co.nz>
2011-05-11 17:57:13 +12:00
Paul Sexton
49c2ae20c5 Updated org-drill to latest version (2.3).
Signed-off-by: Paul Sexton <psexton@xnet.co.nz>
2011-05-11 17:44:41 +12:00
Jason Dunsmore
c735d62f07 Fixed typo in org-mobile-index-file docstring. 2011-05-10 10:07:35 -05:00
Carsten Dominik
9dba548cd5 Agenda Views: Call `org-agenda-skip' first.
* lisp/org-agenda.el (org-agenda-get-todos): Call `org-agenda-skip' first,
then check if timestamps cause exclusion.
* lisp/org.el (org-scan-tags):  Call `org-agenda-skip' first,
then check if timestamps cause exclusion.

For more information, see the following mailing list thread:

http://thread.gmane.org/gmane.emacs.orgmode/41052/focus=41052
2011-05-10 08:58:04 +02:00
Thomas S. Dye
cd05598dcd Optional \caption argument for LaTeX export
Aloha all,

The attached patch initializes the existing variable shortn, adds it to
two caption situations in addition to the one already coded, and adds
some description to the manual.

With this patch, #+CAPTION: [Short caption]{Long caption.} in the
Org-mode source exports to \caption[Short caption]{Long caption.} in the
LaTeX export, which is, I think, as it should be.

Many thanks to Nick Dokos who made me understand why earlier patches
hadn't shown up on the patchwork server (wrong mime type, evil mail
client).  This one sent with gnus and fingers crossed.

All the best,
Tom

>From 9dc65f7e598dd171ebce9448cd39c4062f7cafff Mon Sep 17 00:00:00 2001
From: Tom Dye <tsd@tsdye.com>
Date: Sun, 8 May 2011 06:56:25 -1000
Subject: [PATCH] optional caption arguments in LaTeX export
2011-05-08 22:15:45 +02:00
Nicolas Goaziou
946640d84d org-list: correctly identify description lists
* lisp/org-list.el (org-list-full-item-re): allow description term to
  have a newline character after the colons.
2011-05-07 02:33:13 +02:00
Nicolas Goaziou
073ab7de83 org-list: check with-case argument when sorting a list alphabetically
* lisp/org-list.el (org-sort-list): no longer ignore with-case
  argument: the function sorted case-sensitively, regardless of
  argument.
2011-05-07 02:17:19 +02:00
Eric Schulte
e80305e77e Merge branch 'master' of orgmode.org:org-mode 2011-05-06 14:47:31 -06:00
Eric Schulte
ec293ae62b configurable names for inline data labels
* lisp/ob-ref.el (org-babel-ref-resolve): Using the new result regexp.
* lisp/ob.el (org-babel-data-names): Configurable list of names of data.
  (org-babel-result-regexp): Using new results regexp.
2011-05-06 14:45:38 -06:00
Carsten Dominik
eb2a890f10 Minor fix in manual 2011-05-06 17:34:51 +02:00
Carsten Dominik
e8151c382c Add CLOCKSUM to special properties, to make org-invoice.el work again
* lisp/org.el (org-special-properties): Add CLOCKSUM to the special properties.
2011-05-06 17:20:40 +02:00
Robert P. Goldman
a173acf275 Don't prompt for bad links during babel export
* lisp/ob-exp.el (org-babel-exp-in-export-file): Bind
  `org-link-search-inhibit-query' to t to inhibit prompts.
2011-05-05 19:53:20 -06:00
Tom Dye
b45bef8ffa Refer to language specific Babel header arguments 2011-05-05 14:53:20 -06:00
Julien Danjou
e73c231250 Merge org-contacts-wl in org-contacts
* org-contacts.el: Merge org-contacts-wl.el

Signed-off-by: Julien Danjou <julien@danjou.info>
2011-05-05 14:56:02 +02:00