Commit Graph

10039 Commits

Author SHA1 Message Date
Bastien Guerry 6c911234ac Remove files coming from maint. 2012-03-20 01:50:59 +01:00
Bastien Guerry df82832fb7 Merge maint fixup and finish master fixup 2012-03-20 00:35:55 +01:00
Bastien Guerry 4e5c24ea81 Delete files that sneaked in while fixing the master branch. 2012-03-19 23:48:07 +01:00
Bastien Guerry be2e3039a1 Fix Makefile.
There was two problems: fixrelease merged the wrong way (merging
master into maint) and cleanrel tried to clean up files that were
already deleted.
2012-03-19 22:38:45 +01:00
Bastien Guerry 6bcba14919 Fix Makefile.
There was two problems: fixrelease merged the wrong way (merging
master into maint) and cleanrel tried to clean up files that were
already deleted.
2012-03-19 22:37:52 +01:00
Bastien Guerry 00365ede15 Bump to version 7.8.06. 2012-03-19 22:23:16 +01:00
Bastien Guerry 0496bd3190 Revert "Require one or more spaces (+) between keyword and headline"
This reverts commit e0072f7913.
2012-03-19 22:21:10 +01:00
Bastien Guerry ecd0562c5f Fix the master branch.
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.

This commit also bumps the version number to 7.8.06.

The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
2012-03-19 22:01:29 +01:00
Bastien Guerry c44e07a4fa Fix the maint branch.
Thanks to Achim Gratz for his precious help on this.
2012-03-19 20:27:28 +01:00
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
Ilya Shlyakhter 9382faf592 Documentation: Clarified current role of ITEM special property
doc/org.texi (section on Special Properties) Clarified that ITEM refers
to the headline of the entry not the whole entry text.
(section on Matching Tags and Properties) Clarified that matching on
the value of ITEM special property is not currently supported,
and added a footnote about a partial workaround.
Also added missing -if suffix to references to org-agenda-skip-entry-if.

TINYCHANGE
2012-03-17 16:02:59 +01:00
Bastien Guerry c63275ca8e Merge branch 'maint' 2012-03-17 15:59:50 +01:00
Bastien Guerry eea3802bba Whitespace cleanup. 2012-03-17 15:59:38 +01:00
Bastien Guerry 82019bc7c7 Merge branch 'maint' 2012-03-17 15:56:43 +01:00
Bastien Guerry f2acf329cb Don's use "Version" elsewhere than in org.el 2012-03-17 15:56:30 +01:00
Bastien Guerry 49dd6de083 Merge branch 'maint' 2012-03-17 15:52:49 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 552b0edb25 Manually revert to 78ec8e21 (Release 7.8.04)
Let's take a fresh start.  Sorry Mama.
2012-03-17 15:44:41 +01:00
Bastien Guerry a1a01224d4 org-exp.el: Add russian translation.
TINYCHANGE

Thanks to Vladimir Lomov for this change.
2012-03-17 14:48:04 +01:00
Bastien Guerry 5ed0384e51 Merge branch 'maint' 2012-03-17 14:43:38 +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 856f5c27fb Don't use "Version" tag elsewhere than in org.el 2012-03-17 14:42:10 +01:00
Bastien Guerry fdc20f7792 Fix more copyright years. 2012-03-17 14:39:43 +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 06b94ca884 Merge branch 'maint' 2012-03-16 19:05:59 +00:00
Bastien Guerry 78ec8e21b8 Release 7.8.04 2012-03-16 19:04:04 +00:00
Bastien Guerry 7e903acccd Merge branch 'maint' 2012-03-16 20:02:48 +01:00
Bastien Guerry e85080bb2b doc/org.texi: Use "ODT" instead of @acronym{ODT}.
Using @acronym{} is better but we need to make this
change on the whole document and check that the doc
compiles correctly on the server with it.
2012-03-16 20:02:30 +01: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