Commit Graph

6144 Commits

Author SHA1 Message Date
David Maus b32d2f737d org-exp: Add japanese translation
* org-exp.el (org-export-language-setup): Add japanese translation.

Translation by Hideki SAITO
<CAAaRP5umR8kDfZoZw6y2XJgyL70YdiJqLtpBvX++0ff+mU=fhA@mail.gmail.com>,
converted to numeric character entities.

TINYCHANGE
2012-03-18 19:55:01 +01:00
David Maus dab84afa75 Numeric character entities for proper rendering of non-UTF8 documents
* org-exp.el (org-export-language-setup): Use numeric character
entities for proper rendering of non-UTF8 documents.
2012-03-18 19:39:18 +01:00
tumashu b2913c9227 org-exp: Add simplified chinese translation
* org-exp.el (org-export-language-setup): Add simplified
chinese translation.

TINYCHANGE
2012-03-18 18:55:41 +01:00
David Maus 05847efd4a Merge branch 'maint' 2012-03-18 18:45:43 +01:00
David Maus e0072f7913 Require one or more spaces (+) between keyword and headline
* org.el (org-scan-tags): Require one or more spaces (+) between
keyword and headline.

Otherwise the re will match a line like:

* TODO@ Foobar

And assumes the @ to be part of the headline.

This fixes a glitch reported by Simon Thum in
<4F53DEF7.8080604@gmx.de>.

> Hi all,
>
> I have found some irritating behaviour, potentially a bug. I have a
> block agenda which goes like:
>
> tags-todo "@home&TODO=\"TODO\"
>
> and it displays a certain org line that reads
>
> **** TODO_ state triggers
>
> Which is just a heading for dealing with TODO state triggers, and I
> appended the _ as I don't want it to be a TODO.
>
> For example, the global TODO list and syntax highlighting does not
> consider it a todo, but C-c a m TODO="TODO" does. TODO="T" does not,
> so it's not very grave.
>
> Most likely, it's simply an inconsistency arising from not having a
> real parser. I just wanted to report it here so it may get fixed.
2012-03-18 18:38:50 +01:00
David Maus cd2d138883 Don't reset `org-done-keywords-for-agenda' when org-agenda-multi
* org-agenda.el (org-prepare-agenda): Don't reset
`org-done-keywords-for-agenda' when org-agenda-multi.

Fixes a bug with DONE keywords in org-todo face reported by Hans-Peter
Deifel in <87r4xwypxh.fsf@hpdeifel.de>.
2012-03-18 17:58:12 +01:00
Bastien Guerry 73cbeabe1b Merge branch 'maint' 2012-03-18 12:12:09 +01:00
Bastien Guerry cdd9e2b91a Remove "Version" tag in org-eshell.el 2012-03-17 16:43:48 +01:00
Bastien Guerry 095e578676 Update to 7.8.05 2012-03-17 16:43:26 +01:00
Bastien Guerry 54ead894de Remove "Version" tag in ob-fortran.el and org-eshell.el. 2012-03-17 16:42:25 +01:00
Bastien Guerry 218e8e444a Update version 7.8.05 2012-03-17 16:41:44 +01:00
Bastien Guerry 560624fcc7 Set version 7.8.04 in maint. 2012-03-17 16:32:53 +01:00
Bastien Guerry 6e306f65ff Fix copyright years in maint. 2012-03-17 16:31:04 +01:00
Bastien Guerry de42649f7b Manually revert maint to e85080.
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
Bastien Guerry b0e24a2b5e org-exp.el: Add russian translation.
TINYCHANGE

Thanks to Vladimir Lomov for this change.
2012-03-17 16:03:27 +01:00
Bastien Guerry f2acf329cb Don's use "Version" elsewhere than in org.el 2012-03-17 15:56:30 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry b058173c6c Don't use the "Version:" tag elsewhere than in org.el
This commit prepares the maint>master merge, which otherwise
results in merge conflicts.
2012-03-17 14:43:21 +01:00
Bastien Guerry 38c5045725 Fix copyright years. 2012-03-17 14:36:25 +01:00
Bastien Guerry 6e534f9c61 Manually revert back to commit e85080.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
2012-03-17 14:34:01 +01:00
Bastien Guerry d254b05500 Revert "Release 7.8.04"
This reverts commit 78ec8e21b8.
2012-03-17 14:24:27 +01:00
Bastien Guerry 78ec8e21b8 Release 7.8.04 2012-03-16 19:04:04 +00:00
Bastien Guerry 95e318ae06 Merge branch 'maint' 2012-03-16 19:39:36 +01:00
Thomas Morgan 490ef86497 org-habit.el: Fix bug while inserting habit graph in the agenda buffer.
* org-habit.el (org-habit-insert-consistency-graphs): Fix bug
while inserting habit graph in the agenda buffer.

TINYCHANGE
2012-03-16 19:35:44 +01:00
Bastien Guerry ce8b0963db Correctly match source block edit buffers.
* org-src.el (org-src-edit-buffer-p): New function.

* org.el (org-store-link): Use the new function to correctly
match source code buffer.

TINYCHANGE

Thanks to Ilya Shlyakhter for this patch.
2012-03-16 19:24:24 +01:00
Bastien Guerry b66ff157e1 Merge branch 'maint' 2012-03-16 19:19:24 +01:00
Bastien Guerry 8e7f84ea3d org-agenda.el: Fix the order conditions are being checked.
* org-agenda.el (org-agenda-skip-if): Fix the order conditions
are being checked.  Also enhance the docstring a bit.

TINYCHANGE

Thanks to Toby Cubitt for a patch to this effect.
2012-03-16 19:18:41 +01:00
Bastien Guerry ced72ea5d8 org-agenda.el: Fix the display of indirect agenda window.
* org-agenda.el (org-agenda-tree-to-indirect-buffer): Fix the
display of indirect agenda window.

TINYCHANGE

Thanks to Dave Abrahams for a patch to this effect.
2012-03-16 19:05:26 +01:00
Bastien Guerry 150e2db668 org.el: Fix XEmacs compatibility bug when creating images.
* org.el (org-create-formula-image, org-dvipng-color): Fix
XEmacs compatibility bug.

TINYCHANGE

Thanks to Uwe Brauer for this patch.
2012-03-16 18:55:41 +01:00
Carsten Dominik d23ce33583 Clocking work time: faster filtering of clock entries by trusting org-scanner-tags
* lisp/org-clock.el (org-clock-get-table-data): Bind org-scanner-tags
to tags-list and org-trust-scanner-tags to t while evaluating the
matcher, since the matcher is always evaluated at the current entry.

TINYCHANGE
2012-03-16 17:35:19 +01:00
Carsten Dominik 768c95e18b Merge branch 'master' of orgmode.org:org-mode 2012-03-16 17:33:05 +01:00
Ilya Shlyakhter 2149ad8aea tags search: faster tags matcher by trusting scanner tags
On 3/16/2012 2:10 AM, Nick Dokos wrote:
 > One more thing that you'll need to do is put your patches in attachments
 > of a type that will allow patchwork to snag the patch:

Thanks, I was wondering why they're not showing up.
Here is another try (attached) for the org.el patch.

ilya
>From 95c38b06803aec0787bc2eaab3d0062221390292 Mon Sep 17 00:00:00 2001
From: Ilya Shlyakhter <ilya_shl@alum.mit.edu>
Date: Fri, 16 Mar 2012 00:10:25 -0400
Subject: [PATCH 2/2] Tags/properties matcher: faster matching by trusting
 org-scanner-tags

* lisp/org.el (org-scan-tags): Bind org-trust-scanner-tags to t
while evaluating the matcher, since the matcher is always evaluated
at the current entry.

TINYCHANGE
2012-03-16 17:31:10 +01:00
Ilya Shlyakhter de4ba0d4cd Fixed compiler warnings, including one small bug in ob-lilypond
* lisp/ob-lilypond.el (ly-compile-lilyfile): Fixed misplaced comma in a
quoting expression.

* lisp/org-pcomplete.el: added missing defvar definitions for org vars

* lisp/org-src.el: added declare-function line for org-babel-tangle

* lisp/ob.el (org-scan-tags): protected the variable tags-list with a let
(other) added missing defvar declarations.

TINYCHANGE
2012-03-16 10:48:31 -04:00
Eric Schulte 3f4383baa4 add "eval" option to noweb
* lisp/ob.el (org-babel-merge-params): Add "eval" as acceptable noweb
  argument.
  (org-babel-noweb-p): The "eval" argument only expands during
  evaluation.
2012-03-14 15:12:44 -04:00
Eric Schulte 07ac15ef72 Merge branch 'origin-maint'
Conflicts:
	lisp/org-src.el
2012-03-14 09:56:52 -04:00
Eric Schulte 4542824f2c fix compiler warnings
* lisp/ob.el (org-strip-protective-commas): Declared.
* lisp/org-agenda.el (org-agenda-filtered-by-category): Declared.
  (org-agenda-filter-apply): Capture free variable.
* lisp/org-footnote.el (org-skip-whitespace): Declared.
* lisp/org-mobile.el (org-agenda-filter): Declared.
* lisp/org-src.el (org-strip-protective-commas): Declared.
2012-03-14 09:55:04 -04:00
Sebastien Vauban 0dcd83d3b2 Add autoload instruction before org-version
* org.el (org-version): Add autoload cookie.

TINYCHANGE
2012-03-14 09:17:43 -04:00
David Maus 837b58ee28 Merge branch 'maint' 2012-03-14 06:43:19 +01:00
David Maus a829737e46 Remove spurious quote in customization form choice
* org-attach.el (org-attach-store-link-p): Remove spurious quote in
customization form choice.

Glitch discovered and fix suggested by Henning Weiss in
<CAKq33udFSsBP0egVrgfjcBnou+PhKtyYaGBn0SfMicp42h0=kw@mail.gmail.com>>.
2012-03-14 06:17:25 +01:00
Eric Schulte 5cb80c7e5b apply :shebang and :padline to shell script execution
* lisp/ob-sh.el (org-babel-execute:sh): Pass all params to subroutine.
  (org-babel-sh-evaluate): Apply :shebang and :padline to shell script
  execution.
2012-03-12 13:23:53 -04:00
Eric Schulte de09874a27 Merge branch 'origin-maint' 2012-03-12 08:41:38 -04:00
Eric Schulte d5e21f43fc Ensure correct order for empty result wrapping blocks.
* lisp/ob.el (org-babel-insert-result): Ensure correct order for empty
  result wrapping blocks.
2012-03-12 08:40:43 -04:00
Eric Schulte 6cbcb80cce fix whitespace errors 2012-03-11 22:52:06 -06:00
Martyn Jago 2c623a0558 Make auditioning of midi and pdf generations asynchronous, and add easy pdf generation.
* lisp/ob-lilypond.el: Make auditioning of midi and pdf asynchronous,
  and add easy pdf generation in the form of `ly-gen-pdf' variable.

* testing/lisp/test-ob-lilypond.el: Tests for above.
2012-03-11 22:51:21 -06:00
Eric Schulte 1a42967061 Merge branch 'origin-maint' 2012-03-09 06:54:36 -07:00
Deech 26e817ac20 The link generated by org-store-link is escaped twice when tangling with ":comments yes" flag.
* ob-tangle.el (org-babel-spec-to-string): The link generated by
  org-store-link is escaped twice when tangling with ":comments yes"
  flag.
2012-03-09 06:54:22 -07:00
Bastien Guerry 9cf435800b org-html.el (org-export-as-html): Remove another useless space before tag.
* org-html.el (org-export-as-html): Remove another useless
space before tag.

Thanks to Mathias Bauer for spotting this.
2012-03-09 03:09:15 +01:00
Bastien Guerry d0570f9592 org-html.el (org-export-as-html): Remove another useless space before tag.
* org-html.el (org-export-as-html): Remove another useless
space before tag.

Thanks to Mathias Bauer for spotting this.
2012-03-09 03:08:43 +01:00
Bastien Guerry e77daf8391 Merge branch 'maint' 2012-03-09 02:55:03 +01:00
Bastien Guerry 1b4480e15f org-html.el (org-export-as-html): Remove useless space before tag.
* org-html.el (org-export-as-html): Remove useless space
before tag.

Thanks to Mathias Bauer for spotting this.
2012-03-09 02:54:34 +01:00