Commit Graph

7726 Commits

Author SHA1 Message Date
Bastien Guerry 70de130bba * org-html.el (org-export-as-html): bugfix: insert email correctly.
Thanks to Bernt Hansen for spotting this.
2011-03-12 05:22:41 +01:00
Kim Rutherford 3bf379aee9 Fix for infinite loop in org-html-protect
When I export the following as HTML, emacs hangs in org-html-protect:

#+begin_src org
&
#+end_src

The attached patch fixes the problem for me.

Thanks,
Kim.
>From cfb1ccb6f9cfd84530c73b7f72d686a2062b3c3b Mon Sep 17 00:00:00 2001
From: Kim Rutherford <kmr44@cam.ac.uk>
Date: Fri, 11 Mar 2011 16:44:09 +0000
Subject: [PATCH] Fix infinite loop in org-html-protect
2011-03-11 18:38:18 +01:00
Bastien Guerry ed8a9616a2 Revert "* org-html.el: Bugfix: prevent infinite matching of the `&' character."
This reverts commit f6752c805e.
2011-03-11 18:37:22 +01:00
Bastien Guerry f6752c805e * org-html.el: Bugfix: prevent infinite matching of the `&' character.
* org-html.el (org-html-protect): Bugfix: prevent infinite
matching of the `&' character.

This bug was spotted by Rehan Iftikhar.
2011-03-11 18:30:36 +01:00
Nicolas Goaziou efa562c1ee Fix compatibility with emacsen < 23
* lisp/org.el (org-fill-paragraph): fill-forward-paragraph function
  has been introduced with emacs 23.1.
2011-03-10 19:45:47 +01:00
Rodrigo Lazo a0dead7f10 Docstring fix for org-export-preprocess-string
Hi,

I found a trivial error with this docstring.

--8<---------------cut here---------------start------------->8---
--8<---------------cut here---------------end--------------->8---

Best regards,
  Seb
2011-03-10 19:08:59 +01:00
Bastien Guerry aaf0bb3967 (org-attach-store-link-p): Use 'attached instead of 'attach-dir. 2011-03-10 11:25:17 +01:00
Bastien Guerry b1909f0afa (org-attach-store-link-p): Use `t' instead of 'origin for backward compatibility. 2011-03-10 11:22:33 +01:00
Bastien Guerry b814d83b51 * org-attach.el: Allow to store a link to the attach-dir location.
* org-attach.el (org-attach-store-link-p): Allow to create a
link to the attach-dir location of the file.
(org-attach-attach): Allow to store a link to the attach-dir
location.

This was requested by Darlan Cavalcante Moreira.
2011-03-10 11:18:40 +01:00
Bastien Guerry 25ea18739d Remove trailing whitespaces. 2011-03-10 10:42:57 +01:00
Puneeth Chaganti 5b1b94ac42 * org-agenda.el (org-agenda-bulk-action): Allow the user to run a function.
* org-agenda.el (org-agenda-bulk-action): Allow the user to
run a function.
2011-03-10 10:41:00 +01:00
Bernt Hansen 0f301d133b Allow clocking in new tasks inserted before the current clocking task
* lisp/org-clock.el (org-clock-in): Allow clocking in new tasks inserted
  before the current clocking task

org-clock-in now checks that the name of the task you are clocking in
also matches org-clock-current-task.  This allows us to insert a new
task in front of the current clocking task (with M-S-RET on the
heading of the current clocking task) and then clock in the new task.

Previously this just stated that clocking continues in the old task
since the marker point now matches the new task.

A side-effect of this change is that changing the current clocking
task headline and clocking in again will now close the current clock
and open a new entry as well as update the name of the current
clocking task in the modeline.
2011-03-10 10:21:19 +01:00
Bernt Hansen d008facdab Allow setting default clocking task to current clocking task
* lisp/org-clock.el (org-clock-in): Set default clocking task when already clocking the task

The default clocking task can now be set to the current clocking task.
Previously this just threw an error stating the clock continues in the
current clocking task.  The double prefix now forces setting the
default clocking task instead of forcing the user to clock out and
back in again just to set the default clocking task to the current
clocking task.
2011-03-10 10:20:40 +01:00
Nicolas Goaziou b12f0dd309 Fix fill-region in an item
* lisp/org.el (org-adaptive-fill-function): when a region is specified
  first line of paragraph isn't skipped, so fill-paragraph have to be
  computed even if point is at an item.
2011-03-10 00:51:03 +01:00
Nicolas Goaziou f8ca5d85ba org-list: small refactoring
* lisp/org-list.el (org-list-in-valid-block-p): new function.
(org-at-item-p,org-list-search-generic): use new function.
2011-03-09 20:30:18 +01:00
Nicolas Goaziou 6ff4c9f42f List indentation has priority over block indentation
* lisp/org.el (org-indent-line-function): text in both a list and
  a valid block is indented with regards to current item, not to block
  boundaries.
2011-03-09 17:48:16 +01:00
Manuel Giraud 72011fc407 org-html.el: correct HTML export of dedicated target.
* org-html.el (org-format-org-table-html): fix anchors in HTML
export (thanks to <aankhen@gmail.com>)
(org-html-protect): fix a  bug that prevents some target to be
rendered correctly.

* org-exp.el (org-solidify-link-text): a single "-" to avoid a
"&ndash" rewrite in HTML export later.
2011-03-09 16:37:32 +01:00
Bastien Guerry eafdbc575b * org.el (org-default-properties): Add EXPORT_TEXT. 2011-03-09 15:44:11 +01:00
Matt Lundin f920974f43 org-footnote.el: Fix sorting of footnotes.
* org-footnote.el (org-footnote-create-definition)
(org-insert-footnote-reference-near-definition): Fix sorting
of footnotes.
2011-03-09 11:42:56 +01:00
Manuel Giraud 44684a9977 org-html.el: Bugfix: don't insert closing HTML tags when exporting body only.
* org-html.el (org-export-as-html): Bugfix: don't insert
closing HTML tags when exporting body only.
2011-03-09 11:28:38 +01:00
Bastien Guerry 3151ef60be org.el (org-default-properties): Add EXPORT_OPTIONS.
(org-buffer-property-keys): docstring fix.
(org-default-properties): Add EXPORT_OPTIONS.

Thanks to Sébastien Vauban for catching this and his patch.
2011-03-09 11:17:33 +01:00
Bastien Guerry e6d74f9253 org.el: remove useless comment. 2011-03-09 11:06:57 +01:00
Jason Dunsmore 85f03c0859 Bugfix: honor `org-blank-before-new-entry' correctly in various contexts.
* org.el (org-back-over-empty-lines): Bugfix.  Honor
`org-blank-before-new-entry' correctly in various contexts.
2011-03-09 11:06:09 +01:00
Bastien Guerry f54814d108 org-macs.el (org-with-wide-buffer): Bugfix.
* org-macs.el (org-with-wide-buffer): Bugfix: use
`save-excursion' and `save-restriction'.
2011-03-09 10:56:47 +01:00
Nicolas Goaziou 4090006ab1 org-list: fix confusion due to indent-tabs-mode 2011-03-08 23:49:39 +01:00
Nicolas Goaziou 11f19abcf2 org-timer: fix bug with `org-timer-item'
* lisp/org-timer.el (org-timer-item): save-excursion prevents
  `org-list-struct' to get the list structure when point isn't on the
  first line of the item.
2011-03-08 10:40:46 +01:00
Bastien Guerry 4fc3e71f10 Merge branch 'master' of orgmode.org:org-mode 2011-03-07 17:25:11 +01:00
Bastien Guerry 9784af675c Fix bug with the handling of the new :clock-keep option.
Thanks to Bernt for the detailed report.
2011-03-07 17:25:00 +01:00
Eric Schulte 7cb0891f7a ob-sql: feed mysql through a pipe, thanks to Alain Clément 2011-03-07 08:32:37 -07:00
emacs 11a10bdfe7 Update website to show 7.5 as current release 2011-03-07 14:27:39 +00:00
emacs 60d5414431 Merge branch 'maint' 2011-03-07 14:27:39 +00:00
emacs b44f21b1e3 Release 7.5 2011-03-07 14:27:16 +00:00
Bastien Guerry 54c638523d org-capture.el: Rename :no-clock-out to :clock-keep.
(org-capture-templates): Rename :no-clock-out to :clock-keep.
(org-capture): Use :clock-keep instead of :no-clock-out.

Thanks to Bernt Hansen for the suggestion.
2011-03-07 15:21:13 +01:00
Bastien Guerry b969081ebd org-capture.el: new :no-clock-out template option.
* org-capture.el (org-capture-templates): New option
:no-clock-out.
(org-capture): Use the new option.

* org.texi (Template elements): document the new template
option :no-clock-out.
2011-03-07 11:43:58 +01:00
Bastien Guerry e5eeea99fe Fix typo in README_maintainer. 2011-03-07 10:59:27 +01:00
Bastien Guerry 5780612759 Fix typo in docstring. 2011-03-07 00:20:42 +01:00
Nicolas Goaziou 38877e6cf9 org-list: update statistical cookies with check-boxes in an hidden subtree
* lisp/org-list.el (org-update-checkbox-count): Ensure cookies on an
  heading are correctly updated when checkboxes are hidden. It allows,
  for example, to use C-c C-x C-b on a collapsed tree and still get
  the update.
2011-03-06 21:34:35 +01:00
Bastien Guerry 3e06bae09b Merge branch 'master' of orgmode.org:org-mode 2011-03-06 21:10:50 +01:00
Nicolas Goaziou a93f576033 Documentation fixes 2011-03-06 20:19:15 +01:00
Bastien Guerry 846ff13247 Merge branch 'master' of orgmode.org:org-mode 2011-03-06 19:31:46 +01:00
David Maus 1a03c5f256 Accept keys for org-export-as-html-to-buffer' and `org-export-region-as-html'
* org-exp.el (org-export-visible): Accept keys for
`org-export-as-html-to-buffer' and `org-export-region-as-html'.

H and R were not in the list of allowed keys but bound to the
respective function later.

Missing keys reported by Samuel Wales <samologist@gmail.com>.
2011-03-06 19:08:42 +01:00
Bastien Guerry 6a0de0dc7b * org.el (org-duration-string-to-minutes): Don't use `rx-to-string'. 2011-03-06 18:45:03 +01:00
Lawrence Mitchell 75a1b98cfb Support modifiers in effort durations (was: Re: Does Effort support hours only?)
Luke Crook wrote:
> Is it possible to specify estimated effort in something other
> than hours (0.5, or 0:30)?

> For example 1w, 1m, 2d etc?

Here's a cleaned up patch that allows user-specified modifiers
for effort strings.  The new variable `org-effort-durations'
lists modifiers, and their mapping to minutes (words, as well as
single-letter modifiers, are supported).  The default value is:

(("h" . 60)
 ("d" . 480) ; 8 hours
 ("w" . 2400) ; five days
 ("m" . 9600) ; 4 weeks
 ("y" . 96000)) ; 40 weeks

But you can change this.

Old effort strings (HH:MM) are still interpreted correctly.  See
the docstrings of `org-effort-durations' and
`org-duration-string-to-minutes' for more details.

>From a0e24b14755eb4087d9c47bb4eea11eb9151efcf Mon Sep 17 00:00:00 2001
From: Lawrence Mitchell <wence@gmx.li>
Date: Fri, 18 Feb 2011 11:01:46 +0000
Subject: [PATCH] Allow human-readable effort durations
To: emacs-orgmode@gnu.org

* lisp/org.el (org-effort-durations): New variable.
* lisp/org.el (org-duration-string-to-minutes): New function.
* lisp/org-agenda.el (org-agenda-filter-effort-form)
(org-format-agenda-item): Use it.
* lisp/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-modify-effort-estimate, org-clock-get-clock-string): Use it.

Specifying large effort durations in hours and minutes is difficult.
Is 130:25 more than two weeks effort?  More than three?  This patch
allows specification of an effort duration as a friendly string.  For
example 2w 5d is two weeks and five days of effort.  Existing H:MM
entries will still be recognised correctly.
2011-03-06 18:27:14 +01:00
Bastien Guerry 145d1bf7e5 org.texi: use "x" as a key for the org-capture example.
"\C-cc" is already the recommended key for org-capture.
2011-03-06 18:23:18 +01:00
Bastien Guerry 6238e18a71 org.texi: fix typo about defining an org-capture key. 2011-03-06 18:22:13 +01:00
Bastien Guerry ef549e0891 org-agenda.el: Rename org-run-agenda-series to org-agenda-run-series.
* org-agenda.el (org-agenda-run-series): Rename from
`org-run-agenda-series'.
2011-03-06 18:12:35 +01:00
Bastien Guerry 25dfaf717c * org-capture.el: Don't allow currentfile anymore.
* org-capture.el (org-capture-templates): Don't allow
currentfile anymore.
2011-03-06 18:10:48 +01:00
Bastien Guerry 030960559e org-capture.el: remove (currentfile) as a file specification in templates.
You can already use a function like (buffer-file-name) to get the currently
visited file.  So (currentfile) is not necessary.
2011-03-06 17:31:56 +01:00
Bastien Guerry d2fb95dd4e Merge branch 'master' of orgmode.org:org-mode 2011-03-06 16:38:19 +01:00
Bastien Guerry 82224d6b34 org-agenda.el: bugfix, remove useless `org-agenda-current-span'.
* org-agenda.el (org-agenda-list): Fix bug: don't rely on
`org-agenda-current-span' when calling `org-agenda-list'.
2011-03-06 16:37:55 +01:00