1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-18 10:17:03 +00:00
Commit Graph

9818 Commits

Author SHA1 Message Date
David Maus
4480ebe5f5 UTILITIES/pw: Fix type in error message
* pw (action_update_patch): Fix type in error message.
2012-03-20 02:39:33 +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
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
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
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
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
eea3802bba Whitespace cleanup. 2012-03-17 15:59:38 +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
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
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
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
6e525c73f7 documentation of this new option to the :noweb header argument
* doc/org.texi (noweb): Documentation of this new option to the :noweb
  header argument.
2012-03-14 15:12:44 -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
Jambunathan K
4512930860 org-e-odt: Use new source code handling API 2012-03-15 00:08:22 +05:30
Nicolas Goaziou
3fda301b07 org-element: Unhide contents of collapsed elements before entering them
* contrib/lisp/org-element.el (org-element-down): Unhide contents of
  collapsed elements before entering them.
2012-03-14 18:47:38 +01: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
Eric Schulte
1dd3180480 Merge branch 'origin-maint' 2012-03-14 09:22:59 -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
Jambunathan K
416acea371 org-e-html: Use new source code handling API 2012-03-14 15:26:28 +05:30
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
David Maus
21391e2f84 Merge branch 'maint' 2012-03-14 06:00:49 +01:00
Tassilo Horn
429cf28ebe Add missing word to org-contacts y-or-n-p question
* org-contacts.el (org-contacts-check-mail-address): Add missing word
to y-or-n-p question.
2012-03-14 05:46:04 +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