[O] [Accepted] org-clock: Customizable variable syntax fix
Patch 1343 (http://patchwork.newartisans.com/patch/1343/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1338356138-18503-1-git-send-email-vsync%40quadium.net%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] org-clock: Customizable variable syntax fix Date: Wed, 30 May 2012 10:35:38 - From: Tim Howe vs...@quadium.net X-Patchwork-Id: 1343 Message-Id: 1338356138-18503-1-git-send-email-vs...@quadium.net To: emacs-orgmode@gnu.org * org-clock.el (org-clocktable-defaults): Revert extra layer of quoting. It appears the goal in 9b23f082 was to allow defaulting a plist member to a variable; however the plist was being constructed with LIST and therefore the `, combination was unnecessary. TINYCHANGE --- lisp/org-clock.el | 40 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 70c015b..fe3e154 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -248,26 +248,26 @@ string as argument. :group 'org-clock) (defcustom org-clocktable-defaults - `(list -:maxlevel 2 -:lang ,org-export-default-language -:scope 'file -:block nil -:tstart nil -:tend nil -:step nil -:stepskip0 nil -:fileskip0 nil -:tags nil -:emphasize nil -:link nil -:narrow '40! -:indent t -:formula nil -:timestamp nil -:level nil -:tcolumns nil -:formatter nil) + (list + :maxlevel 2 + :lang org-export-default-language + :scope 'file + :block nil + :tstart nil + :tend nil + :step nil + :stepskip0 nil + :fileskip0 nil + :tags nil + :emphasize nil + :link nil + :narrow '40! + :indent t + :formula nil + :timestamp nil + :level nil + :tcolumns nil + :formatter nil) Default properties for clock tables. :group 'org-clock :version 24.1
[O] [Accepted] Re: Manual does not list :results output graphics as babel header arg
Patch 1363 (http://patchwork.newartisans.com/patch/1363/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm1obnnk036.fsf_-_%40tsdye.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Re: Manual does not list :results output graphics as babel header arg Date: Tue, 10 Jul 2012 22:17:01 - From: Thomas S. Dye t...@tsdye.com X-Patchwork-Id: 1363 Message-Id: m1obnnk036.fsf...@tsdye.com To: John Hendy jw.he...@gmail.com Cc: emacs-orgmode emacs-orgmode@gnu.org Aloha all, The attached patch changes the link to the languages supported by babel from a directory listing to the Worg page that uses a table to link to the language-specific documentation pages. It was suggested by John Hendy. All the best, Tom John Hendy jw.he...@gmail.com writes: On Tue, Jul 10, 2012 at 10:19 AM, Thomas S. Dye t...@tsdye.com wrote: John Hendy jw.he...@gmail.com writes: On Mon, Jul 9, 2012 at 7:35 PM, Thomas S. Dye t...@tsdye.com wrote: John Hendy jw.he...@gmail.com writes: I have typically outputted graphics from R via tikzDevice manually, but gave my first whirl to just including things via the :file argument in my block header. In the process, I was trying to get this to work and found I needed to use: - :results output graphics - This is listed on Worg ob-R-doc: - http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-R.html#sec-4-3 But I didn't originally know about it, as it's not a listed header argument in the manual, which is where I check since they're all listed in one place: - http://orgmode.org/manual/results.html#results Does the manual only list universal babel header arguments and R is in a subset of ones using =:results output graphics= or should it be there? Hi John, The babel header arguments are implemented at two levels. There are general babel arguments that apply to all the supported languages. These are described in the manual. It is also possible for the individual language implementations to define their own header arguments. R is a good example, where the very many arguments to the various R output devices are built into ob-R.el. These language specific header arguments are not described in the manual, but instead appear in the language specific documentation on Worg. Re: your specific question about :results output graphics. I believe this is an R specific header argument and that it is described in the appropriate place in the documentation on Worg (see lines 68 and 230 of ob-R.el). The manual is not a one-stop source for answers to all Babel questions. Recourse to the language specific documentation is typically necessary, which is why it would be great if someone could find time to work up documentation for the 20 or so languages that still lack it :) Thanks for the clarification and that answers the question. This was a specific header argument for R. Perhaps the manual could link to this page? - http://orgmode.org/worg/org-contrib/babel/languages.html Maybe with a diddy: Some languages feature their own unique header arguments. The above document only universal, system wide Babel header arguments and one should consult the specific language page on Worg for additional features. Just a thought. Hi John, Thanks for this thought, which is indeed reasonable. I thought the manual might lack this structure, but when I went back to the manual I found that http://orgmode.org/manual/Specific-header-arguments.html#Specific-header-arguments has this at the bottom of the page: Additional header arguments are defined on a language-specific basis, see Languages, where Languages is a link to another manual page, one with a table of supported languages and a link to the Worg page you cite. Wow. You see only what you look for. :embarrassed: The language is a bit different than your proposal, but the path seems clear enough to me. Technically the path points to http://orgmode.org/worg/org-contrib/babel/languages/; I'd point it to http://orgmode.org/worg/org-contrib/babel/languages.html as it looks cleaner vs. just looking at the directory of .html files. Either way... the manual totally does it's job and I missed it! Thanks for bearing with me! John Of course, there is still the issue of the languages that lack language-specific documentation :) All the best, Tom -- T.S. Dye Colleagues, Archaeologists 735 Bishop St, Suite 315, Honolulu, HI 96813 Tel: 808-529-0866, Fax: 808-529-0884 http://www.tsdye.com From 0438f0ae1e23321dbacd0666119205985959433e Mon Sep 17 00:00:00 2001 From: Thomas Dye t...@tsdye.com Date: Tue, 10 Jul 2012 07:12:13 -1000 Subject: [PATCH] Changed babel languages link
[O] [Accepted] fix typo in org.texi
Patch 1352 (http://patchwork.newartisans.com/patch/1352/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C4FDC8576.5000509%40jboecker.de%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] fix typo in org.texi
Date: Sat, 16 Jun 2012 18:09:10 -
From: =?utf-8?b?SmFuIELDg8K2Y2tlciA8amFuLmJvZWNrZXJAamJvZWNrZXIuZGU+?=
X-Patchwork-Id: 1352
Message-Id: 4fdc8576.5000...@jboecker.de
To: Org Mode emacs-orgmode@gnu.org
The attached patch fixes a typo in the documentation.
I hope I got the format of the commit message right.
Best regards,
Jan
From 7daa1f794794d515624ab28310db81a0e4099ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6cker?= jan.boec...@jboecker.de
Date: Sat, 16 Jun 2012 15:04:43 +0200
Subject: [PATCH] org.texi: fix typo
* doc/org.texi (The spreadsheet): fix typo
---
doc/org.texi |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/org.texi b/doc/org.texi
index 28d2a06..e1337c0 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -2706,7 +2706,7 @@ modified in order to still reference the same field.
To avoid this from
happening, in particular in range references, anchor ranges at the table
borders (using @code{@@}, @code{@@}, @code{$}, @code{$}), or at hlines
using the @code{@@I} notation. Automatic adaptation of field references does
-of cause not happen if you edit the table structure with normal editing
+of course not happen if you edit the table structure with normal editing
commands---then you must fix the equations yourself.
Instead of typing an equation into the field, you may also use the following
--
1.7.10.3
[O] bug#7776: C-; does not work on indented lines in org-mode
Lennart Borgman lennart.borg...@gmail.com writes: C-; does not put # in column 0. C-; is for headlines only. You can comment lines by selecting them then M-; on the region.
[O] bug#7776: C-; does not work on indented lines in org-mode
Lennart Borgman lennart.borg...@gmail.com writes: C-; does not put # in column 0. Closing this bug.
[O] bug#8748: emacs 23.3 for windows, org-mode, tables
Hi Alexander, Alexander Sidorov alx.sido...@gmail.com writes: Org-mode in emacs for Windows doesn't allow to create prooperly tables. This is the result of creation a table 5x2: | | | | | | |---+---+---+---+---| | | | | | | (all rows in one row). It happens always. I guess that used wrong end-line symbol. Do you still see this bug with a recent Emacs / Org ? -- Bastien
[O] bug#9809: 24.0.90; flyspell-auto-correct-word hard to access in org-mode
Hi Glenn, Glenn Morris r...@gnu.org writes: Eric Hanchrow wrote: I started emacs with emacs -Q. Then I typed M-x o r g - m o d e return M-x f l y s p e l l - m o d e return C-h c M-tab C-h c M-TAB C-h c M-tab showed me M-tab runs the command pcomplete. C-h c M-TAB (which I typed via Ctrl+Alt+i) showed me M-TAB runs the command flyspell-auto-correct-word. I expected _both_ key events -- M-tab and M-TAB -- to show me flyspell-auto-correct-word. This occurs because org.el for some reason tries to define the M-TAB key 3 different ways: (org-defkey org-mode-map [(meta tab)] 'pcomplete) (org-defkey org-mode-map \M-\t 'pcomplete) (org-defkey org-mode-map \M-\C-i 'pcomplete) Removing all but the second definition would fix this. Ref Named ASCII Control Characters in the lispref. If you do not want to distinguish between (for example) TAB and `C-i', make just one binding, for the ASCII character TAB (octal code 011). If you do want to distinguish, make one binding for this ASCII character, and another for the function key `tab'. Thanks. This is now fixing in Org repo, I'll close the bug when this goes into Emacs. -- Bastien
[O] [Accepted] Minor fix in info documentation
Patch 1145 (http://patchwork.newartisans.com/patch/1145/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3CCAMXnza2Wte75-tEoJHBOE%2B54W6gGXe0%2BGFdwJ_DQqLm8-Ddm0g%40mail.gmail.com%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Minor fix in info documentation
Date: Mon, 30 Jan 2012 16:09:04 -
From: suvayu ali fatkasuvayu+li...@gmail.com
X-Patchwork-Id: 1145
Message-Id:
camxnza2wte75-teojhboe+54w6ggxe0+gfdwj_dqqlm8-dd...@mail.gmail.com
To: org-mode mailing list emacs-orgmode@gnu.org
From d84c66830856c4ff75a3a7b19bbf99219b5e6b99 Mon Sep 17 00:00:00 2001
From: Suvayu Ali fatkasuvayu+li...@gmail.com
Date: Mon, 9 Jan 2012 01:32:08 +0530
Subject: [PATCH] Minor fix in info documentation.
TINY CHANGE
---
doc/org.texi |4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 0de59b3..952f740 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -10460,9 +10460,7 @@ @subsection Images in @LaTeX{} export
this option can be used with tables as well@footnote{One can also take
advantage of this option to pass other, unrelated options into the figure or
table environment. For an example see the section ``Exporting org files'' in
-@url{http://orgmode.org/worg/org-hacks.html}}. For example the
-@code{#+ATTR_LaTeX:} line below is exported as the @code{figure} environment
-below it.
+@url{http://orgmode.org/worg/org-hacks.html}}.
If you would like to let text flow around the image, add the word @samp{wrap}
to the @code{#+ATTR_LaTeX:} line, which will make the figure occupy the left
--
1.7.7.6
[O] [Accepted] [O, 1/3] Document max number of stars in headings in docstring of org-inlinetask-minlevel
Patch 1124 (http://patchwork.newartisans.com/patch/1124/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C20120122131516.GC21012%40shi.workgroup%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O, 1/3] Document max number of stars in headings in docstring of org-inlinetask-minlevel Date: Sun, 22 Jan 2012 18:15:16 - From: Gregor Zattler telegr...@gmx.net X-Patchwork-Id: 1124 Message-Id: 20120122131516.GC21012@shi.workgroup To: emacs-orgmode emacs-orgmode@gnu.org Clocking only works with headings indented with less than `30' stars (hardcoded `lmax' value in `org-clock-sum'). Since especially inline tasks may dupe someone into using more stars, document the limit in the docsring of `org-inlinetask-min-level'. --- lisp/org-inlinetask.el |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index a14e404..b8e8437 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -90,6 +90,9 @@ (defcustom org-inlinetask-min-level 15 Minimum level a headline must have before it is treated as an inline task. +Don't set it to something higher than `29' or clocking will break since this +is the hardcoded maximum number of stars `org-clock-sum' will work with. + It is strongly recommended that you set `org-cycle-max-level' not at all, or to a number smaller than this one. In fact, when `org-cycle-max-level' is not set, it will be assumed to be one less than the value of smaller than
[O] [Accepted] [O, 2/3] Document max number of stars in headings in manual
Patch 1123 (http://patchwork.newartisans.com/patch/1123/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C20120122131506.GB21012%40shi.workgroup%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O,2/3] Document max number of stars in headings in manual
Date: Sun, 22 Jan 2012 18:15:06 -
From: Gregor Zattler telegr...@gmx.net
X-Patchwork-Id: 1123
Message-Id: 20120122131506.GB21012@shi.workgroup
To: emacs-orgmode emacs-orgmode@gnu.org
Clocking only works with headings indented with less than `30' stars
(hardcoded `lmax' value in `org-clock-sum').
---
doc/org.texi |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index b238210..9e873ea 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -1164,7 +1164,8 @@ Headlines define the structure of an outline tree. The
headlines in Org
start with one or more stars, on the left margin@footnote{See the variables
@code{org-special-ctrl-a/e}, @code{org-special-ctrl-k}, and
@code{org-ctrl-k-protect-subtree} to configure special behavior of @kbd{C-a},
-@kbd{C-e}, and @kbd{C-k} in headlines.}. For example:
+@kbd{C-e}, and @kbd{C-k} in headlines.} @footnote{Clocking only works with
+headings indented less then 30 stars.}. For example:
@example
* Top level headline
[O] [Accepted] [O, 3/3] Document max number of stars in clocking section
Patch 1125 (http://patchwork.newartisans.com/patch/1125/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C20120122133050.GD21012%40shi.workgroup%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O,3/3] Document max number of stars in clocking section
Date: Sun, 22 Jan 2012 18:30:50 -
From: Gregor Zattler telegr...@gmx.net
X-Patchwork-Id: 1125
Message-Id: 20120122133050.GD21012@shi.workgroup
To: emacs-orgmode emacs-orgmode@gnu.org
Clocking only works with all headings indented with less than `30'
stars (hardcoded `lmax' value in `org-clock-sum').
---
doc/org.texi | 14 --
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 9e873ea..46aa1e2 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -5917,12 +5917,14 @@ created for this purpose, it is described in
@ref{Structure editing}.
@cindex time clocking
Org mode allows you to clock the time you spend on specific tasks in a
-project. When you start working on an item, you can start the clock.
-When you stop working on that task, or when you mark the task done, the
-clock is stopped and the corresponding time interval is recorded. It
-also computes the total time spent on each subtree of a project. And it
-remembers a history or tasks recently clocked, to that you can jump quickly
-between a number of tasks absorbing your time.
+project. When you start working on an item, you can start the clock. When
+you stop working on that task, or when you mark the task done, the clock is
+stopped and the corresponding time interval is recorded. It also computes
+the total time spent on each subtree@footnote{Clocking only works if all
+headings are indented with less than 30 stars. This is a hardcoded
+limitation of `lmax' in `org-clock-sum'.} of a project. And it remembers a
+history or tasks recently clocked, to that you can jump quickly between a
+number of tasks absorbing your time.
To save the clock history across Emacs sessions, use
@lisp
[O] [Accepted] Improving bug reporting documentation
Patch 1033 (http://patchwork.newartisans.com/patch/1033/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C2008000620.6fd433b6%40kuru.homelinux.net%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Improving bug reporting documentation
Date: Tue, 08 Nov 2011 04:06:20 -
From: suvayu ali fatkasuvayu+li...@gmail.com
X-Patchwork-Id: 1033
Message-Id: 2008000620.6fd43...@kuru.homelinux.net
To: Org mode mailing list emacs-orgmode@gnu.org
Hi Bastien and others,
Lately I have been seeing a lot of bug reports sent using the
org-submit-bug-report. The reporter usually reports the bug from a
session they have been using with their full blown customisations. And
often they are requested to reproduce the bug with emacs -Q. So I
thought it would be easier if the manual mentioned this little detail.
A patch is attached.
Hope this helps.
PS: I marked the patch as TINY CHANGE.
diff --git a/doc/org.texi b/doc/org.texi
index 4a547d0..1bc9a98 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -987,6 +987,36 @@ @section Feedback
that you only need to add your description. If you re not sending the Email
from within Emacs, please copy and paste the content into your Email program.
+Sometimes you might face a problem due to an error in your Emacs or Org-mode
+setup. Before reporting a bug, it is very helpful to start Emacs with
minimal
+customisations and reproduce the problem. Doing so often helps you determine
+if the problem is with your customisation or with Org-mode itself. You can
+start a typical minimal session with a command like the example below.
+
+@example
+$ emacs -Q -l /path/to/minimal-org.el
+@end example
+
+However if you are using Org-mode as distributed with Emacs, a minimal setup
+is not necessary. In that case it is sufficient to start Emacs as
@code{emacs
+-Q}. The @code{minimal-org.el} setup file can have contents as shown below.
+
+@example
+;;; Minimal setup to load latest `org-mode'
+
+;; activate debugging
+(setq debug-on-error t
+ debug-on-signal nil
+ debug-on-quit nil)
+
+;; add latest org-mode to load path
+(add-to-list 'load-path (expand-file-name /path/to/org-mode/lisp))
+(add-to-list 'load-path (expand-file-name /path/to/org-mode/contrib/lisp))
+
+;; activate org
+(require 'org-install)
+@end example
+
If an error occurs, a backtrace can be very useful (see below on how to
create one). Often a small example file helps, along with clear information
about:
[O] [Accepted] Patch: maintain window configuration when org-agenda-follow-indirect is set
Patch 1004 (http://patchwork.newartisans.com/patch/1004/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm2bot77c1a.fsf%40pluto.luannocracy.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Patch: maintain window configuration when org-agenda-follow-indirect is set Date: Mon, 24 Oct 2011 00:17:37 - From: Dave Abrahams d...@boostpro.com X-Patchwork-Id: 1004 Message-Id: m2bot77c1a@pluto.luannocracy.com To: emacs-orgmode@gnu.org From 5adafd491f520908c8ee180c1b0d63d877fa8547 Mon Sep 17 00:00:00 2001 From: Dave Abrahams d...@boostpro.com Date: Sun, 23 Oct 2011 14:41:44 -0400 Subject: [PATCH] Maintain stable window configuration when org-agenda-follow-indirect is set Without this change, org-agenda-follow-indirect tends to cause the window configration to bounce around chaotically as you move from item to item. --- lisp/org-agenda.el | 17 + 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index e4b1ba5..639ee23 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7168,6 +7168,23 @@ With numerical prefix arg ARG, go up to this level and then take that tree. With a \\[universal-argument] prefix, make a separate frame for this tree (i.e. don't use the dedicated frame). (interactive) + (if (and current-prefix-arg (listp current-prefix-arg)) + (org-agenda-do-tree-to-indirect-buffer) +(let ((agenda-window (selected-window)) + (indirect-window (get-buffer-window org-last-indirect-buffer))) + (save-window-excursion (org-agenda-do-tree-to-indirect-buffer)) + (unwind-protect + (progn +(unless indirect-window + (setq indirect-window (split-window agenda-window))) +(select-window indirect-window) +(switch-to-buffer org-last-indirect-buffer :norecord) +(fit-window-to-buffer indirect-window)) +(select-window agenda-window) + +(defun org-agenda-do-tree-to-indirect-buffer () + Implements org-agenda-tree-to-indirect-buffer, but +doesn't attempt to manage stability of the window configuration. (org-agenda-check-no-diary) (let* ((marker (or (org-get-at-bol 'org-marker) (org-agenda-error))) -- 1.7.6.1
[O] [Accepted] Orgcard: Correct markup in 'Timestamps' section
Patch 1068 (http://patchwork.newartisans.com/patch/1068/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3Cjc5fuu%24ppc%241%40dough.gmane.org%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Orgcard: Correct markup in 'Timestamps' section
Date: Mon, 12 Dec 2011 23:08:30 -
From: Julian Gehring julian.gehr...@googlemail.com
X-Patchwork-Id: 1068
Message-Id: jc5fuu$ppc$1...@dough.gmane.org
To: emacs-orgmode@gnu.org
Orgcard: Correct markup in 'Timestamps' section
* doc/orgcard.tex: Correct one markup in 'Timestamps' section
From 756e4eb6aca0e1b72f8fa55537005d2b617b83f8 Mon Sep 17 00:00:00 2001
From: Julian Gehring julian.gehr...@googlemail.com
Date: Mon, 12 Dec 2011 12:29:46 +0100
Subject: [PATCH] Orgcard: Correct markup in 'Timestamps' section
* doc/orgcard.tex: Correct one markup in 'Timestamps' section
---
doc/orgcard.tex |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 38df521..f543e91 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -526,7 +526,7 @@ after ``{\tt :}'', and dictionary words elsewhere.
\section{Timestamps}
\key{prompt for date and insert timestamp}{C-c .}
-\key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
+\key{like \kbd{C-c .} but insert date and time format}{C-u C-c .}
\key{like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
\key{insert DEADLINE timestamp}{C-c C-d}
\key{insert SCHEDULED timestamp}{C-c C-s}
--
1.7.4.1
[O] [Accepted] Org manual: Fix double-spaces at the end of sentences
Patch 1069 (http://patchwork.newartisans.com/patch/1069/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3Cjc5h3b%242jq%241%40dough.gmane.org%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Org manual: Fix double-spaces at the end of sentences
Date: Mon, 12 Dec 2011 23:27:55 -
From: Julian Gehring julian.gehr...@googlemail.com
X-Patchwork-Id: 1069
Message-Id: jc5h3b$2jq$1...@dough.gmane.org
To: emacs-orgmode@gnu.org
Org manual: Fix double-spaces at the end of sentences
* doc/org.texi: End sentences with two spaces.
From 19e39b67f4a8dbee3f1015f636fac4f77e59d3c2 Mon Sep 17 00:00:00 2001
From: Julian Gehring julian.gehr...@googlemail.com
Date: Mon, 12 Dec 2011 19:19:20 +0100
Subject: [PATCH] Org manual: Fix double-spaces at the end of sentences
* doc/org.texi: End sentences with two spaces.
---
doc/org.texi | 36 ++--
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index ff9bb7e..2cbb7d1 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6023,7 +6023,7 @@ Insert a dynamic block (@pxref{Dynamic blocks})
containing a clock
report as an Org-mode table into the current file. When the cursor is
at an existing clock table, just update it. When called with a prefix
argument, jump to the first clock report in the current document and
-update it. The clock table always includes also trees with
+update it. The clock table always includes also trees with
@code{:ARCHIVE:} tag.
@orgcmdkkc{C-c C-c,C-c C-x C-u,org-dblock-update}
Update dynamic block at point. The cursor needs to be in the
@@ -6642,7 +6642,7 @@ buffer again after capture is completed.
In the template itself, special @kbd{%}-escapes@footnote{If you need one of
these sequences literally, escape the @kbd{%} with a backslash.} allow
-dynamic insertion of content. The templates are expanded in the order given
here:
+dynamic insertion of content. The templates are expanded in the order given
here:
@smallexample
%[@var{file}] @r{insert the contents of the file given by @var{file}.}
@@ -10896,7 +10896,7 @@ newly created file. For additional configuration
options
@pxref{x-overriding-factory-styles,,Overriding factory styles}.
If you would like to choose a style on a per-file basis, you can use the
-@code{#+ODT_STYLES_FILE} option. A typical setting will look like
+@code{#+ODT_STYLES_FILE} option. A typical setting will look like
@example
#+ODT_STYLES_FILE: /path/to/example.ott
@@ -10932,7 +10932,7 @@ internal links. It creates Internet-style links for
all other links.
Export of native Org-mode tables (@pxref{Tables}) and simple @file{table.el}
tables is supported. However, export of complex @file{table.el} tables -
-tables that have column or row spans - is not supported. Such tables are
+tables that have column or row spans - is not supported. Such tables are
stripped from the exported document.
By default, a table is exported with top and bottom frames and with
@@ -10944,7 +10944,7 @@ are interpreted as weighted ratios with the default
weight being 1}
@cindex #+ATTR_ODT
If you are not satisfied with the default formatting of tables, you can
create custom table styles and associate them with a table using
-the @code{#+ATTR_ODT} line. @xref{Customizing tables in @acronym{ODT}
export}.
+the @code{#+ATTR_ODT} line. @xref{Customizing tables in @acronym{ODT}
export}.
@node Images in @acronym{ODT} export, Math formatting in @acronym{ODT}
export, Tables in @acronym{ODT} export, OpenDocument Text export
@subsection Images in @acronym{ODT} export
@@ -11171,11 +11171,11 @@ that would be of interest to power users.
@cindex doc, docx
The @acronym{ODT} exporter adds support for exporting Org outlines to formats
-that are not supported natively by Org. It also adds support to convert
+that are not supported natively by Org. It also adds support to convert
document from one format to another. To use these features, you need to
configure a command-line converter. Once a command-line converter is
configured you can use it to extend the list of formats to which Org can
-export. @xref{x-export-to-other-formats,,Automatically exporting to other
+export. @xref{x-export-to-other-formats,,Automatically exporting to other
formats}. You can also use it to perform one-off document conversion as
detailed below.
@@ -11186,7 +11186,7 @@ detailed below.
Convert an existing document from one format to another as determined by the
variable @code{org-export-odt-convert-capabilities}
(@pxref{x-odt-converter-capabilities,,Configure converter
-capabilities}). @strong{Please note} that you can use this command to even
+capabilities}). @strong{Please note} that
[O] [Accepted] Fix marker in no buffer error for task state change in an indirect buffer
Patch 1050 (http://patchwork.newartisans.com/patch/1050/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1321739047-11936-1-git-send-email-bernt%40norang.ca%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Fix marker in no buffer error for task state change in an indirect buffer Date: Sun, 20 Nov 2011 02:44:07 - From: Bernt Hansen be...@norang.ca X-Patchwork-Id: 1050 Message-Id: 1321739047-11936-1-git-send-email-be...@norang.ca To: emacs-orgmode@gnu.org Cc: Bernt Hansen be...@norang.ca, carsten.domi...@gmail.com * lisp/org-clock.el (org-clock-out-if-current): Fix marker in no buffer error for task state change in an indirect buffer org-clock-out-when-current was enhanced in 098cf35 (Clock: Clock out when done also in indirect buffers, 2009-03-23) to handle indirect buffers. This enhancement uses (buffer-base-buffer (org-clocking-buffer)) but when not clocking (org-clocking-buffer) returns nil - so buffer-base-buffer returns the base buffer of the current buffer which is never nil. This leads to marker in no buffer errors trying to stop the clock when it is not running. Now we explicitly check up front that the clock is running before any other conditions that lead to stopping the clock. --- cc:ing Carsten since this is his code Hi Dave, After much difficulty I was able to reproduce this problem. It would have been helpful to include basic information about what triggers the bug for you. - clock is not running - You are working in an indirect buffer - You change a todo state keyword to DONE This works fine for me when not in an indirect buffer. The git commit you have referenced in this report is not part of the org repository which also made me think you had local changes that affected this issue since I couldn't reproduce it for the first 20 minutes of looking at this issue. Please try this patch and report back if it works or not. Thanks, Bernt lisp/org-clock.el |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 5dbe4dc..9107400 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1696,7 +1696,8 @@ from the `before-change-functions' in the current buffer. Clock out if the current entry contains the running clock. This is used to stop the clock after a TODO entry is marked DONE, and is only done if the variable `org-clock-out-when-done' is not nil. - (when (and org-clock-out-when-done + (when (and (org-clocking-p) + org-clock-out-when-done (or (and (eq t org-clock-out-when-done) (member state org-done-keywords)) (and (listp org-clock-out-when-done)
[O] [Accepted] Addition of default-description parameter to org-insert-link
Patch 1010 (http://patchwork.newartisans.com/patch/1010/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3CCABAjAKc0XK4ZJX6Cw%3DPhWAq24EmYNwSzbDVu378XUa4JMbEr_g%40mail.gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Addition of default-description parameter to org-insert-link Date: Wed, 26 Oct 2011 21:47:46 - From: Yuri Lenskiy lens...@mit.edu X-Patchwork-Id: 1010 Message-Id: CABAjAKc0XK4ZJX6Cw=phwaq24emynwszbdvu378xua4jmbe...@mail.gmail.com To: emacs-orgmode@gnu.org This patch, against the stable 7.7 branch version of org.el, adds a default-description argument to org-insert-link that, if non-nil, will become the default description. - Yuri Lenskiy diff --git a/lisp/org.el b/lisp/org.el index c29ef11..bf6daab 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8854,7 +8854,7 @@ This command can be called in any mode to insert a link in Org-mode syntax. (org-load-modules-maybe) (org-run-like-in-org-mode 'org-insert-link)) -(defun org-insert-link (optional complete-file link-location) +(defun org-insert-link (optional complete-file link-location default-description) Insert a link. At the prompt, enter the link. Completion can be used to insert any of the link protocol prefixes like @@ -8890,7 +8890,10 @@ called with the link target, and the result will be the default link description. If the LINK-LOCATION parameter is non-nil, this value will be -used as the link location instead of reading one interactively. +used as the link location instead of reading one interactively. + +If the DEFAULT-DESCRIPTION parameter is non-nil, this value will +be used as the default description. (interactive P) (let* ((wcf (current-window-configuration)) (region (if (org-region-active-p) @@ -9020,6 +9023,7 @@ Use TAB to complete link prefixes, then RET for type-specific completion support (if org-make-link-description-function (setq desc (funcall org-make-link-description-function link desc))) +(if default-description (setq desc default-description)) (setq desc (read-string Description: desc)) (unless (string-match \\S- desc) (setq desc nil)) (if remove (apply 'delete-region remove))
[O] [Accepted] org-capture and XEmacs, indenting too far
Patch 1002 (http://patchwork.newartisans.com/patch/1002/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cy9lipnhjd8w.fsf%40deinprogramm.de%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] org-capture and XEmacs, indenting too far Date: Sat, 22 Oct 2011 19:46:07 - From: Michael Sperber sper...@deinprogramm.de X-Patchwork-Id: 1002 Message-Id: y9lipnhjd8w@deinprogramm.de To: emacs-orgmode@gnu.org, Robert Pluim rpl...@gmail.com, carsten.domi...@gmail.com Robert Pluim rpl...@gmail.com writes: Hi, I'm using XEmacs 21.5 (beta29) garbanzo d27c1ee1943b+ [Lucid] (i686-pc-cygwin, Mule) of Mon Oct 18 2010 on RPluim, with the following org-capture-templates ((t Todo entry (file+headline ~/org/notes.org Tasks) * TODO %?)) The problem is that for some reason the resulting TODO heading is has 2 extra spaces, and is placed at too deep a level, giving: * Tasks *** TODO a task I've tested this on a fairly recent emacs24 build, and everything works fine there, so this is probably something XEmacs specific. Can anyone suggest any way to track this down (I'd bisect, but I've yet to find a 'good' version)? I finally got around to looking into this: The reason is that, in org-capture mode, `outline-level' is bound to outline.el's function, which is off by one compared to org-mode's. I used this patch to fix it: Could somebody review and maybe apply this? diff --git a/lisp/org-capture.el b/lisp/org-capture.el index e1b8a4f..cfa35d5 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -848,6 +848,7 @@ it. When it is a variable, retrieve the value. Return whatever we get. (goto-char (org-capture-get :pos)) (org-set-local 'org-capture-target-marker (move-marker (make-marker) (point))) + (org-set-local 'outline-level 'org-outline-level) (let* ((template (org-capture-get :template)) (type (org-capture-get :type))) (case type
[O] [Accepted] Variable publishing-directory? (resent with patch as attachment)
Patch 895 (http://patchwork.newartisans.com/patch/895/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C7ipqk3qfxn.fsf%40mack.tetzco.de%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Variable publishing-directory? (resent with patch as attachment) Date: Thu, 18 Aug 2011 13:17:56 - From: Kai Tetzlaff kai.tetzl...@web.de X-Patchwork-Id: 895 Message-Id: 7ipqk3qfxn@mack.tetzco.de To: emacs-orgmode@gnu.org Bastien b...@altern.org writes: Hi Bastien, The patch looks good but I'd like to understand it better. Can you send an example configuration working with your patch? In org-publish-project-alist, i have HTML publishing projects which should be published to different target directories depending on e.g. where emacs is running (which i determine in my init files using the MAC address of the default GW, the name the machine, ...). Here is an example: At home, i publish to a local directory (:publishing-directory ~/tmp/publish-test) but at work i would like to publish directly to a webserver (:publishing-directory /plinkx:doxydoc:~/public_html/publish-test - this is on w32, using tramps PuTTY/plink). To avoid having to change the definition of the publishing project when i change locations i would like to construct the actual value of :publishing-directory by calling a function: (publishing-dir-test :base-directory ~/Documents/Work/RS :recursive t :base-extension org :exclude-tags (intern) :publishing-directory '(expand-file-name publish-test kt:org-default-publishing-dir) :publishing-function org-publish-org-to-html) Depending on the location i'm in, 'kt:org-default-publishing-dir' would be set to either ~/tmp or /plinkx:doxydoc:~/public_html. Without the patch, the example above does not work as the value of :publishing-directory does not get evaluated. Also, please try to send git patch using these conventions: http://orgmode.org/worg/org-contribute.html#sec-5 Thanks a lot! Thanks for the hint. I've attached a revised version of the patch which includes a changelog/commit msg - i hope that works for you. Publish: allow dynamic construction of the publish destination. * org-publish.el (org-publish-file): Added 'eval'ing the value of the :publishing-directory property before using it as destination of the publishing project. This allows to construct the publish destination directory dynamically at run-time using the return value of a function. TINYCHANGE --- lisp/org-publish.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index e2213c5..518c1bf 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -684,7 +684,7 @@ See `org-publish-projects'. (pub-dir (file-name-as-directory (file-truename - (or (plist-get project-plist :publishing-directory) + (or (eval (plist-get project-plist :publishing-directory)) (error Project %s does not have :publishing-directory defined (car project)) tmp-pub-dir) -- 1.7.5.4
[O] [Accepted] [O, 1/5] bind org-export-current-backend in generic exporter.
Patch 996 (http://patchwork.newartisans.com/patch/996/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1319213609-40770-2-git-send-email-rpgoldman%40real-time.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,1/5] bind org-export-current-backend in generic exporter. Date: Fri, 21 Oct 2011 21:13:25 - From: Robert P. Goldman rpgold...@real-time.com X-Patchwork-Id: 996 Message-Id: 1319213609-40770-2-git-send-email-rpgold...@real-time.com To: emacs-orgmode@gnu.org Cc: Robert P. Goldman rpgold...@real-time.com This is needed for org-export-preprocess-string to function correctly. --- contrib/lisp/org-export-generic.el |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el index bb42b60..29e90b8 100644 --- a/contrib/lisp/org-export-generic.el +++ b/contrib/lisp/org-export-generic.el @@ -617,6 +617,7 @@ underlined headlines. The default is 3. (buffer-substring (if (org-region-active-p) (region-beginning) (point-min)) (if (org-region-active-p) (region-end) (point-max + (org-export-current-backend 'org-export-generic) (lines (org-split-string (org-export-preprocess-string region
[O] [Accepted] [O, 2/5] Added trac-wiki and tikiwiki export settings.
Patch 999 (http://patchwork.newartisans.com/patch/999/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1319213609-40770-3-git-send-email-rpgoldman%40real-time.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,2/5] Added trac-wiki and tikiwiki export settings. Date: Fri, 21 Oct 2011 21:13:26 - From: Robert P. Goldman rpgold...@real-time.com X-Patchwork-Id: 999 Message-Id: 1319213609-40770-3-git-send-email-rpgold...@real-time.com To: emacs-orgmode@gnu.org Cc: Robert P. Goldman rpgold...@real-time.com --- contrib/lisp/org-export-generic.el | 107 +++- 1 files changed, 93 insertions(+), 14 deletions(-) diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el index 29e90b8..e3a8680 100644 --- a/contrib/lisp/org-export-generic.el +++ b/contrib/lisp/org-export-generic.el @@ -187,8 +187,8 @@ in this way, it will be wrapped. ; section prefixes/suffixes can be direct strings or lists as well :body-section-prefix secprefix\n :body-section-suffix /secsuffix\n -; :body-section-prefix (sec1\n sec2\n sec3\n) -; :body-section-suffix (/sec1\n /sec2\n /sec3\n) + ;:body-section-prefix (sec1\n sec2\n sec3\n) + ;:body-section-suffix (/sec1\n /sec2\n /sec3\n) ; if preformated text should be included (eg, : prefixed) @@ -263,28 +263,28 @@ in this way, it will be wrapped. :body-header-section-numbers 3 :body-section-prefix \n -; :body-section-header-prefix \n -; :body-section-header-format %s\n -; :body-section-header-suffix (?\$ ?\# ?^ ?\~ ?\= ?\-) + ;:body-section-header-prefix \n + ;:body-section-header-format %s\n + ;:body-section-header-suffix (?\$ ?\# ?^ ?\~ ?\= ?\-) :body-section-header-prefix ( *+ - ) :body-section-header-format %s\n :body-section-header-suffix (?~ ?= ?- \n \n \n) -; :body-section-marker-prefix -; :body-section-marker-chars (?\$ ?\# ?^ ?\~ ?\= ?\-) -; :body-section-marker-suffix \n + ;:body-section-marker-prefix + ;:body-section-marker-chars (?\$ ?\# ?^ ?\~ ?\= ?\-) + ;:body-section-marker-suffix \n :body-line-export-preformated t :body-line-format %s\n :body-line-wrap 75 -; :body-text-prefix t\n -; :body-text-suffix /t\n + ;:body-text-prefix t\n + ;:body-text-suffix /t\n :body-bullet-list-prefix (?* ?+ ?-) -; :body-bullet-list-suffix (?* ?+ ?-) + ;:body-bullet-list-suffix (?* ?+ ?-) ) ;; @@ -350,8 +350,8 @@ in this way, it will be wrapped. :body-section-prefix secprefix\n :body-section-suffix /secsuffix\n -; :body-section-prefix (sec1\n sec2\n sec3\n) -; :body-section-suffix (/sec1\n /sec2\n /sec3\n) + ;:body-section-prefix (sec1\n sec2\n sec3\n) + ;:body-section-suffix (/sec1\n /sec2\n /sec3\n) :body-line-export-preformated t :body-line-format %s\n @@ -360,7 +360,7 @@ in this way, it will be wrapped. :body-text-suffix /p\n :body-bullet-list-prefix (?* ?+ ?-) -; :body-bullet-list-suffix (?* ?+ ?-) + ;:body-bullet-list-suffix (?* ?+ ?-) ) ;; @@ -429,6 +429,85 @@ in this way, it will be wrapped. :body-list-format t%s/t\n ) +(trac-wiki + :file-suffix .txt + :key-binding ?T + + ;; lifted from wikipedia exporter + :header-prefix + :header-suffix + + :title-format = %s =\n + + :date-exportnil + + :toc-exportnil + + :body-header-section-numbers nil + :body-section-prefix \n + + :body-section-header-prefix(== === + = == === ) + :body-section-header-suffix( ==\n\n ===\n\n \n\n +
[O] [Accepted] icalendar: Make alarm duration RFC5545 compliant
Patch 913 (http://patchwork.newartisans.com/patch/913/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1314282867-11165-1-git-send-email-sojka%40os.inf.tu-dresden.de%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] icalendar: Make alarm duration RFC5545 compliant Date: Thu, 25 Aug 2011 19:34:27 - From: Michal Sojka so...@os.inf.tu-dresden.de X-Patchwork-Id: 913 Message-Id: 1314282867-11165-1-git-send-email-so...@os.inf.tu-dresden.de To: b...@altern.org Cc: Michal Sojka so...@os.inf.tu-dresden.de, cdomi...@newartisans.com, emacs-orgmode@gnu.org * org-icalendar.el (org-print-icalendar-entries): Make alarm duration RFC5545 compliant. The format of alarm trigger was incorrect because T letter from dur-time element was missing (see http://tools.ietf.org/html/rfc5545#section-3.3.6). This caused some software (such as KOrganizer) to not interpret the alarms correctly. TINYCHANGE --- lisp/org-icalendar.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el index bc0efce..a3ea88e 100644 --- a/lisp/org-icalendar.el +++ b/lisp/org-icalendar.el @@ -419,7 +419,7 @@ When COMBINE is non nil, add the category to each line. (let ((t1 (ignore-errors (org-parse-time-string ts 'nodefault (if (and ( org-icalendar-alarm-time 0) (car t1) (nth 1 t1) (nth 2 t1)) - (setq alarm (format \nBEGIN:VALARM\nACTION:DISPLAY\nDESCRIPTION:%s\nTRIGGER:-P0D0H%dM0S\nEND:VALARM summary org-icalendar-alarm-time)) + (setq alarm (format \nBEGIN:VALARM\nACTION:DISPLAY\nDESCRIPTION:%s\nTRIGGER:-P0DT0H%dM0S\nEND:VALARM summary org-icalendar-alarm-time)) (setq alarm )) ) (if (string-match org-bracket-link-regexp summary)
[O] [Accepted] org-publish: Fix regexp for include files
Patch 833 (http://patchwork.newartisans.com/patch/833/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1310818927-25567-1-git-send-email-jonas%40ifi.uio.no%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] org-publish: Fix regexp for include files Date: Sat, 16 Jul 2011 17:22:07 - From: Jon Anders Skorpen jo...@ifi.uio.no X-Patchwork-Id: 833 Message-Id: 1310818927-25567-1-git-send-email-jo...@ifi.uio.no To: emacs-orgmode@gnu.org Cc: Jon Anders Skorpen jo...@ifi.uio.no * org-publish.el (org-publish-cache-file-needs-publishing): Regexp did not find includes with double quoted file names. TINYCHANGE --- lisp/org-publish.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index b8e932d..9654a6d 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -1108,7 +1108,7 @@ so that the file including them will be republished as well. (when (equal (file-name-extension filename) org) (find-file (expand-file-name filename)) (goto-char (point-min)) - (while (re-search-forward ^#\\+INCLUDE: \\(.+\\)[ ^\t]*$ nil t) + (while (re-search-forward ^#\\+INCLUDE:[ \t]+\?\\([^ \t\]*\\)\?[ \t]*.*$ nil t) (let* ((included-file (expand-file-name (match-string 1 (add-to-list 'included-files-ctime (org-publish-cache-ctime-of-src included-file) t)
[O] [Accepted] [O, 1/2] org-lparse/org-odt: Add docstring. Silence byte-compiler
Patch 820 (http://patchwork.newartisans.com/patch/820/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C81vcvkoa7a.fsf%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,1/2] org-lparse/org-odt: Add docstring. Silence byte-compiler Date: Sat, 02 Jul 2011 22:37:29 - From: Jambunathan K kjambunat...@gmail.com X-Patchwork-Id: 820 Message-Id: 81vcvkoa7a@gmail.com To: emacs-orgmode@gnu.org Cc: I am attaching two org-odt patches for inclusion. Both are desirable and not mandatory. --- From 38d0dcbc921d69ba55c3a5bb3a219204800370c9 Mon Sep 17 00:00:00 2001 From: Jambunathan K kjambunat...@gmail.com Date: Sat, 2 Jul 2011 16:51:38 +0530 Subject: [PATCH 1/2] org-lparse/org-odt: Add docstring. Silence byte-compiler. * contrib/lisp/org-odt.el (org-odt-unit-test): Removed. This doesn't belong to production code. * contrib/lisp/org-lparse.el (org-lparse-and-open) (org-lparse-to-buffer, org-lparse-backend) (org-lparse-other-backend, org-lparse-body-only) (org-lparse-to-buffer): Update docstring. --- contrib/lisp/org-lparse.el | 52 +-- contrib/lisp/org-odt.el| 11 - 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/contrib/lisp/org-lparse.el b/contrib/lisp/org-lparse.el index cff8fd6..b37b683 100755 --- a/contrib/lisp/org-lparse.el +++ b/contrib/lisp/org-lparse.el @@ -50,8 +50,6 @@ ;;; See README.org file that comes with this library for answers to ;;; FAQs and more information on using this library. -;;; Use M-x `org-odt-unit-test' for test driving the odt exporter - ;;; Code: (require 'org-exp) @@ -59,10 +57,11 @@ ;;;###autoload (defun org-lparse-and-open (target-backend native-backend arg) - Export the outline as HTML and immediately open it with a browser. -If there is an active region, export only the region. -The prefix ARG specifies how many levels of the outline should become -headlines. The default is 3. Lower levels will become bulleted lists. + Export the outline to TARGET-BACKEND via NATIVE-BACKEND and open exported file. +If there is an active region, export only the region. The prefix +ARG specifies how many levels of the outline should become +headlines. The default is 3. Lower levels will become bulleted +lists. ;; (interactive Mbackend: \nP) (interactive (let* ((input (if (featurep 'ido) 'ido-completing-read 'completing-read)) @@ -102,8 +101,9 @@ emacs --batch ;;;###autoload (defun org-lparse-to-buffer (backend arg) - Call `org-lparse` with output to a temporary buffer. -No file is created. The prefix ARG is passed through to `org-lparse'. + Call `org-lparse' with output to a temporary buffer. +No file is created. The prefix ARG is passed through to +`org-lparse'. (interactive Mbackend: \nP) (let ((tempbuf (format *Org %s Export* (upcase backend (org-lparse backend backend arg nil nil tempbuf) @@ -508,9 +508,36 @@ then that converter is used. Otherwise (defvar org-lparse-toc) (defvar org-lparse-entity-control-callbacks-alist) (defvar org-lparse-entity-format-callbacks-alist) -(defvar org-lparse-backend) -(defvar org-lparse-body-only) -(defvar org-lparse-to-buffer) +(defvar org-lparse-backend nil + The native backend to which the document is currently exported. +This variable is let bound during `org-lparse'. Valid values are +one of the symbols corresponding to `org-lparse-native-backends'. + +Compare this variable with `org-export-current-backend' which is +bound only during `org-export-preprocess-string' stage of the +export process. + +See also `org-lparse-other-backend'.) + +(defvar org-lparse-other-backend nil + The target backend to which the document is currently exported. +This variable is let bound during `org-lparse'. This variable is +set to either `org-lparse-backend' or one of the symbols +corresponding to OTHER-BACKENDS specification of the +org-lparse-backend. + +For example, if a document is exported to \odt\ then both +org-lparse-backend and org-lparse-other-backend are bound to +'odt. On the other hand, if a document is exported to \odt\ +and then converted to \doc\ then org-lparse-backend is set to +'odt and org-lparse-other-backend is set to 'doc.) + +(defvar org-lparse-body-only nil + Bind this to BODY-ONLY arg of `org-lparse'.) + +(defvar org-lparse-to-buffer nil + Bind this to TO-BUFFER arg of `org-lparse'.) + (defun org-do-lparse (arg optional hidden ext-plist to-buffer body-only pub-dir) Export the outline to various formats. @@ -1240,6 +1267,7 @@ But it has the disadvantage, that no cell- or row-spanning is allowed. (org-lparse-do-format-table-table lines) (buffer-substring-no-properties
[O] [Accepted] [O, 2/2] doc/org.texi: Add a new node for OpenDocumentText exporter
Patch 821 (http://patchwork.newartisans.com/patch/821/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C81r568oa45.fsf%40gmail.com%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O,2/2] doc/org.texi: Add a new node for OpenDocumentText exporter
Date: Sat, 02 Jul 2011 22:39:22 -
From: Jambunathan K kjambunat...@gmail.com
X-Patchwork-Id: 821
Message-Id: 81r568oa45@gmail.com
To: emacs-orgmode@gnu.org
Cc:
--
From 1177aa67678e2c9b0fd1d65cd0d87436fd63a08e Mon Sep 17 00:00:00 2001
From: Jambunathan K kjambunat...@gmail.com
Date: Sat, 2 Jul 2011 22:40:18 +0530
Subject: [PATCH 2/2] doc/org.texi: Add a new node for OpenDocumentText
exporter
---
doc/org.texi | 180 +++--
1 files changed, 173 insertions(+), 7 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index afa1623..d3753ce 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -574,6 +574,7 @@ Exporting
* HTML export:: Exporting to HTML
* LaTeX and PDF export::Exporting to @LaTeX{}, and processing to PDF
* DocBook export:: Exporting to DocBook
+* OpenDocumentText export:: Exporting to OpenDocumentText
* TaskJuggler export:: Exporting to TaskJuggler
* Freemind export:: Exporting to Freemind mind maps
* XOXO export:: Exporting to XOXO
@@ -610,6 +611,16 @@ DocBook export
* Images in DocBook export::How to insert figures into DocBook output
* Special characters:: How to handle special characters
+OpenDocument export
+
+* OpenDocumentText export commands::How to invoke OpenDocumentText export
+* Applying Custom Styles:: How to apply custom styles to the output
+* Converting to Other formats:: How to convert to formats like doc, docx etc
+* Links in OpenDocumentText export:: How links will be interpreted and
formatted
+* Tables in OpenDocumentText export::How Tables are handled
+* Images in OpenDocumentText export::How to insert figures
+* Additional Documentation:: How to handle special characters
+
Publishing
* Configuration:: Defining projects
@@ -9378,11 +9389,13 @@ the web, while the XOXO format provides a solid base
for exchange with a
broad range of other applications. @LaTeX{} export lets you use Org-mode and
its structured editing functions to easily create @LaTeX{} files. DocBook
export makes it possible to convert Org files to many other formats using
-DocBook tools. For project management you can create gantt and resource
-charts by using TaskJuggler export. To incorporate entries with associated
-times like deadlines or appointments into a desktop calendar program like
-iCal, Org-mode can also produce extracts in the iCalendar format. Currently
-Org-mode only supports export, not import of these different formats.
+DocBook tools. OpenDocumentText export allows seamless colloboration across
+organizational boundaries. For project management you can create gantt and
+resource charts by using TaskJuggler export. To incorporate entries with
+associated times like deadlines or appointments into a desktop calendar
+program like iCal, Org-mode can also produce extracts in the iCalendar
+format. Currently Org-mode only supports export, not import of these
+different formats.
Org supports export of selected regions when @code{transient-mark-mode} is
enabled (default in Emacs 23).
@@ -9395,6 +9408,7 @@ enabled (default in Emacs 23).
* HTML export:: Exporting to HTML
* LaTeX and PDF export::Exporting to @LaTeX{}, and processing to PDF
* DocBook export:: Exporting to DocBook
+* OpenDocumentText export:: Exporting to OpenDocumentText
* TaskJuggler export:: Exporting to TaskJuggler
* Freemind export:: Exporting to Freemind mind maps
* XOXO export:: Exporting to XOXO
@@ -10416,7 +10430,7 @@ Here is a simple example Org document that is
intended for beamer export.
For more information, see the documentation on Worg.
-@node DocBook export, TaskJuggler export, LaTeX and PDF export, Exporting
+@node DocBook export, OpenDocumentText export, LaTeX and PDF export,
Exporting
@section DocBook export
@cindex DocBook export
@cindex PDF export
@@ -10613,7 +10627,156 @@ special characters included in XHTML entities:
@end example
-@node TaskJuggler export, Freemind export, DocBook export, Exporting
+@c begin opendocument
+
+@node OpenDocumentText export, TaskJuggler export, DocBook export, Exporting
+@section OpenDocumentText export
+@cindex OpenDocumentText export
+@cindex K, Jambunathan
+
+Org-mode 7.6 supports export to OpenDocumentText format using
+@file{org-odt.el} module
[O] [Accepted] Add org-lparse and org-odt as contrib modules
Patch 818 (http://patchwork.newartisans.com/patch/818/) is now Accepted. Maintainer comment: Removed org-lparse.el from org-modules This relates to the following submission: http://mid.gmane.org/%3C817h817nfj.fsf%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Add org-lparse and org-odt as contrib modules Date: Sat, 02 Jul 2011 01:31:28 - From: Jambunathan K kjambunat...@gmail.com X-Patchwork-Id: 818 Message-Id: 817h817nfj@gmail.com To: emacs-orgmode@gnu.org -- From 9b97d19c1184d3cf2cc82831e3d29067cf91f014 Mon Sep 17 00:00:00 2001 From: Jambunathan K kjambunat...@gmail.com Date: Sat, 2 Jul 2011 01:56:01 +0530 Subject: [PATCH] Add org-lparse and org-odt as contrib modules * lisp/org.el (org-modules): Add org-lparse and org-odt as contrib modules. * contrib/README: Ditto --- contrib/README |2 ++ lisp/org.el|2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/contrib/README b/contrib/README index c076c89..05a2635 100644 --- a/contrib/README +++ b/contrib/README @@ -33,12 +33,14 @@ org-interactive-query.el --- Interactive modification of tags query org-invoice.el --- Help manage client invoices in OrgMode org-jira.el --- Add a jira:ticket protocol to Org org-learn.el --- SuperMemo's incremental learning algorithm +org-lparse.el--- Library for building custom exporters org-mac-iCal.el --- Imports events from iCal.app to the Emacs diary org-mac-link-grabber.el --- Grab links and URLs from various Mac applications org-mairix.el --- Hook mairix search into Org for different MUAs org-man.el--- Support for links to manpages in Org-mode org-mime.el --- org html export for text/html MIME emails org-mtags.el --- Support for some Muse-like tags in Org-mode +org-odt.el--- OpenDocumentText exporter for Org-mode org-panel.el --- Simple routines for us with bad memory org-registry.el --- A registry for Org links org-screen.el--- Visit screen sessions through Org-mode links diff --git a/lisp/org.el b/lisp/org.el index 6824f38..0edeb9d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -329,12 +329,14 @@ to add the symbol `xyz', and the package must have a call to (const :tag C jira: Add a jira:ticket protocol to Org-mode org-jira) (const :tag C learn: SuperMemo's incremental learning algorithm org-learn) + (const :tag C lparse:Library for building custom exporters org-lparse) (const :tag C mairix:Hook mairix search into Org-mode for different MUAs org-mairix) (const :tag C notmuch: Provide org links to notmuch searches or messages org-notmuch) (const :tag C mac-iCal Imports events from iCal.app to the Emacs diary org-mac-iCal) (const :tag C mac-link-grabber Grab links and URLs from various Mac applications org-mac-link-grabber) (const :tag C man: Support for links to manpages in Org-mode org-man) (const :tag C mtags: Support for muse-like tags org-mtags) + (const :tag C odt: OpenDocumentText exporter for Org-mode org-odt) (const :tag C panel: Simple routines for us with bad memory org-panel) (const :tag C registry: A registry for Org-mode links org-registry) (const :tag C org2rem: Convert org appointments into reminders org2rem) -- 1.7.2.3
[O] [Accepted] individual markups for active and inactive time stamps on export
Patch 816 (http://patchwork.newartisans.com/patch/816/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C874o373spj.fsf%40ucl.ac.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] individual markups for active and inactive time stamps on export
Date: Fri, 01 Jul 2011 02:38:48 -
From: Eric S Fraga e.fr...@ucl.ac.uk
X-Patchwork-Id: 816
Message-Id: 874o373spj@ucl.ac.uk
To: emacs-orgmode@gnu.org
Hello again,
okay, I will answer my own post with a possible solution to my feature
request earlier today.
Attached is a patch that does the job; whether it is elegant enough or
not is another question. I've not addressed the documentation at all
yet. I will wait to see what the response to this simple patch might
be...
Thanks,
eric
* Allow for a different markup for inactive time stamps on latex export
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 1baa5f9..694f65b 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -292,6 +292,11 @@ markup defined, the first one in the association list
will be used.
:group 'org-export-latex
:type 'string)
+(defcustom org-export-latex-timestamp-inactive-markup \\textit{%s}
+ A printf format string to be applied to inactive time stamps.
+ :group 'org-export-latex
+ :type 'string)
+
(defcustom org-export-latex-timestamp-keyword-markup \\texttt{%s}
A printf format string to be applied to time stamps.
:group 'org-export-latex
@@ -1613,7 +1618,9 @@ links, keywords, lists, tables, fixed-width
(org-if-unprotected-at (1- (point))
(replace-match
(org-export-latex-protect-string
- (format org-export-latex-timestamp-markup
+ (format (if (string= (substring (match-string 0) 0 1))
+ org-export-latex-timestamp-markup
+org-export-latex-timestamp-inactive-markup)
(substring (org-translate-time (match-string 0)) 1 -1)))
t t)
[O] [Accepted] org-html: fix typo in doc
Patch 813 (http://patchwork.newartisans.com/patch/813/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C20110629103958.2b580e74%40avery%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] org-html: fix typo in doc Date: Wed, 29 Jun 2011 13:39:58 - From: Julian Gehring julian.gehr...@googlemail.com X-Patchwork-Id: 813 Message-Id: 20110629103958.2b580e74@avery To: emacs-orgmode@gnu.org Hi, this patch fixes a typo in the documentation of org-html. Best Julian From 40483bb63d236595d6982dca26a2a3d80bfd39bc Mon Sep 17 00:00:00 2001 From: Julian Gehring julian.gehr...@googlemail.com Date: Wed, 29 Jun 2011 10:31:21 +0200 Subject: [PATCH] org-html: fix typo in doc --- lisp/org-html.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index f6108fc..fd43bbf 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -196,7 +196,7 @@ For example, a valid value would be: ]] /style -If you'd like to refer to en external style file, use something like +If you'd like to refer to an external style file, use something like link rel=\stylesheet\ type=\text/css\ href=\mystyles.css\ -- 1.7.4.1
[O] [Accepted] * org-html.el (org-html-handle-links): add an alternate for inline images
Patch 752 (http://patchwork.newartisans.com/patch/752/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1303202089-27231-1-git-send-email-manuel.giraud%40univ-nantes.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] * org-html.el (org-html-handle-links): add an alternate for inline images Date: Tue, 19 Apr 2011 13:34:49 - From: Manuel Giraud manuel.gir...@univ-nantes.fr X-Patchwork-Id: 752 Message-Id: 1303202089-27231-1-git-send-email-manuel.gir...@univ-nantes.fr To: emacs-orgmode@gnu.org Cc: Manuel Giraud manuel.gir...@univ-nantes.fr --- lisp/org-html.el |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 5d53478..7a4564d 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -888,7 +888,8 @@ OPT-PLIST is the export options list. (if (string-match ^file: desc) (setq desc (substring desc (match-end 0) (setq desc (org-add-props -(concat img src=\ desc \/) +(concat img src=\ desc \ alt=\ +(file-name-nondirectory desc) \/) '(org-protected t (cond ((equal type internal)
[Accepted] [O] Bulk function documentation is missing
Patch 741 (http://patchwork.newartisans.com/patch/741/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3CBANLkTimyjyj%2BF8a%3DknRvFhK6HYRvR1ndVg%40mail.gmail.com%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Bulk function documentation is missing
Date: Fri, 08 Apr 2011 22:04:09 -
From: Puneeth Chaganti puncha...@gmail.com
X-Patchwork-Id: 741
Message-Id: BANLkTimyjyj+F8a=knrvfhk6hyrvr1n...@mail.gmail.com
To: Bernt Hansen be...@norang.ca, emacs-orgmode emacs-orgmode@gnu.org,
Bastien b...@altern.org
Cc:
Hi,
I'd sent it to Bernt alone, on the previous occasion. Re-sending to
everyone. Sorry for the re-post, Bernt.
Hi Bernt,
On Fri, Apr 8, 2011 at 8:52 AM, Bernt Hansen be...@norang.ca
[..]
Could you please also provide documentation in org.texi with an example
of how you use this?
I have attached a patch that documents this function. Please feel free
to improve it.
Thanks,
Puneeth
From 007f723e5bfd11b1d3c0efbb89b32f1955264314 Mon Sep 17 00:00:00 2001
From: Puneeth Chaganti puncha...@gmail.com
Date: Fri, 8 Apr 2011 11:23:31 +0530
Subject: [PATCH] Document option to allow applying a function as Bulk Agenda
action
* doc/org.texi (Agenda commands): Doc for function option to bulk action.
---
doc/org.texi | 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 5ab25b0..d5c7b7b 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -8075,6 +8075,21 @@ s @r{Schedule all items to a new date. To shift
existing schedule dates}
S @r{Reschedule randomly by N days. N will be prompted for. With prefix}
@r{arg (@kbd{C-u B S}), scatter only accross weekdays.}
d @r{Set deadline to a specific date.}
+f @r{Apply a function to marked entries.}
+ @r{For example, the function below sets the CATEGORY property of the}
+ @r{entries to web.}
+ @r{(defun set-category ()}
+ @r{ (interactive P)}
+ @r{ (let* ((marker (or (org-get-at-bol 'org-hd-marker)}
+ @r{ (org-agenda-error)))}
+ @r{(buffer (marker-buffer marker)))}
+ @r{ (with-current-buffer buffer}
+ @r{ (save-excursion}
+ @r{ (save-restriction}
+ @r{ (widen)}
+ @r{ (goto-char marker)}
+ @r{ (org-back-to-heading t)}
+ @r{ (org-set-property CATEGORY web))}
@end example
[Accepted] [O] Protect starred commands in LaTeX export correctly
Patch 712 (http://patchwork.newartisans.com/patch/712/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3Cm3zkom15w6.fsf_-_%40e4300lm.epcc.ed.ac.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Protect starred commands in LaTeX export correctly
Date: Wed, 23 Mar 2011 15:28:04 -
From: Lawrence Mitchell we...@gmx.li
X-Patchwork-Id: 712
Message-Id: m3zkom15w6.fsf...@e4300lm.epcc.ed.ac.uk
To: emacs-orgmode@gnu.org
* lisp/org-latex.el (org-export-latex-preprocess): Correctly
match starred command names.
Many LaTeX commands exist in both normal and starred forms. Adjust
the regexp in `org-export-latex-preprocess' to match the starred form
as well.
---
lisp/org-latex.el |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Eric S Fraga wrote:
Eric Abrahamsen e...@ericabrahamsen.net writes:
Hi,
In a certain org file I put this line into the export options:
#+begin_src org-mode
#+TEXT: \vspace*{0.5in}
#+end_src
Should this not be
#+LATEX: \vspace*{0.5in}
instead of TEXT?
[...]
One could argue that the latex escaping that org does should
include *'ed commands as well... but this may have other repercussions
that I am not aware of.
Indeed it probably should, here's a patch that does exactly that,
avoiding the need for the above workaround. With this change
\vspace*{1cm} is correctly exported like \vspace{1cm}.
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 2acc169..912ebba 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -2364,7 +2364,7 @@ The conversion is made depending of STRING-BEFORE and
STRING-AFTER.
;; Protect LaTeX commands like \command[...]{...} or \command{...}
(goto-char (point-min))
(let ((re (concat
- \\([a-zA-Z]+\\)
+ \\([a-zA-Z]+\\*?\\)
\\(?:[^\n]*\\)*
\\(?:\\[[^][\n]*?\\]\\)*
\\(?:[^\n]*\\)*
[Accepted] [O] Allow mixed export of numbered and unnumbered sections in LaTeX
Patch 710 (http://patchwork.newartisans.com/patch/710/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3Cm3aagn2pi7.fsf_-_%40e4300lm.epcc.ed.ac.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Allow mixed export of numbered and unnumbered sections in LaTeX
Date: Tue, 22 Mar 2011 19:26:14 -
From: Lawrence Mitchell we...@gmx.li
X-Patchwork-Id: 710
Message-Id: m3aagn2pi7.fsf...@e4300lm.epcc.ed.ac.uk
To: emacs-orgmode@gnu.org
* lisp/org-latex.el (org-export-latex-subcontent): Deal specially with
the case that NUM is an integer.
We would sometimes like to have numbered \sections in LaTeX export but
unnumbered \subsections and so forth. That is, use the starred
equivalents for all sectioning commands below a certain level.
Previously, the num: option specification could only specify whether
sections should be numbered or unnumbered at all levels. We now treat
an integer value specially, if num:N is supplied then the highest N
levels are numbered, and lower levels are exported without numbering.
---
lisp/org-latex.el |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
[...]
Wouldn't it be nice if #+OPTIONS: num:2 exported
\section{foo}
\subsection{bar}
\subsubsection*{baz}
It turns out the patch is relatively straightforward. I haven't
included a doc update, but could do so if required.
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index fbdeb5e..7a3c629 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1151,7 +1151,9 @@ and its content.
(defun org-export-latex-subcontent (subcontent num)
Export each cell of SUBCONTENT to LaTeX.
-If NUM, export sections as numerical sections.
+If NUM is non-nil export numbered sections, otherwise use unnumbered
+sections. If NUM is an integer, export the highest NUM levels as
+numbered sections and lower levels as unnumbered sections.
(let* ((heading (cdr (assoc 'heading subcontent)))
(level (- (cdr (assoc 'level subcontent))
org-export-latex-add-level))
@@ -1187,6 +1189,9 @@ If NUM, export sections as numerical sections.
;; Normal conversion
((= level depth)
(let* ((sec (nth (1- level) sectioning))
+ (num (if (integerp num)
+ (= num level)
+ num))
start end)
(if (consp (cdr sec))
(setq start (nth (if num 0 2) sec)
[Accepted] [O] Allow mixed export of numbered and unnumbered sections in HTML
Patch 711 (http://patchwork.newartisans.com/patch/711/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm34o6u2mwf.fsf_-_%40e4300lm.epcc.ed.ac.uk%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Allow mixed export of numbered and unnumbered sections in HTML Date: Wed, 23 Mar 2011 14:38:18 - From: Lawrence Mitchell we...@gmx.li X-Patchwork-Id: 711 Message-Id: m34o6u2mwf.fsf...@e4300lm.epcc.ed.ac.uk To: emacs-orgmode@gnu.org * lisp/org-html.el (org-export-as-html): Get local value of org-export-with-section-numbers from the buffer's plist. Deal specially with the case the resulting value is an integer. (org-html-level-start): New optional argument of the option plist used instead of `org-export-with-section-numbers'. Also deal specially with the case that the value is an integer. When `org-export-with-section-numbers' (or the buffer-local :section-numbers option) is an integer, we now export the first NUM levels of headings with numbers and lower-level headings without. --- lisp/org-html.el | 24 ++-- 1 files changed, 18 insertions(+), 6 deletions(-) Nick Dokos wrote: Suvayu Ali fatkasuvayu+li...@gmail.com wrote: This works too, but Lawrence's patch makes it much easier and probably works for other export formats too. Thanks a lot. :) As Nick points out, each exporter backend needs a similar change. No doubt Lawrence's patch can be extended to work for other exports, but it's not there yet: each exporter would need a change similar to the one that he made to the LaTeX exporter. Here's the matching change to the HTML exporter, which is the only other one I'm familiar with. Maintainers, if you don't want the special-casing on integerp, the change to move from `org-export-with-section-numbers' to (plist-get opt-plist :section-numbers) is the correct one anyway. I can split the patches if required. diff --git a/lisp/org-html.el b/lisp/org-html.el index b13fb93..06305f6 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1150,6 +1150,7 @@ PUB-DIR is set, use this as the publishing directory. (language(plist-get opt-plist :language)) (keywords(plist-get opt-plist :keywords)) (description (plist-get opt-plist :description)) + (num (plist-get opt-plist :section-numbers)) (lang-words nil) (head-count 0) cnt (start 0) @@ -1355,7 +1356,7 @@ lang=\%s\ xml:lang=\%s\ (if (string-match quote-re0 txt) (setq txt (replace-match t t txt))) (setq snumber (org-section-number level)) -(if org-export-with-section-numbers +(if (and num (integerp num) (= num level)) (setq txt (concat snumber txt))) (if (= level (max umax umax-toc)) (setq head-count (+ head-count 1))) @@ -1591,7 +1592,7 @@ lang=\%s\ xml:lang=\%s\ (setq first-heading-pos (or first-heading-pos (point))) (org-html-level-start level txt umax (and org-export-with-toc (= level umax)) - head-count) + head-count opt-plist) ;; QUOTES (when (string-match quote-re line) @@ -1684,7 +1685,7 @@ lang=\%s\ xml:lang=\%s\ (org-html-level-start 1 nil umax (and org-export-with-toc (= level umax)) - head-count) + head-count opt-plist) ;; the /div to close the last text-... div. (when (and ( umax 0) first-heading-pos) (insert /div\n)) @@ -2330,7 +2331,7 @@ If there are links in the string, don't modify these. (insert (if (equal type d) /dd\n /li\n))) (defvar body-only) ; dynamically scoped into this. -(defun org-html-level-start (level title umax with-toc head-count) +(defun org-html-level-start (level title umax with-toc head-count optional opt-plist) Insert a new level in HTML export. When TITLE is nil, just close all open levels. (org-close-par-maybe) @@ -2341,6 +2342,7 @@ When TITLE is nil, just close all open levels. (preferred (and target (cdr (assoc target org-export-preferred-target-alist (l org-level-max) + (num (plist-get opt-plist :section-numbers)) snumber snu href suffix) (setq extra-targets (remove (or preferred target) extra-targets)) (setq extra-targets @@ -2395,10 +2397,20 @@ When TITLE is nil, just close all open levels. (setq snumber (org-section-number level) snu
[Accepted] [O] Fix html export of footnotes with lists, tables, quotes, etc.
Patch 700 (http://patchwork.newartisans.com/patch/700/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3CAANLkTi%3DbFiJvyJZy4vsEvP%2BbMDastWXSB6u72LDPLVqs%40mail.gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Fix html export of footnotes with lists, tables, quotes, etc. Date: Fri, 18 Mar 2011 16:52:05 - From: Puneeth Chaganti puncha...@gmail.com X-Patchwork-Id: 700 Message-Id: AANLkTi=bfijvyjzy4vsevp+bmdastwxsb6u72ldpl...@mail.gmail.com To: emacs-orgmode emacs-orgmode@gnu.org Hi, Attached is a patch that allows having lists, tables, blockquotes and other org blocks in footnotes. Source code blocks still don't work. diff --git a/lisp/org-html.el b/lisp/org-html.el index c6f26b5..11ef9ef 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1690,9 +1690,12 @@ lang=\%s\ xml:lang=\%s\ (save-excursion (goto-char (point-min)) - (while (re-search-forward p class=\footnote\[^\000]*?\\(/p\\|\\'\\) nil t) - (push (match-string 0) footnotes) - (replace-match t t))) + (while (re-search-forward + \\(\\(p class=\footnote\\\)[^\000]*?\\)\\(\\(\\2\\)\\|\\'\\) + nil t) + (push (match-string 1) footnotes) + (replace-match \\4 t nil) + (goto-char (match-beginning 0 (when footnotes (insert (format org-export-html-footnotes-section (nth 4 lang-words)
[Accepted] [O] org-clock-report to insert a :scope sutree report when called from within a subtree?
Patch 696 (http://patchwork.newartisans.com/patch/696/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C874o72koig.fsf%40altern.org%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] org-clock-report to insert a :scope sutree report when called from within a subtree? Date: Thu, 17 Mar 2011 15:52:23 - From: Bastien Guerry b...@altern.org X-Patchwork-Id: 696 Message-Id: 874o72koig@altern.org To: emacs-orgmode@gnu.org Hi all, The default when creating a clock report is to use :scope file. I find it not practical for big files, where the report can take long to build. I'm thinking of applying this change: when called from within a subtree, `C-c C-x C-r' will insert a clock report with :scope subtree, and use :scope subtree elsewhere. Please let me know if you think that's a bad idea. diff --git a/lisp/org-clock.el b/lisp/org-clock.el index c567a26..87b175c 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1652,7 +1652,10 @@ fontified, and then returned. (defun org-clock-report (optional arg) Create a table containing a report about clocked time. If the cursor is inside an existing clocktable block, then the table -will be updated. If not, a new clocktable will be inserted. +will be updated. If not, a new clocktable will be inserted. The scope +of the new clock will be subtree when called from within a subtree, and +file elsewhere. + When called with a prefix argument, move to the first clock table in the buffer and update it. (interactive P) @@ -1662,8 +1665,12 @@ buffer and update it. (org-show-entry)) (if (org-in-clocktable-p) (goto-char (org-in-clocktable-p)) -(org-create-dblock (append (list :name clocktable) -org-clock-clocktable-default-properties))) +(let ((props (if (ignore-errors +(save-excursion (org-back-to-heading))) + (list :name clocktable :scope 'subtree) +(list :name clocktable + (org-create-dblock + (org-combine-plists org-clock-clocktable-default-properties props (org-update-dblock)) (defun org-in-clocktable-p ()
[O] [Accepted] [O, 1/3] Replace recursive implementation with an iterative one
Patch 707 (http://patchwork.newartisans.com/patch/707/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1300720268-9375-2-git-send-email-christian.egli%40alumni.ethz.ch%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,1/3] Replace recursive implementation with an iterative one Date: Mon, 21 Mar 2011 20:11:06 - From: Christian Egli christian.e...@alumni.ethz.ch X-Patchwork-Id: 707 Message-Id: 1300720268-9375-2-git-send-email-christian.e...@alumni.ethz.ch To: emacs-orgmode@gnu.org Cc: Christian Egli christian.e...@sbszh.ch From: Christian Egli christian.e...@sbszh.ch * org-taskjuggler.el (org-taskjuggler-assign-resource-ids): Replace recursive implementation with an iterative one. That way we can avoid to have ask users to increase `max-lisp-eval-depth'. --- lisp/org-taskjuggler.el | 16 +++- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index 9c88f5d..279f46d 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -418,15 +418,13 @@ deeper), then it's not a leaf. (defun org-taskjuggler-assign-resource-ids (resources) Given a list of resources return the same list, assigning a unique id to each resource. - (cond - ((null resources) nil) - (t -(let* ((resource (car resources)) -(unique-id (org-taskjuggler-get-unique-id resource unique-ids))) - (push (cons unique-id unique-id) resource) - (cons resource - (org-taskjuggler-assign-resource-ids (cdr resources) - (cons unique-id unique-ids))) + (let (unique-ids new-list) +(dolist (resource resources new-list) + (let ((unique-id (org-taskjuggler-get-unique-id resource unique-ids))) + (push (cons unique-id unique-id) resource) + (push unique-id unique-ids) + (push resource new-list))) +(nreverse new-list))) (defun org-taskjuggler-resolve-dependencies (tasks) (let ((previous-level 0)
[O] [Accepted] [O, 1/3] Replace recursive implementation with an iterative one
Patch 707 (http://patchwork.newartisans.com/patch/707/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1300720268-9375-2-git-send-email-christian.egli%40alumni.ethz.ch%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,1/3] Replace recursive implementation with an iterative one Date: Mon, 21 Mar 2011 20:11:06 - From: Christian Egli christian.e...@alumni.ethz.ch X-Patchwork-Id: 707 Message-Id: 1300720268-9375-2-git-send-email-christian.e...@alumni.ethz.ch To: emacs-orgmode@gnu.org Cc: Christian Egli christian.e...@sbszh.ch From: Christian Egli christian.e...@sbszh.ch * org-taskjuggler.el (org-taskjuggler-assign-resource-ids): Replace recursive implementation with an iterative one. That way we can avoid to have ask users to increase `max-lisp-eval-depth'. --- lisp/org-taskjuggler.el | 16 +++- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index 9c88f5d..279f46d 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -418,15 +418,13 @@ deeper), then it's not a leaf. (defun org-taskjuggler-assign-resource-ids (resources) Given a list of resources return the same list, assigning a unique id to each resource. - (cond - ((null resources) nil) - (t -(let* ((resource (car resources)) -(unique-id (org-taskjuggler-get-unique-id resource unique-ids))) - (push (cons unique-id unique-id) resource) - (cons resource - (org-taskjuggler-assign-resource-ids (cdr resources) - (cons unique-id unique-ids))) + (let (unique-ids new-list) +(dolist (resource resources new-list) + (let ((unique-id (org-taskjuggler-get-unique-id resource unique-ids))) + (push (cons unique-id unique-id) resource) + (push unique-id unique-ids) + (push resource new-list))) +(nreverse new-list))) (defun org-taskjuggler-resolve-dependencies (tasks) (let ((previous-level 0)
[O] [Accepted] [O,2/3] Fix allocations handling for tj3
Patch 708 (http://patchwork.newartisans.com/patch/708/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1300720268-9375-3-git-send-email-christian.egli%40alumni.ethz.ch%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,2/3] Fix allocations handling for tj3 Date: Mon, 21 Mar 2011 20:11:07 - From: Christian Egli christian.e...@alumni.ethz.ch X-Patchwork-Id: 708 Message-Id: 1300720268-9375-3-git-send-email-christian.e...@alumni.ethz.ch To: emacs-orgmode@gnu.org Cc: Christian Egli christian.e...@sbszh.ch From: Christian Egli christian.e...@sbszh.ch * org-taskjuggler.el (org-taskjuggler-open-task): Only emit a purge allocations statement if we are not targeting tj3. --- lisp/org-taskjuggler.el |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index 279f46d..bcf2c45 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -660,8 +660,8 @@ org-mode priority string. (format depends %s\n previous-sibling) (and depends (format depends %s\n depends))) (and allocate (format purge %s\n allocate %s\n - (or (and (org-taskjuggler-targeting-tj3-p) allocations) - allocate) + (or (and (org-taskjuggler-targeting-tj3-p) allocate) + allocations) allocate)) (and complete (format complete %s\n complete)) (and effort (format effort %s\n effort))
[O] [Accepted] [O,3/3] Fix a typo in the commentary.
Patch 706 (http://patchwork.newartisans.com/patch/706/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1300720268-9375-4-git-send-email-christian.egli%40alumni.ethz.ch%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,3/3] Fix a typo in the commentary. Date: Mon, 21 Mar 2011 20:11:08 - From: Christian Egli christian.e...@alumni.ethz.ch X-Patchwork-Id: 706 Message-Id: 1300720268-9375-4-git-send-email-christian.e...@alumni.ethz.ch To: emacs-orgmode@gnu.org Cc: Christian Egli christian.e...@sbszh.ch From: Christian Egli christian.e...@sbszh.ch * org-taskjuggler.el: Fix a typo in the commentary. --- lisp/org-taskjuggler.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index bcf2c45..f891634 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -144,7 +144,7 @@ ;; - Look at org-file-properties, org-global-properties and ;; org-global-properties-fixed ;; - What about property inheritance and org-property-inherit-p? -;; - Use TYP_TODO as an way to assign resources +;; - Use TYPE_TODO as an way to assign resources ;; - Make sure multiple dependency definitions (i.e. BLOCKER on ;; previous-sibling and on a specific task_id) in multiple ;; attributes are properly exported.
[Accepted] [O] Tiny docstring fix in org-footnote.el
Patch 699 (http://patchwork.newartisans.com/patch/699/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3CAANLkTimwvM19SrZhMiebE390MZP6%3Dym497oVFz5a4RJ6%40mail.gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Tiny docstring fix in org-footnote.el Date: Fri, 18 Mar 2011 16:44:44 - From: Puneeth Chaganti puncha...@gmail.com X-Patchwork-Id: 699 Message-Id: AANLkTimwvM19SrZhMiebE390MZP6=ym497ovfz5a4...@mail.gmail.com To: emacs-orgmode emacs-orgmode@gnu.org Hi, A tiny docstring fix in org-footnote.el diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 9dbd6be..90147d2 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -160,7 +160,7 @@ If yes, return the beginning position, the label, and the definition, if local. (defun org-footnote-at-definition-p () Is the cursor at a footnote definition. This matches only pure definitions like [1] or [fn:name] at the beginning -of a line. It does not a references like [fn:name:definition], where the +of a line. It does not match references like [fn:name:definition], where the footnote text is included and defined locally. The return value will be nil if not at a footnote definition, and a list with start and label of the footnote if there is a definition at point.
[Accepted] [O] Prevent creation of duplicate footnote sections.
Patch 679 (http://patchwork.newartisans.com/patch/679/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87zkozi2j5.fsf%40fastmail.fm%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Prevent creation of duplicate footnote sections. Date: Fri, 11 Mar 2011 18:49:06 - From: Matt Lundin m...@imapmail.org X-Patchwork-Id: 679 Message-Id: 87zkozi2j5@fastmail.fm To: Org Mode emacs-orgmode@gnu.org * lisp/org-footnote.el: (org-footnote-create-definition): Allow for footnote sections above the current footnote insertion point. Fixes bug in which org-mode will create a new footnote section if the current footnote section is not beneath the current insertion point. --- lisp/org-footnote.el |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 0524b41..2ce6668 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -291,6 +291,7 @@ or new, let the user edit the definition of the footnote. ;; No section, put footnote into the current outline node nil ;; Try to find or make the special node + (goto-char (point-min)) (setq re (concat ^\\*+[ \t]+ org-footnote-section [ \t]*$)) (unless (or (re-search-forward re nil t) (and (progn (widen) t)
[Accepted] [O] contrib/lisp/org-export-generic.el
Patch 690 (http://patchwork.newartisans.com/patch/690/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C8870.1300249919%40alphaville.dokosmarshall.org%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] contrib/lisp/org-export-generic.el Date: Wed, 16 Mar 2011 09:31:59 - From: Nick Dokos nicholas.do...@hp.com X-Patchwork-Id: 690 Message-Id: 8870.1300249...@alphaville.dokosmarshall.org To: emacs-orgmode@gnu.org Cc: nicholas.do...@hp.com Wes Hardaker's generic exported in contrib/lisp needs a small changed to make it compatible with the :for-backend generic parameter introduced in commit ed6d6760268a18ff5c49f4d98b433f6cf9500e1e. diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el index f518dd1..9abaffd 100644 --- a/contrib/lisp/org-export-generic.el +++ b/contrib/lisp/org-export-generic.el @@ -620,7 +620,7 @@ underlined headlines. The default is 3. (lines (org-split-string (org-export-preprocess-string region - :for-ascii t + :for-backend 'ascii :skip-before-1st-heading (plist-get opt-plist :skip-before-1st-heading) :drawers (plist-get export-plist :drawers-export)
[Accepted] [O] New option to create unique, random labels for footnotes.
Patch 680 (http://patchwork.newartisans.com/patch/680/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87y64ji2hj.fsf%40fastmail.fm%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] New option to create unique, random labels for footnotes. Date: Fri, 11 Mar 2011 18:50:59 - From: Matt Lundin m...@imapmail.org X-Patchwork-Id: 680 Message-Id: 87y64ji2hj@fastmail.fm To: Org Mode emacs-orgmode@gnu.org * lisp/org-footnote.el: (org-footnote-auto-label): New random option * lisp/org-footnote.el: (org-footnote-new): Create random footnote labels with unique ids --- lisp/org-footnote.el | 16 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 2ce6668..9dbd6be 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -113,12 +113,14 @@ t create unique labels of the form [fn:1], [fn:2], ... confirmlike t, but let the user edit the created value. In particular, the label can be removed from the minibuffer, to create an anonymous footnote. +random Automatically generate a unique, random label. plain Automatically create plain number labels like [1] :group 'org-footnote :type '(choice (const :tag Prompt for label nil) (const :tag Create automatic [fn:N] t) (const :tag Offer automatic [fn:N] for editing confirm) + (const :tag Create a random label random) (const :tag Create automatic [N] plain))) (defcustom org-footnote-auto-adjust nil @@ -253,16 +255,22 @@ This command prompts for a label. If this is a label referencing an existing label, only insert the label. If the footnote label is empty or new, let the user edit the definition of the footnote. (interactive) - (let* ((labels (org-footnote-all-labels)) + (let* ((labels (and (not (equal org-footnote-auto-label 'random)) + (org-footnote-all-labels))) (propose (org-footnote-unique-label labels)) (label - (if (member org-footnote-auto-label '(t plain)) - propose + (cond +((member org-footnote-auto-label '(t plain)) + propose) +((equal org-footnote-auto-label 'random) + (require 'org-id) + (substring (org-id-uuid) 0 8)) +(t (completing-read Label (leave empty for anonymous): (mapcar 'list labels) nil nil (if (eq org-footnote-auto-label 'confirm) propose nil) - 'org-footnote-label-history + 'org-footnote-label-history) (setq label (org-footnote-normalize-label label)) (cond ((equal label )
[Accepted] [O] Goto correct footnote insertion point in org-mode buffers
Patch 678 (http://patchwork.newartisans.com/patch/678/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C871v2bjh4z.fsf%40fastmail.fm%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Goto correct footnote insertion point in org-mode buffers Date: Fri, 11 Mar 2011 18:47:08 - From: Matt Lundin m...@imapmail.org X-Patchwork-Id: 678 Message-Id: 871v2bjh4z@fastmail.fm To: Org Mode emacs-orgmode@gnu.org * lisp/org-footnote.el: (org-footnote-create-definition): Don't search for last footnote when in org-mode file. The recent changes to accommodate signatures in message-mode instruct org-mode to search for the last footnote in the entire buffer when inserting a new footnote definition. This causes problems in org buffers, since org-footnote-goto-local-insertion-point already finds the correct insertion point. (I.e., the insertion point is always placed in beneath the last footnote in the buffer, even if org-footnote-section is nil.) This patch invokes the search only if in non org-mode buffers. --- lisp/org-footnote.el |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index f2b3489..0524b41 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -310,10 +310,10 @@ or new, let the user edit the definition of the footnote. (skip-chars-backward \t\r\n) (delete-region (point) max) (insert \n\n) - (insert org-footnote-tag-for-non-org-mode-files \n) -;; Skip existing footnotes -(while (re-search-forward ^[[:space:]]*\\[[^]]+\\] nil t) - (forward-line)) + (insert org-footnote-tag-for-non-org-mode-files \n))) + ;; Skip existing footnotes + (while (re-search-forward ^[[:space:]]*\\[[^]]+\\] nil t) + (forward-line (insert \n[ label ] \n) (goto-char (1- (point))) (message Edit definition and go back with `C-c ' or, if unique, with `C-c C-c'.)))
[O] [Accepted] [O, 1/5] Add some minimal infrastructure to handle export to both tj2 and tj3
Patch 691 (http://patchwork.newartisans.com/patch/691/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1300273502-12977-2-git-send-email-christian.egli%40alumni.ethz.ch%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O, 1/5] Add some minimal infrastructure to handle export to both tj2 and tj3 Date: Wed, 16 Mar 2011 16:04:58 - From: Christian Egli christian.e...@alumni.ethz.ch X-Patchwork-Id: 691 Message-Id: 1300273502-12977-2-git-send-email-christian.e...@alumni.ethz.ch To: emacs-orgmode@gnu.org * org-taskjuggler.el (org-export-taskjuggler-target-version): (org-taskjuggler-targeting-tj3-p): Add some minimal infrastructure to handle export to both tj2 and tj3. (org-taskjuggler-open-task): Use a different way to purge allocations for tj2 and tj3. --- lisp/org-taskjuggler.el | 14 +- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index 8d6318e..ec6bb30 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -181,6 +181,11 @@ resources for the project. :group 'org-export-taskjuggler :type 'string) +(defcustom org-export-taskjuggler-target-version 2.4 + Which version of TaskJuggler the exporter is targeting. + :group 'org-export-taskjuggler + :type 'number) + (defcustom org-export-taskjuggler-default-project-version 1.0 Default version string for the project. :group 'org-export-taskjuggler @@ -331,6 +336,10 @@ with the TaskJuggler GUI. (command (concat process-name file-name))) (start-process-shell-command process-name nil command))) +(defun org-taskjuggler-targeting-tj3-p () + Return true if we are targeting TaskJuggler III. + ( org-export-taskjuggler-target-version 3.0)) + (defun org-taskjuggler-parent-is-ordered-p () Return true if the parent of the current node has a property \ORDERED\. Return nil otherwise. @@ -623,7 +632,10 @@ org-mode priority string. (if (and parent-ordered previous-sibling) (format depends %s\n previous-sibling) (and depends (format depends %s\n depends))) - (and allocate (format purge allocations\n allocate %s\n allocate)) + (and allocate (format purge %s\n allocate %s\n + (or (and (org-taskjuggler-targeting-tj3-p) allocations) + allocate) + allocate)) (and complete (format complete %s\n complete)) (and effort (format effort %s\n effort)) (and priority (format priority %s\n priority))
[O] [Accepted] [O, 2/5] Mark a task as a milestone if it is a leaf node and cannot be scheduled
Patch 695 (http://patchwork.newartisans.com/patch/695/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1300273502-12977-3-git-send-email-christian.egli%40alumni.ethz.ch%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O, 2/5] Mark a task as a milestone if it is a leaf node and cannot
be
scheduled
Date: Wed, 16 Mar 2011 16:04:59 -
From: Christian Egli christian.e...@alumni.ethz.ch
X-Patchwork-Id: 695
Message-Id: 1300273502-12977-3-git-send-email-christian.e...@alumni.ethz.ch
To: emacs-orgmode@gnu.org
* org-taskjuggler.el (org-taskjuggler-compute-task-leafiness): Compute
the leafiness of a node.
(org-taskjuggler-open-task, org-export-as-taskjuggler): Mark a node as
a milestone if it is a leaf and has no effort.
Mark a task as a milestone if it has neither an effort, a duration, an
end or a period. This is needed for tj3 export as tj3 fails to compile
the file if there is a leaf node with no computable end date. tj2
happily ignored the situation, but TJ3 throws an error.
---
lisp/org-taskjuggler.el | 37 +++--
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el
index ec6bb30..2d16790 100644
--- a/lisp/org-taskjuggler.el
+++ b/lisp/org-taskjuggler.el
@@ -263,9 +263,10 @@ defined in `org-export-taskjuggler-default-reports'.
(let* ((tasks
(org-taskjuggler-resolve-dependencies
(org-taskjuggler-assign-task-ids
- (org-map-entries
- '(org-taskjuggler-components)
- org-export-taskjuggler-project-tag nil 'archive 'comment
+ (org-taskjuggler-compute-task-leafiness
+ (org-map-entries
+ '(org-taskjuggler-components)
+ org-export-taskjuggler-project-tag nil 'archive 'comment)
(resources
(org-taskjuggler-assign-resource-ids
(org-map-entries
@@ -392,6 +393,23 @@ a path to the current task.
(setq previous-level level)
(setq resolved-tasks (append resolved-tasks (list task)))
+(defun org-taskjuggler-compute-task-leafiness (tasks)
+ Figure out if each task is a leaf by looking at it's level,
+and the level of its successor. If the successor is higher (ie
+deeper), then it's not a leaf.
+ (cond
+ ((null tasks) nil)
+ ;; if a task has no successors it is a leaf
+ ((null (car (cdr tasks)))
+(cons (cons (cons leaf-node t) (car tasks))
+ (org-taskjuggler-compute-task-leafiness (cdr tasks
+ ;; if the successor has a lower level than task it is a leaf
+ ((= (cdr (assoc level (car (cdr tasks (cdr (assoc level (car
tasks
+(cons (cons (cons leaf-node t) (car tasks))
+ (org-taskjuggler-compute-task-leafiness (cdr tasks
+ ;; otherwise examine the rest of the tasks
+ (t (cons (car tasks) (org-taskjuggler-compute-task-leafiness (cdr
tasks))
+
(defun org-taskjuggler-assign-resource-ids (resources optional unique-ids)
Given a list of resources return the same list, assigning a
unique id to each resource.
@@ -621,11 +639,17 @@ org-mode priority string.
(cdr (assoc complete task
(parent-ordered (cdr (assoc parent-ordered task)))
(previous-sibling (cdr (assoc previous-sibling task)))
+ (milestone (or (cdr (assoc milestone task))
+(and (assoc leaf-node task)
+ (not (or effort
+ (cdr (assoc duration task))
+ (cdr (assoc end task))
+ (cdr (assoc period task)))
(attributes
'(account start note duration endbuffer endcredit end
-flags journalentry length maxend maxstart milestone
-minend minstart period reference responsible
-scheduling startbuffer startcredit statusnote)))
+flags journalentry length maxend maxstart minend
+minstart period reference responsible scheduling
+startbuffer startcredit statusnote)))
(insert
(concat
task unique-id \ headline \ {\n
@@ -639,6 +663,7 @@ org-mode priority string.
(and complete (format complete %s\n complete))
(and effort (format effort %s\n effort))
(and priority (format priority %s\n priority))
+ (and milestone (format milestone\n))
(org-taskjuggler-get-attributes task attributes)
\n
[O] [Accepted] [O,5/5] Escape double quotes in headlines
Patch 692 (http://patchwork.newartisans.com/patch/692/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1300273502-12977-6-git-send-email-christian.egli%40alumni.ethz.ch%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,5/5] Escape double quotes in headlines Date: Wed, 16 Mar 2011 16:05:02 - From: Christian Egli christian.e...@alumni.ethz.ch X-Patchwork-Id: 692 Message-Id: 1300273502-12977-6-git-send-email-christian.e...@alumni.ethz.ch To: emacs-orgmode@gnu.org * org-taskjuggler.el (org-taskjuggler-components): Escape quotes in headlines. Taskjuggler will barf if the task names (which are double quoted strings) contain double quotes. --- lisp/org-taskjuggler.el |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index b39353c..ed3af48 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -354,7 +354,9 @@ information, all the properties, etc. (let* ((props (org-entry-properties)) (components (org-heading-components)) (level (nth 1 components)) - (headline (nth 4 components)) + (headline + (replace-regexp-in-string +\ \\\ (nth 4 components) t t)) ; quote double quotes in headlines (parent-ordered (org-taskjuggler-parent-is-ordered-p))) (push (cons level level) props) (push (cons headline headline) props)
[Accepted] [O] Fix for infinite loop in org-html-protect
Patch 674 (http://patchwork.newartisans.com/patch/674/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C19834.23619.813886.886825%40gargle.gargle.HOWL%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Fix for infinite loop in org-html-protect Date: Fri, 11 Mar 2011 22:30:43 - From: Kim Rutherford km...@cam.ac.uk X-Patchwork-Id: 674 Message-Id: 19834.23619.813886.886...@gargle.gargle.howl To: emacs-orgmode@gnu.org 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 km...@cam.ac.uk Date: Fri, 11 Mar 2011 16:44:09 + Subject: [PATCH] Fix infinite loop in org-html-protect --- lisp/org-html.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index c60c90d..2312b21 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -2186,7 +2186,7 @@ Possible conversions are set in `org-export-html-protect-char-alist'. (let ((start 0)) (while (string-match (car c) s start) (setq s (replace-match (cdr c) t t s) - start (match-beginning 0) + start (1+ (match-beginning 0)) s)) (defun org-html-expand (string)
[O] [Accepted] [O, 2/2] Allow clocking in new tasks inserted before the current clocking task
Patch 669 (http://patchwork.newartisans.com/patch/669/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1299721221-10196-3-git-send-email-bernt%40norang.ca%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O, 2/2] Allow clocking in new tasks inserted before the current clocking task Date: Thu, 10 Mar 2011 06:40:21 - From: Bernt Hansen be...@norang.ca X-Patchwork-Id: 669 Message-Id: 1299721221-10196-3-git-send-email-be...@norang.ca To: emacs-orgmode@gnu.org Cc: Bernt Hansen be...@norang.ca * 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. --- lisp/org-clock.el |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 693025a..cc0e51f 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1026,7 +1026,8 @@ the clocking selection, associated with the letter `d'. (= (marker-position org-clock-hd-marker) (if selected-task (marker-position selected-task) - (point) + (point))) + (equal org-clock-current-task (nth 4 (org-heading-components) (message Clock continues in \%s\ org-clock-heading) (throw 'abort nil)) (move-marker org-clock-interrupted-task
[O] [Accepted] [O, 1/2] Allow setting default clocking task to current clocking task
Patch 668 (http://patchwork.newartisans.com/patch/668/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1299721221-10196-2-git-send-email-bernt%40norang.ca%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,1/2] Allow setting default clocking task to current clocking task Date: Thu, 10 Mar 2011 06:40:20 - From: Bernt Hansen be...@norang.ca X-Patchwork-Id: 668 Message-Id: 1299721221-10196-2-git-send-email-be...@norang.ca To: emacs-orgmode@gnu.org Cc: Bernt Hansen be...@norang.ca * 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. --- lisp/org-clock.el | 11 +++ 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index c0c6c82..693025a 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -992,6 +992,7 @@ the clocking selection, associated with the letter `d'. ts selected-task target-pos (msg-extra ) (leftover (and (not org-clock-resolving-clocks) org-clock-leftover-time))) + (when (and org-clock-auto-clock-resolution (or (not interrupting) (eq t org-clock-auto-clock-resolution)) @@ -1000,11 +1001,17 @@ the clocking selection, associated with the letter `d'. (setq org-clock-leftover-time nil) (let ((org-clock-clocking-in t)) (org-resolve-clocks))); check if any clocks are dangling + (when (equal select '(4)) (setq selected-task (org-clock-select-task Clock-in on task: )) (if selected-task (setq selected-task (copy-marker selected-task)) (error Abort))) + + (when (equal select '(16)) + ;; Mark as default clocking task + (org-clock-mark-default-task)) + (when interrupting ;; We are interrupting the clocking of a different task. ;; Save a marker to this task, so that we can go back. @@ -1028,10 +1035,6 @@ the clocking selection, associated with the letter `d'. (let ((org-clock-clocking-in t)) (org-clock-out t))) - (when (equal select '(16)) - ;; Mark as default clocking task - (org-clock-mark-default-task)) - ;; Clock in at which position? (setq target-pos (if (and (eobp) (not (org-on-heading-p)))
[Accepted] [O] Docstring fix for org-export-preprocess-string
Patch 672 (http://patchwork.newartisans.com/patch/672/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C86ei6eoq4l.fsf%40thinkpad.colorado%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Docstring fix for org-export-preprocess-string Date: Thu, 10 Mar 2011 22:13:30 - From: Rodrigo Lazo rlazo@gmail.com X-Patchwork-Id: 672 Message-Id: 86ei6eoq4l.fsf@thinkpad.colorado To: emacs-orgmode@gnu.org Hi, I found a trivial error with this docstring. --8---cut here---start-8--- --8---cut here---end---8--- Best regards, Seb diff --git a/lisp/org-exp.el b/lisp/org-exp.el index dff86b6..34f101d 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1042,7 +1042,7 @@ Pressing `1' will switch between these two options. Alist of code references and line numbers.) (defun org-export-preprocess-string (string rest parameters) - Cleanup STRING so that that the true exported has a more consistent source. + Cleanup STRING so that the true exported has a more consistent source. This function takes STRING, which should be a buffer-string of an org-file to export. It then creates a temporary buffer where it does its job. The result is then again returned as a string, and the exporter works @@ -3084,4 +3084,3 @@ The depends on the variable `org-export-copy-to-kill'. ;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95 ;;; org-exp.el ends here -
[O] [Accepted] [Orgmode] Preserve trailing blank lines
Patch 617 (http://patchwork.newartisans.com/patch/617/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C878vxhgsyy.fsf%40riotblast.dunsmor.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Preserve trailing blank lines Date: Tue, 15 Feb 2011 21:31:17 - From: Jason Dunsmore emacs-orgm...@deathroller.dunsmor.com X-Patchwork-Id: 617 Message-Id: 878vxhgsyy@riotblast.dunsmor.com To: Bastien bastien.gue...@wikimedia.fr Cc: emacs-orgmode@gnu.org, Carsten Dominik carsten.domi...@gmail.com Bastien bastien.gue...@wikimedia.fr writes: However, with your patch, I get a weird behavior. Config: , | (setq org-blank-before-new-entry '((heading . nil) |(plain-list-item . nil))) ` Test file: , | * Section | | ** Subsection 1 | Body | | ** Subsection 2 | Body ` Trying to move Subsection 1 down (with org-metadown): , | * Section | Body ?? | | ** Subsection 2 | | ** Subsection 1 | Body ` Are you able to reproduce this? I finally had a chance to test this out with the latest Org from git and a vanilla Emacs config, and I was unable to reproduce the behavior you saw. Here is what I did: $ git clone git://orgmode.org/org-mode.git $ emacs23 -Q (Edit org.el to re-introduce patch.) $ cd org-mode/ $ git diff Then I evaluated the following in Emacs: (delete /usr/share/emacs/23.2/lisp/org/ load-path) (add-to-list 'load-path ~/tmp/org-mode/lisp) (require 'org-install) (setq org-blank-before-new-entry '((heading . nil) (plain-list-item . nil))) You can see what happened on my screen with the following: wget http://98.129.169.48/tmp/emacs-testing.time wget http://98.129.169.48/tmp/emacs-testing.script scriptreplay emacs-testing.time emacs-testing.script Would you mind testing it out again? Regards, Jason diff --git a/lisp/org.el b/lisp/org.el index 164081c..4329def 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18507,10 +18507,10 @@ Taken from `count' in cl-seq.el with all keyword argum Move backwards over whitespace, to the beginning of the first empty line. Returns the number of empty lines passed. (let ((pos (point))) -(skip-chars-backward \t\n\r) -;; (if (cdr (assoc 'heading org-blank-before-new-entry)) -;;(skip-chars-backward \t\n\r) -;; (forward-line -1)) +;;(skip-chars-backward \t\n\r) +(if (cdr (assoc 'heading org-blank-before-new-entry)) + (skip-chars-backward \t\n\r) + (forward-line -1)) (beginning-of-line 2) (goto-char (min (point) pos)) (count-lines (point) pos)))
[O] [Accepted] [O, Bug] body-only Export Option Adds Extra html Tags.
Patch 662 (http://patchwork.newartisans.com/patch/662/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87fwqx3csc.fsf%40univ-nantes.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,Bug] body-only Export Option Adds Extra html Tags. Date: Tue, 08 Mar 2011 19:30:27 - From: Manuel Giraud manuel.gir...@univ-nantes.fr X-Patchwork-Id: 662 Message-Id: 87fwqx3csc@univ-nantes.fr To: li...@manor-farm.org Cc: emacs-orgmode@gnu.org Manuel Giraud manuel.gir...@univ-nantes.fr writes: Ian Barton li...@manor-farm.org writes: So it looks like SHA: da8dc7bba72613131f97a28f1c4a912b8d85d7cc Rewrite the handling of HTML preamble/postamble caused the problem. I'll have a look at that. Is the /div and /body with no opening a normal behaviour for the :body-only option ? Ok this one was easy. Here's a patch that correct the body-only behaviour. From 82f25397a156e34d21339a5499c9a52c1b46f333 Mon Sep 17 00:00:00 2001 From: Manuel Giraud manuel.gir...@univ-nantes.fr Date: Tue, 8 Mar 2011 15:22:30 +0100 Subject: [PATCH 3/3] correct tag closing for body-only --- lisp/org-html.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 54cbf36..c60c90d 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1715,7 +1715,7 @@ lang=\%s\ xml:lang=\%s\ (if org-export-html-with-timestamp (insert org-export-html-html-helper-timestamp)) - (insert \n/div\n/body\n/html\n) + (unless body-only (insert \n/div\n/body\n/html\n)) (unless (plist-get opt-plist :buffer-will-be-killed) (normal-mode) -- 1.7.1
[Accepted] [O] Re: Footnote sorting bug
Patch 658 (http://patchwork.newartisans.com/patch/658/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C8762rul8xr.fsf%40fastmail.fm%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Re: Footnote sorting bug Date: Tue, 08 Mar 2011 06:04:00 - From: Matt Lundin m...@imapmail.org X-Patchwork-Id: 658 Message-Id: 8762rul8xr@fastmail.fm To: Org Mode emacs-orgmode@gnu.org Matt Lundin m...@imapmail.org writes: Matt Lundin m...@imapmail.org writes: I traced the problem to an extra forward-line added to org-footnote-goto-local-insertion-point with commit 145109dc4a6f161e4ad826bea9cc970363649280. The following patch fixes the sorting problem in org buffers. AFAICT, it has no effect on footnote insertion in message mode buffers with signatures. (Unfortunately, footnote sorting in message buffers with signatures is broken both before and after this patch.) My apologies. Please disregard this patch. It does not fix the issue and cause problems when creating footnotes. I'll take a closer look at the code when I get a chance. The following patch fixes the sorting bug. It also inserts a blank line above a new footnote definition, which is consistent with the spacing that results when sorting footnotes. --8---cut here---start-8--- --8---cut here---end---8--- Best, Matt diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index b6a9bca..f2b3489 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -314,7 +314,7 @@ or new, let the user edit the definition of the footnote. ;; Skip existing footnotes (while (re-search-forward ^[[:space:]]*\\[[^]]+\\] nil t) (forward-line)) -(insert [ label ] \n) +(insert \n[ label ] \n) (goto-char (1- (point))) (message Edit definition and go back with `C-c ' or, if unique, with `C-c C-c'.))) @@ -500,7 +500,7 @@ ENTRY is (fn-label num-mark definition). (when (re-search-forward (format .\\[%s[]:] (regexp-quote (car entry))) nil t) (org-footnote-goto-local-insertion-point) - (insert (format \n\n[%s] %s (car entry) (nth 2 entry)) + (insert (format \n[%s] %s\n (car entry) (nth 2 entry)) (defun org-footnote-goto-local-insertion-point () Find insertion point for footnote, just before next outline heading.
[Accepted] [O] Re: [REGRESSION] org-html.el (targets)
Patch 664 (http://patchwork.newartisans.com/patch/664/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87fwqwnxj6.fsf%40univ-nantes.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Re: [REGRESSION] org-html.el (targets) Date: Wed, 09 Mar 2011 20:06:37 - From: Manuel Giraud manuel.gir...@univ-nantes.fr X-Patchwork-Id: 664 Message-Id: 87fwqwnxj6@univ-nantes.fr To: Bastien b...@altern.org Cc: Bernt Hansen be...@norang.ca, Aankhen aank...@gmail.com, Org-mode ml emacs-orgmode@gnu.org Bastien b...@altern.org writes: Bastien b...@gnu.org writes: May I ask you to rewrite these patches into a single one? PS: I mean: merge all patches in this thread relevant to the problem, possibly including Aankhen patch. Thanks! Ok, here it is. Hopes this one's ok. From a9e692243b37be9947db9a7220ea561d261deaba Mon Sep 17 00:00:00 2001 From: Manuel Giraud manuel.gir...@univ-nantes.fr Date: Wed, 9 Mar 2011 16:03:43 +0100 Subject: [PATCH] Correct HTML export of dedicated target. * org-html.el (org-format-org-table-html): fix anchors in HTML export (thanks to aank...@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. --- lisp/org-exp.el |2 +- lisp/org-html.el | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 709317a..dff86b6 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2062,7 +2062,7 @@ can work correctly. (let* ((rtn (mapconcat 'identity - (org-split-string s [^a-zA-Z0-9_\\.-]+) --)) + (org-split-string s [^a-zA-Z0-9_\\.-]+) -)) (a (assoc rtn alist))) (or (cdr a) rtn diff --git a/lisp/org-html.el b/lisp/org-html.el index 333cf4d..54cbf36 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1996,8 +1996,8 @@ for formatting. This is required for the DocBook exporter. ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format caption%s/caption (or caption )) html) - (when label (push (format a name=\%s\ id=\%s\/a (org-solidify-link-text label) (org-solidify-link-text label)) - html)) + (when label + (setq html-table-tag (org-export-splice-attributes html-table-tag (format id=\%s\ (org-solidify-link-text label) (push html-table-tag html)) (setq html (mapcar (lambda (x) @@ -2181,12 +2181,12 @@ that uses these same face definitions. (defun org-html-protect (s) Convert characters to HTML equivalent. Possible conversions are set in `org-export-html-protect-char-alist'. - (let ((start 0) - (cl org-export-html-protect-char-alist) c) + (let ((cl org-export-html-protect-char-alist) c) (while (setq c (pop cl)) - (while (string-match (car c) s start) - (setq s (replace-match (cdr c) t t s) - start (1+ (match-beginning 0) + (let ((start 0)) + (while (string-match (car c) s start) + (setq s (replace-match (cdr c) t t s) + start (match-beginning 0) s)) (defun org-html-expand (string) -- 1.7.1
[O] [Accepted] [O, 1/3] Fix bug when narrowing to subtree with point at an inline task
Patch 643 (http://patchwork.newartisans.com/patch/643/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1299084964-26440-1-git-send-email-n.goaziou%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O, 1/3] Fix bug when narrowing to subtree with point at an inline task Date: Wed, 02 Mar 2011 21:56:02 - From: Nicolas Goaziou n.goaz...@gmail.com X-Patchwork-Id: 643 Message-Id: 1299084964-26440-1-git-send-email-n.goaz...@gmail.com To: Org mode list emacs-orgmode@gnu.org Cc: Nicolas Goaziou n.goaz...@gmail.com * lisp/org.el (org-narrow-to-subtree): ensure `org-back-to-heading' will move point to a real heading and not an inline task by wraping function into a org-with-limited-levels macro. --- lisp/org.el | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index a26a3ca..6e1be76 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7566,11 +7566,12 @@ If yes, remember the marker and the distance to BEG. (interactive) (save-excursion (save-match-data - (narrow-to-region - (progn (org-back-to-heading t) (point)) - (progn (org-end-of-subtree t t) - (if (and (org-on-heading-p) (not (eobp))) (backward-char 1)) - (point)) + (org-with-limited-levels + (narrow-to-region + (progn (org-back-to-heading t) (point)) + (progn (org-end-of-subtree t t) +(if (and (org-on-heading-p) (not (eobp))) (backward-char 1)) +(point))) (defun org-narrow-to-block () Narrow buffer to the current block.
[O] [Accepted] [O, 2/3] When demoting a subtree, don't change level of inline tasks within
Patch 644 (http://patchwork.newartisans.com/patch/644/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1299084964-26440-2-git-send-email-n.goaziou%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O, 2/3] When demoting a subtree, don't change level of inline tasks within Date: Wed, 02 Mar 2011 21:56:03 - From: Nicolas Goaziou n.goaz...@gmail.com X-Patchwork-Id: 644 Message-Id: 1299084964-26440-2-git-send-email-n.goaz...@gmail.com To: Org mode list emacs-orgmode@gnu.org Cc: Nicolas Goaziou n.goaz...@gmail.com * lisp/org.el (org-demote-subtree,org-promote-subtree): wrap org-map-tree into org-with-limited-levels macro, so it avoids operating on inline tasks. --- lisp/org.el |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 6e1be76..8ae5e6f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7002,7 +7002,7 @@ When a subtree is being promoted, the hook will be called for each node.) See also `org-promote'. (interactive) (save-excursion -(org-map-tree 'org-promote)) +(org-with-limited-levels (org-map-tree 'org-promote))) (org-fix-position-after-promote)) (defun org-demote-subtree () @@ -7010,7 +7010,7 @@ See also `org-promote'. See also `org-promote'. (interactive) (save-excursion -(org-map-tree 'org-demote)) +(org-with-limited-levels (org-map-tree 'org-demote))) (org-fix-position-after-promote))
[O] [Accepted] [O,3/3] Promote and demote inline tasks
Patch 645 (http://patchwork.newartisans.com/patch/645/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1299084964-26440-3-git-send-email-n.goaziou%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,3/3] Promote and demote inline tasks Date: Wed, 02 Mar 2011 21:56:04 - From: Nicolas Goaziou n.goaz...@gmail.com X-Patchwork-Id: 645 Message-Id: 1299084964-26440-3-git-send-email-n.goaz...@gmail.com To: Org mode list emacs-orgmode@gnu.org Cc: Nicolas Goaziou n.goaz...@gmail.com * lisp/org-inlinetask.el (org-inlinetask-promote, org-inlinetask-demote): new functions. * lisp/org.el (org-metaleft, org-metaright): when point is at an inline task, promote or demote it. --- lisp/org-inlinetask.el | 49 lisp/org.el| 28 +- 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index 6bf38df..42ba7a4 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -252,6 +252,55 @@ This assumes the point is inside an inline task. (re-search-backward (org-inlinetask-outline-regexp) nil t) (- (match-end 1) (match-beginning 1 +(defun org-inlinetask-promote () + Promote the inline task at point. +If the task has an end part, promote it. Also, prevents level from +going below `org-inlinetask-min-level'. + (interactive) + (if (not (org-inlinetask-in-task-p)) + (error Not in an inline task) +(save-excursion + (let* ((lvl (org-inlinetask-get-task-level)) + (next-lvl (org-get-valid-level lvl -1)) + (diff (- next-lvl lvl)) + (down-task (concat (make-string next-lvl ?*))) + beg) + (if ( next-lvl org-inlinetask-min-level) + (error Cannot promote an inline task at minimum level) + (org-inlinetask-goto-beginning) + (setq beg (point)) + (replace-match down-task nil t nil 1) + (org-inlinetask-goto-end) + (if (eobp) (beginning-of-line) (forward-line -1)) + (unless (= (point) beg) + (replace-match down-task nil t nil 1) + (when org-adapt-indentation + (goto-char beg) + (org-fixup-indentation diff + +(defun org-inlinetask-demote () + Demote the inline task at point. +If the task has an end part, also demote it. + (interactive) + (if (not (org-inlinetask-in-task-p)) + (error Not in an inline task) +(save-excursion + (let* ((lvl (org-inlinetask-get-task-level)) + (next-lvl (org-get-valid-level lvl 1)) + (diff (- next-lvl lvl)) + (down-task (concat (make-string next-lvl ?*))) + beg) + (org-inlinetask-goto-beginning) + (setq beg (point)) + (replace-match down-task nil t nil 1) + (org-inlinetask-goto-end) + (if (eobp) (beginning-of-line) (forward-line -1)) + (unless (= (point) beg) + (replace-match down-task nil t nil 1) + (when org-adapt-indentation + (goto-char beg) + (org-fixup-indentation diff))) + (defvar org-export-current-backend) ; dynamically bound in org-exp.el (defun org-inlinetask-export-handler () Handle headlines with level larger or equal to `org-inlinetask-min-level'. diff --git a/lisp/org.el b/lisp/org.el index 8ae5e6f..c528707 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -17042,13 +17042,17 @@ See the individual commands for more information. (cond ((run-hook-with-args-until-success 'org-metaleft-hook)) ((org-at-table-p) (org-call-with-arg 'org-table-move-column 'left)) - ((or (org-on-heading-p) - (and (org-region-active-p) - (save-excursion -(goto-char (region-beginning)) -(org-on-heading-p + ((org-with-limited-levels + (or (org-on-heading-p) + (and (org-region-active-p) + (save-excursion + (goto-char (region-beginning)) + (org-on-heading-p) (when (org-check-for-hidden 'headlines) (org-hidden-tree-error)) (call-interactively 'org-do-promote)) + ;; At an inline task. + ((org-on-heading-p) +(call-interactively 'org-inlinetask-promote)) ((or (org-at-item-p) (and (org-region-active-p) (save-excursion @@ -17067,13 +17071,17 @@ See the individual commands for more information. (cond ((run-hook-with-args-until-success 'org-metaright-hook)) ((org-at-table-p) (call-interactively 'org-table-move-column)) - ((or (org-on-heading-p) - (and (org-region-active-p) - (save-excursion -(goto-char (region-beginning)) -(org-on-heading-p + ((org-with-limited-levels + (or (org-on-heading-p) + (and
[Accepted] [O] Support modifiers in effort durations (was: Re: Does Effort support hours only?)
Patch 638 (http://patchwork.newartisans.com/patch/638/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm3tyfo1j16.fsf%40e4300lm.epcc.ed.ac.uk%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Support modifiers in effort durations (was: Re: Does Effort support hours only?) Date: Mon, 28 Feb 2011 16:43:33 - From: Lawrence Mitchell we...@gmx.li X-Patchwork-Id: 638 Message-Id: m3tyfo1j16@e4300lm.epcc.ed.ac.uk To: Luke Crook l...@balooga.com Cc: emacs-orgmode@gnu.org, =?utf-8?Q?S=C3=A9bastien?= Vauban wxhgmqzgwmuf-genee64ty+gs+fvcfc7...@public.gmane.org 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 we...@gmx.li Date: Fri, 18 Feb 2011 11:01:46 + 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. --- lisp/org-agenda.el |4 ++-- lisp/org-clock.el |8 lisp/org.el| 41 + 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index dee23e0..87602dc 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5334,7 +5334,7 @@ Any match of REMOVE-RE will be removed from TXT. (get-text-property 0 'org-marker txt))) (error nil))) (when effort - (setq neffort (org-hh:mm-string-to-minutes effort) + (setq neffort (org-duration-string-to-minutes effort) effort (setq effort (concat [ effort ] ) (when remove-re @@ -6061,7 +6061,7 @@ E looks like \+2:25\. ((equal op ??) op) (t '=))) (list 'org-agenda-compare-effort (list 'quote op) - (org-hh:mm-string-to-minutes e + (org-duration-string-to-minutes e (defun org-agenda-compare-effort (op value) Compare the effort of the current line with VALUE, using OP. diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 6b45ca5..cc11f3c 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -487,7 +487,7 @@ If not, show simply the clocked time like 01:50. (m (- clocked-time (* 60 h (if org-clock-effort (let* ((effort-in-minutes - (org-hh:mm-string-to-minutes org-clock-effort)) + (org-duration-string-to-minutes org-clock-effort)) (effort-h (floor effort-in-minutes 60)) (effort-m (- effort-in-minutes (* effort-h 60))) (work-done-str @@ -561,10 +561,10 @@ the mode line. ;; A string. See if it is a delta (setq sign (string-to-char value)) (if (member sign '(?- ?+)) -(setq current (org-hh:mm-string-to-minutes current) +(setq current (org-duration-string-to-minutes current) value (substring value 1)) (setq current 0)) - (setq value (org-hh:mm-string-to-minutes value)) + (setq value (org-duration-string-to-minutes value)) (if (equal ?- sign) (setq value (- current value)) (if (equal ?+ sign) (setq value (+ current value) @@ -581,7 +581,7 @@ the mode line. Show notification if we spent more time than we estimated before. Notification is shown only once. (when (org-clocking-p) -(let ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort)) +(let ((effort-in-minutes (org-duration-string-to-minutes org-clock-effort))
[Accepted] [O] Use and show default refiling location.
Patch 642 (http://patchwork.newartisans.com/patch/642/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87wrkh4oua.fsf%40member.fsf.org%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Use and show default refiling location. Date: Wed, 02 Mar 2011 18:46:37 - From: Tassilo Horn tass...@member.fsf.org X-Patchwork-Id: 642 Message-Id: 87wrkh4oua@member.fsf.org To: emacs-orgmode@gnu.org * org.el (org-refile-get-location): Set and show default value. (org-goto, org-refile): Adapt calls. * org-id.el (org-id-get-with-outline-path-completion): Adapt call. * org-agenda.el (org-agenda-refile, org-agenda-bulk-action): Adapt calls. * org-remember.el (org-remember-handler): Adapt call. --- This patch that implements the usage (and indication) of a default refiling location for `org-refile'. The default is the first value of `org-refile-history'. Although that value was already easily accessible from the history with M-n, an explicit default is convenient when refiling several (non-consecutive, so you cannot refile using a region) entries. That happened to me just now after importing a dozen of contacts from Gnus into my contacts.org (using org-contacts.el), followed by refiling them in several category headlines. lisp/org-agenda.el |4 ++-- lisp/org-id.el |2 +- lisp/org-remember.el |2 +- lisp/org.el | 17 - 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ea822da..9a818ce 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6718,7 +6718,7 @@ If this information is not given, the function uses the tree at point. (pos (marker-position marker)) (rfloc (or rfloc (org-refile-get-location -(if goto Goto: Refile to: ) buffer +(if goto Goto Refile to) buffer org-refile-allow-creating-parent-nodes (with-current-buffer buffer (save-excursion @@ -7984,7 +7984,7 @@ The prefix arg is passed through to the command if possible. ((member action '(?r ?w)) (setq rfloc (org-refile-get-location -Refile to: +Refile to (marker-buffer (car org-agenda-bulk-marked-entries)) org-refile-allow-creating-parent-nodes)) (if (nth 3 rfloc) diff --git a/lisp/org-id.el b/lisp/org-id.el index a8004af..a70dd15 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -231,7 +231,7 @@ It returns the ID of the entry. If necessary, the ID is created. (org-refile-use-outline-path (if (caar org-refile-targets) 'file t)) (org-refile-target-verify-function nil) - (spos (org-refile-get-location Entry: )) + (spos (org-refile-get-location Entry)) (pom (and spos (move-marker (make-marker) (nth 3 spos) (get-file-buffer (nth 1 spos)) (prog1 (org-id-get pom 'create) diff --git a/lisp/org-remember.el b/lisp/org-remember.el index c6e21ae..3be7b86 100644 --- a/lisp/org-remember.el +++ b/lisp/org-remember.el @@ -1004,7 +1004,7 @@ See also the variable `org-reverse-note-order'. ((eq org-remember-interactive-interface 'outline-path-completion) (let ((org-refile-targets '((nil . (:maxlevel . 10 (org-refile-use-outline-path t)) - (setq spos (org-refile-get-location Heading: ) + (setq spos (org-refile-get-location Heading) exitcmd 'return spos (nth 3 spos (t (error This should not happen))) diff --git a/lisp/org.el b/lisp/org.el index a26a3ca..51240c3 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6544,7 +6544,7 @@ the headline hierarchy above. (selected-point (if (eq interface 'outline) (car (org-get-location (current-buffer) org-goto-help)) - (let ((pa (org-refile-get-location Goto: ))) + (let ((pa (org-refile-get-location Goto))) (org-refile-check-position pa) (nth 3 pa) (if selected-point @@ -10290,7 +10290,7 @@ This can be done with a 0 prefix: `C-0 C-c C-w' (setq it (or rfloc (save-excursion (org-refile-get-location -(if goto Goto: Refile to: ) default-buffer +(if goto Goto Refile to) default-buffer org-refile-allow-creating-parent-nodes) (setq file (nth 1 it) re (nth 2 it) @@ -10371,13 +10371,20 @@ This can be done with a 0 prefix: `C-0 C-c C-w' (message This
[Accepted] [O] Title page in latex export
Patch 649 (http://patchwork.newartisans.com/patch/649/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3Cm34o7j5d5r.fsf%40e4300lm.epcc.ed.ac.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [O] Title page in latex export
Date: Fri, 04 Mar 2011 16:38:08 -
From: Lawrence Mitchell we...@gmx.li
X-Patchwork-Id: 649
Message-Id: m34o7j5d5r@e4300lm.epcc.ed.ac.uk
To: emacs-orgmode@gnu.org
Suvayu Ali wrote:
Hi Camille,
Thanks a lot for your response.
On Fri, 4 Mar 2011 11:48:39 +0100
Camille persson camille.pers...@gmail.com wrote:
Hi,
I think that what it already does
I don't think it does that. e.g.
Try this patch to org-latex.el:
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 19baa40..4db38d6 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1352,9 +1352,6 @@ OPT-PLIST is the options plist for current buffer.
(org-export-apply-macros-in-string org-export-latex-append-header)
;; define alert if not yet defined
\n\\providecommand{\\alert}[1]{\\textbf{#1}}
- ;; beginning of the document
- \n\\begin{document}\n\n
- ;; insert the title
(format
\n\n\\title{%s}\n
;; convert the title
@@ -1374,6 +1371,9 @@ OPT-PLIST is the options plist for current buffer.
(format-time-string
(or (plist-get opt-plist :date)
org-export-latex-date-format)))
+ ;; beginning of the document
+ \n\\begin{document}\n\n
+ ;; insert the title
;; insert the title command
(when (string-match \\S- title)
(if (string-match %s org-export-latex-title-command)
[Accepted] [O] typo in org.texi
Patch 652 (http://patchwork.newartisans.com/patch/652/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C9447.1299285313%40alphaville.usa.hp.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] typo in org.texi Date: Sat, 05 Mar 2011 05:35:13 - From: Nick Dokos nicholas.do...@hp.com X-Patchwork-Id: 652 Message-Id: 9447.1299285...@alphaville.usa.hp.com To: emacs-orgmode@gnu.org Cc: nicholas.do...@hp.com Nick diff --git a/doc/org.texi b/doc/org.texi index 50febbc..bc66319 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -2282,7 +2282,7 @@ operator that looks like this: @end example @noindent -and allows relative relative references, i.e. references relative to the +and allows relative references, i.e. references relative to the row/column of the field whose value is being computed. These relative references make it possible to store a formula only once and use it in many fields without copying and modifying it.
[Accepted] [O] Re: multiple agenda buffers
Patch 648 (http://patchwork.newartisans.com/patch/648/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87k4ghe1cw.fsf%40fastmail.fm%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O] Re: multiple agenda buffers Date: Thu, 03 Mar 2011 01:03:43 - From: Matt Lundin m...@imapmail.org X-Patchwork-Id: 648 Message-Id: 87k4ghe1cw@fastmail.fm To: Bastien bastien.gue...@wikimedia.fr Cc: org-mode mailing list emacs-orgmode@gnu.org Hi Bastien, Bastien bastien.gue...@wikimedia.fr writes: Hi all, Suvayu Ali fatkasuvayu+li...@gmail.com writes: However I was wondering, block agenda commands might work at least for doing multiple searches. But I don't think there is any interactive interface to it. inspired by this conversation, I have add a new agenda command: M-x org-agenda-append-agenda RET It is bound to `A' in the agenda buffer and lets you append any agenda to the currently displayed one, thus providing some kind of interactive interface to build block agendas from simple ones. I think it's a neat addition -- especially useful when you want to compare to _small_ list of items. Let me know what you think - and thanks Suvayu for the idea! Thanks for the new function. However, at the moment, it has destructive effects if it is called in a buffer other than the agenda buffer, as it appends the new agenda results to the current buffer and then makes the buffer read-only. Perhaps for now we could throw an error if the append function is called from outside the agenda: --8---cut here---start-8--- --8---cut here---end---8--- Best, Matt diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ea822da..f2eac99 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2266,6 +2266,8 @@ Pressing `' twice means to restrict to the current subtree or region This function allows interactive building of block agendas. Agenda views are separated by `org-agenda-block-separator'. (interactive) + (unless (string= (buffer-name) org-agenda-buffer-name) +(error Can only append from within agenda buffer)) (let ((org-agenda-multi t)) (org-agenda) (widen)))
[O] [Accepted] [O,babel] ERT as external library deprecated.
Patch 639 (http://patchwork.newartisans.com/patch/639/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87pqqb2k5t.fsf%40btinternet.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [O,babel] ERT as external library deprecated. Date: Tue, 01 Mar 2011 15:46:06 - From: Martyn Jago martyn.j...@btinternet.com X-Patchwork-Id: 639 Message-Id: 87pqqb2k5t@btinternet.com To: emacs-orgmode@gnu.org Hi The ERT library is now a part of EMACS. As a result the ERT library files currently loaded as a sub-module have been deleted on Github. This change modifies .gitmodule to avoid attempting to load ERT. Changes have been made to testing/README.org to suit. An insertion has been made to testing/README.org to point out that the library-of-babel.org file needs ingesting (including a source block to do so) to enable some tests to pass, and the ERT reference now points to the included ERT info help pages. Broken dependencies in testing/org-test.el have been removed. I have also temporarily commented out a small number of broken tests which between them cause ERT to go off into the weeds and delete a large section of babel.org. This means that all tests currently pass. I will investigate the breakages and hopefully provide fixes. Hope this helps Martyn --- Org-mode version 7.4 (release_7.4.558.g1e39) GNU Emacs 24.0.50.1 (i686-pc-linux-gnu, GTK+ Version 2.24.0) of 2011-02-25 From c4772a9786371c006a2637528a25414033d208c9 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Tue, 1 Mar 2011 07:34:55 + Subject: [PATCH 1/3] Changes to suit latest ert structure. ERT is now a part of EMACS and the source of the ERT git submodule is deprecated, as are some files within. Changes testing/README and .gitmodules to suit. --- .gitmodules |3 --- testing/README.org | 17 ++--- testing/ert |1 - testing/lisp/test-ob-exp.el |9 + testing/org-test.el |6 +- 5 files changed, 12 insertions(+), 24 deletions(-) delete mode 16 testing/ert diff --git a/.gitmodules b/.gitmodules index 3c493aa..400e7cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule testing/jump] path = testing/jump url = git://github.com/eschulte/jump.el.git -[submodule testing/ert] - path = testing/ert - url = http://github.com/ohler/ert.git diff --git a/testing/README.org b/testing/README.org index f374a48..2d38df9 100644 --- a/testing/README.org +++ b/testing/README.org @@ -4,10 +4,11 @@ The following instructions describe how to get started using the Org-mode test framework. -1) Install the ERT and jump.el testing dependencies which are included - as git submodules in the org-mode repository. To do so run the - following git submodule commands from inside the base of the - Org-mode directory (or just execute the following code block). +1) Install the jump.el testing dependency which is included as a git + submodule in the org-mode repository. To do so run the following + git submodule commands from inside the base of the Org-mode + directory (or just execute the following code block). + #+begin_src sh cd .. git submodule init @@ -26,13 +27,7 @@ Org-mode test framework. prefix argument, and the corresponding test file will be stubbed out if it doesn't already exist. -4) Review the ERT documentation, to do this run =makeinfo= in the - =testing/ert= directory, - #+begin_src sh - cd ert - makeinfo ert.texinfo - #+end_src - then browse the [[elisp:(info (expand-file-name ert/ert.info))][resulting info file]]. +4) [[info:ert#Top][Review the ERT documentation]] 5) A number of org-mode-specific functions and macros are provided in =org-test.el= see the [[file:org-test.el::%3B%3B%3B%20Functions%20for%20writing%20tests][;;; Functions for Writing Tests]] subsection of diff --git a/testing/ert b/testing/ert deleted file mode 16 index 87b475f..000 --- a/testing/ert +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87b475f856ab6eab479b439b911c5e0c23918a36 diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el index 6c7c514..ee982dc 100644 --- a/testing/lisp/test-ob-exp.el +++ b/testing/lisp/test-ob-exp.el @@ -95,10 +95,11 @@ elements in the final html. (should (string-match pre.*[^\000]*/pre html)) (should (string-match table.*[^\000]*/table html) -(ert-deftest ob-exp/export-subtree () - (org-test-at-id 5daa4d03-e3ea-46b7-b093-62c1b7632df3 -(org-mark-subtree) -(org-export-as-latex nil))) +;; TODO +;; (ert-deftest ob-exp/export-subtree () +;; (org-test-at-id
[O] [Accepted] [Orgmode] org-export-preprocess-string: Use backend var
Patch 625 (http://patchwork.newartisans.com/patch/625/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C8162sgx8l7.fsf%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] org-export-preprocess-string: Use backend var Date: Sat, 19 Feb 2011 22:00:52 - From: Jambunathan K kjambunat...@gmail.com X-Patchwork-Id: 625 Message-Id: 8162sgx8l7@gmail.com To: emacs-orgmode@gnu.org From 2b1f84fdcd7d79ad95e71bc2ca96fb16ad76b446 Mon Sep 17 00:00:00 2001 From: Jambunathan K kjambunat...@gmail.com Date: Sat, 19 Feb 2011 22:26:10 +0530 Subject: [PATCH] org-export-preprocess-string: Use backend var --- lisp/org-exp.el | 22 +- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 9a35b00..a17091b 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1197,23 +1197,11 @@ on this string to produce the exported version. ;; Another hook (run-hooks 'org-export-preprocess-before-backend-specifics-hook) - ;; LaTeX-specific preprocessing - (when (eq backend 'latex) - (require 'org-latex nil) - (org-export-latex-preprocess parameters)) - - ;; ASCII-specific preprocessing - (when (eq backend 'ascii) - (org-export-ascii-preprocess parameters)) - - ;; HTML-specific preprocessing - (when (eq backend 'html) - (org-export-html-preprocess parameters)) - - ;; DocBook-specific preprocessing - (when (eq backend 'docbook) - (require 'org-docbook nil) - (org-export-docbook-preprocess parameters)) + ;; Backend-specific preprocessing + (let* ((backend-name (symbol-name backend)) + (f (intern (format org-export-%s-preprocess backend-name + (require (intern (concat org- backend-name)) nil) + (funcall f parameters)) ;; Remove or replace comments (org-export-handle-comments (plist-get parameters :comments)) -- 1.7.2.3 ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Re: [PATCH] fix a bug in org-open-at-point
Patch 624 (http://patchwork.newartisans.com/patch/624/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C8739nk1jmd.fsf%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Re: [PATCH] fix a bug in org-open-at-point Date: Sat, 19 Feb 2011 14:03:38 - From: Nicolas Goaziou n.goaz...@gmail.com X-Patchwork-Id: 624 Message-Id: 8739nk1jmd@gmail.com To: emacs-orgmode@gnu.org My bad, wrong manipulation. Here is the patch. To reproduce the error, you can type the following in a fresh Org #+begin_src org target some text target another text target #+end_src Using C-c C-o on any of the two links will return an error. Regards, From f7738f3e9239fc4fddccc7850dad7a0936087a58 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou n.goaz...@gmail.com Date: Sat, 19 Feb 2011 09:37:48 +0100 Subject: [PATCH] Fix bug with link to radio target at beginning or end of buffer * lisp/org.el (org-open-at-point): if a link to a radio target is the first, (resp. the last), element of a buffer, function cannot find the property change required to get its boundaries, and `buffer-substring' is called with an invalid nil argument. --- lisp/org.el |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index b92186a..bfe9296 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9214,8 +9214,10 @@ application the system uses for this file type. pos (if (get-text-property (1+ (point)) 'org-linked-text) (1+ (point)) (point)) path (buffer-substring - (previous-single-property-change pos 'org-linked-text) - (next-single-property-change pos 'org-linked-text))) + (or (previous-single-property-change pos 'org-linked-text) + (point-min)) + (or (next-single-property-change pos 'org-linked-text) + (point-max (throw 'match t)) (save-excursion -- 1.7.4.1 ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Problems with buffer-local variables
Patch 567 (http://patchwork.newartisans.com/patch/567/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm1r5bsx2qb.fsf%4094.196.190.115.threembb.co.uk%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Problems with buffer-local variables Date: Tue, 01 Feb 2011 01:00:44 - From: Dan Davison dandavis...@gmail.com X-Patchwork-Id: 567 Message-Id: m1r5bsx2qb@94.196.190.115.threembb.co.uk To: Carsten Dominik carsten.domi...@gmail.com Cc: emacs-orgmode@gnu.org Carsten Dominik carsten.domi...@gmail.com writes: On Dec 22, 2010, at 3:51 PM, Dan Davison wrote: There's recently been some advocacy of using buffer-local variables for Org-mode configuration. It seems like a good idea to me. However, I think that it raises a problem: there are at least two situations in which Org internally spawns a buffer that is supposed to be a sort of copy of another Org buffer: these situations are export and org-src edit buffer. The problem is that the copy buffer doesn't inherit local variables from the parent buffer. It seems that either we should propagate all local variables in these cases (but I suspect that is inappropriate for some variables), or we have to have a rule for identifying the subset of local variables which need to be propagated. Below is one example which I think demonstrates a problem. If you evaluate the elisp block and then export to HTML, the noweb does not get expanded, because the configuration variable is buffer-local (behind the scenes, Org creates a buffer copy just before exporting a buffer). --8---cut here---start-8--- #+title: Local variables issues? Evaluate this block, then do C-c C-e h #+begin_src emacs-lisp :results silent :exports none (set-default 'org-babel-default-header-args:sh nil) (set (make-local-variable 'org-babel-default-header-args:sh) '((:noweb . yes))) #+end_src #+begin_src sh :exports both foo #+end_src #+source: foo #+begin_src sh :exports none echo hello #+end_src --8---cut here---end---8--- It's also a problem when spawning the org-src edit buffer. There is a patch in the pipeline that tries to identify all the necessary local variables and transmit them to the edit buffer: http://patchwork.newartisans.com/patch/438/ That's a bit messy, but in the export case it seems even harder to identify all variables that might need to be transmitted. What is a good solution? Hi Dan, I see only two possibilities. Either use a list of variables that should be transported, or copy all local variables, or all local variables that match a pattern. An example for doing something like this can be found in org-get-local-variables which is, for example, used by `org-run-like-in-org-mode'. Here's a patch. It clones into the pre-export buffer all buffer-local variables that match a regexp (currently ^\\(org-\\|orgtbl-\\)). We might want to watch out for unanticipated side effects. This should mean that we can use buffer-local variables to set export related variables on a per-buffer basis[1]. On reflection I think that the src edit buffer case should be dealt with as it is currently (by ad-hoc transporting of variables in the org-src code). I still stand by my pending patch 438, which tidies up the local-variables stuff in org-edit-src-code. http://patchwork.newartisans.com/patch/438/ Dan Footnotes: [1] Also, we can use the 'local argument to add-hook to set the various export hooks. Ensure that buffer-local variables have their effects during export. * lisp/org.el (org-clone-local-variables): New function to copy local variables from another buffer. * lisp/org-exp.el (org-export-preprocess-string): Clone local variables from source org buffer into temporary export preprocessing buffer. #+begin_src diff #+end_src - Carsten diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 97f17e5..6b333a7 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1028,6 +1028,7 @@ on this string to produce the exported version. (inhibit-read-only t) (drawers org-drawers) (outline-regexp \\*+ ) + (source-buffer (current-buffer)) target-alist rtn) (setq org-export-target-aliases nil @@ -1051,6 +1052,7 @@ on this string to produce the exported version. (let ((org-inhibit-startup t)) (org-mode)) (setq case-fold-search t) + (org-clone-local-variables source-buffer ^\\(org-\\|orgtbl-\\)) (org-install-letbind) ;; Call the hook diff --git a/lisp/org.el b/lisp/org.el index 808c9ed..dda97d9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@
[Accepted] [Orgmode] org-publish: sitemap doc
Patch 616 (http://patchwork.newartisans.com/patch/616/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C87hbc6n6wt.fsf%40univ-nantes.fr%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] org-publish: sitemap doc
Date: Mon, 14 Feb 2011 17:21:22 -
From: Manuel Giraud manuel.gir...@univ-nantes.fr
X-Patchwork-Id: 616
Message-Id: 87hbc6n6wt@univ-nantes.fr
To: emacs-orgmode emacs-orgmode@gnu.org
Hi,
Some documentation for new sitemap options.
From 3a846a674a33a5f2a0a2404b88331942e2012779 Mon Sep 17 00:00:00 2001
From: Manuel Giraud manuel.gir...@univ-nantes.fr
Date: Mon, 14 Feb 2011 11:34:04 +0100
Subject: [PATCH] org.texi: documentation of sitemap's entry options
---
doc/org.texi | 15 ++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 0a5b065..c8e0597 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -10978,7 +10978,7 @@ of links to all files in the project.
respectively. Any other value will mix files and folders.
@item @code{:sitemap-sort-files}
-@tab How the files are sorted in the site map. Set this
+@tab How the files are sorted in the site map. Set this to
@code{alphabetically} (default), @code{chronologically} or
@code{anti-chronologically}. @code{chronologically} sorts the files with
older date first while @code{anti-chronologically} sorts the files with newer
@@ -10988,6 +10988,19 @@ a file is retrieved with
@code{org-publish-find-date}.
@item @code{:sitemap-ignore-case}
@tab Should sorting be case-sensitive? Default @code{nil}.
+@item @code{:sitemap-file-entry-format}
+@tab With this option one can tell how a sitemap's entry is formated in the
+sitemap. This is a format string with some escape sequences: @code{%t} stands
+for the title of the file, @code{%a} stands for the author of the file and
+@code{%d} stands for the date of the file. The date is retrieved with the
+@code{org-publish-find-date} function and formated with
+@code{org-publish-sitemap-date-format}. Default @code{%t}.
+
+@item @code{:sitemap-date-format}
+@tab Format string for the @code{format-time-string} function that tells how
+a sitemap entry's date is to be formated. This property bypasses
+@code{org-publish-sitemap-date-format} which defaults to @code{%Y-%m-%d}.
+
@end multitable
@node Generating an index, , Sitemap, Configuration
--
1.7.1
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Allow property retrieval before first heading?
Patch 595 (http://patchwork.newartisans.com/patch/595/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm1tyg9qkwg.fsf%4094.197.159.103.threembb.co.uk%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Allow property retrieval before first heading? Date: Sat, 12 Feb 2011 21:26:23 - From: Dan Davison dandavis...@gmail.com X-Patchwork-Id: 595 Message-Id: m1tyg9qkwg@94.197.159.103.threembb.co.uk To: emacs-orgmode@gnu.org Currently (org-entry-get) throws an error if point is before the first heading. Is there a reason that this must be so? Org is too essential for headings to be obligatory! An example of when it would be useful to get properties is in a buffer containing src blocks but no headings (babel takes header args from Org properties). I make heavy use of such buffers as a scratch pad. I'm not sure to what extent speed is essential in these functions, and therefore unsure whether the calls to `org-before-first-heading-p' are acceptable. Dan Allow properties to be retrieved before first heading in file. * lisp/org.el (org-entry-get): Don't look for a property drawer if we are before the first heading in the file. (org-entry-get-with-inheritance): Don't attempt to move up the tree if we are before the first heading in the file. Also, enclose less of the function in the save-excursion. diff --git a/lisp/org.el b/lisp/org.el index 0104007..a676ec4 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13567,7 +13567,8 @@ when a \nil\ value can supersede a non-nil value higher up the hierarchy. ;; We need a special property. Use `org-entry-properties' to ;; retrieve it, but specify the wanted property (cdr (assoc property (org-entry-properties nil 'special property))) - (let ((range (org-get-property-block))) + (let ((range (unless (org-before-first-heading-p) +(org-get-property-block (if (and range (goto-char (car range)) (re-search-forward @@ -13680,6 +13681,7 @@ should be considered as undefined (this is the meaning of nil here). However, if LITERAL-NIL is set, return the string value \nil\ instead. (move-marker org-entry-property-inherited-from nil) (let (tmp) +(unless (org-before-first-heading-p) (save-excursion (save-restriction (widen) @@ -13690,11 +13692,12 @@ However, if LITERAL-NIL is set, return the string value \nil\ instead. (move-marker org-entry-property-inherited-from (point)) (throw 'ex tmp)) (or (org-up-heading-safe) (throw 'ex nil) + )) (setq tmp (or tmp (cdr (assoc property org-file-properties)) (cdr (assoc property org-global-properties)) (cdr (assoc property org-global-properties-fixed - (if literal-nil tmp (org-not-nil tmp) + (if literal-nil tmp (org-not-nil tmp (defvar org-property-changed-functions nil Hook called when the value of a property has changed. ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] using (id Name) target in org-capture-templates
Patch 593 (http://patchwork.newartisans.com/patch/593/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C87wrl6yipt.fsf%40gnu.org%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] using (id Name) target in org-capture-templates
Date: Fri, 11 Feb 2011 15:21:50 -
From: Bastien bastien.gue...@wikimedia.fr
X-Patchwork-Id: 593
Message-Id: 87wrl6yipt@gnu.org
To: Sullivan\, Gregory \(US SSA\) gregory.sulli...@baesystems.com
Cc: Emacs-orgmode@gnu.org Emacs-orgmode@gnu.org
Hi Gregory,
Sullivan, Gregory (US SSA) gregory.sulli...@baesystems.com writes:
Thanks for the note. I did indeed mean to use headings.
I think it would be nice to be able to have the file dynamic but the
heading static in capture templates. In my case, I always want to
find a particular heading in the buffer that the capture originated
from. So I had to put the whole target spec in a function, as in:
I like the idea of being able to tell capture to use the current file.
This patch against latest Org allows you to use (currentfile) like this:
,
| (setq org-capture-templates
| '((j Journal entry (currentfile) * %a\n\n%i)))
`
Let me know if you find this useful.
From a276dc40c860e636be7c8d743bd01b401461a8f5 Mon Sep 17 00:00:00 2001
From: Bastien Guerry b...@altern.org
Date: Fri, 11 Feb 2011 11:17:16 +0100
Subject: [PATCH] Allow (currentfile) for capture templates.
* org-capture.el (org-capture-templates): document currentfile
for capture template.
(org-capture-templates): Allow to use currentfile for capture
templates.
(org-capture-set-target-location): Handle currentfile as a way
to setting the capture buffer.
* org.texi (Template elements): document currentfile for
capture templates.
---
doc/org.texi|4
lisp/org-capture.el | 12
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index f8a7493..be66b75 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6314,6 +6314,10 @@ Valid values are:
@item (file path/to/file)
Text will be placed at the beginning or end of that file.
+@item (currentfile)
+Text will be placed at the beginning or end of the file
+@code{org-capture} is called from.
+
@item (id id of existing org entry)
Filing as child of this entry, or in the body of the entry.
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index e258308..2f9b379 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -120,6 +120,10 @@ target Specification of where the captured item
should be placed.
(file \path/to/file\)
Text will be placed at the beginning or end of that file
+ (currentfile)
+ Text will be placed at the beginning or end of the file
+ org-capture is called from
+
(id \id of existing org entry\)
File as child of this entry, or in the body of the entry
@@ -266,6 +270,8 @@ calendar| %:type %:date
(list :tag File
(const :format file)
(file :tag File))
+(list :tag Current file
+ (const :format currentfile))
(list :tag ID
(const :format id)
(string :tag ID))
@@ -632,6 +638,12 @@ already gone. Any prefix argument will be passed to the
refile comand.
(set-buffer (org-capture-target-buffer (nth 1 target)))
(setq target-entry-p nil))
+ ((eq (car target) 'currentfile)
+ (if (not (and (buffer-file-name) (org-mode-p)))
+ (error Cannot call this capture template outside of an Org buffer)
+ (set-buffer (org-capture-target-buffer (buffer-file-name)))
+ (setq target-entry-p nil)))
+
((eq (car target) 'id)
(let ((loc (org-id-find (nth 1 target
(if (not loc)
--
1.7.4
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Add explicit time zone to datetime exported to ical.
Patch 502 (http://patchwork.newartisans.com/patch/502/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87lj3ixljr.dlv%40debian.org%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Add explicit time zone to datetime exported to ical. Date: Wed, 22 Dec 2010 13:24:08 - From: =?utf-8?q?R=C3=A9mi_Vanicat_=3Cvanicat=40debian=2Eorg=3E?= X-Patchwork-Id: 502 Message-Id: 87lj3ixljr@debian.org To: emacs-orgmode@gnu.org When exporting to ical, using localtime is incompatible with some software, using explicit universal time may failed with daylight saving time, so we need another possibility, that is localtime with explicit timezone. --- lisp/org-icalendar.el | 30 +- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el index d4034fe..1dfd3ed 100644 --- a/lisp/org-icalendar.el +++ b/lisp/org-icalendar.el @@ -194,12 +194,25 @@ When nil of the empty string, use the abbreviation retrieved from Emacs. (const :tag Unspecified nil) (string :tag Time zone))) -(defcustom org-icalendar-use-UTC-date-time () - Non-nil force the use of the universal time for iCalendar DATE-TIME. -The iCalendar DATE-TIME can be expressed with local time or universal Time, -universal time could be more compatible with some external tools. +(defcustom org-icalendar-date-time-format :%Y%m%dT%H%M%S + format-string for exporting icalendar DATE-TIME. +See `format-time-string' for a full documentation. The only +difference is that `org-icalendar-timezone' is used for %Z + +Interesting value are: + - \:%Y%m%dT%H%M%S\ for local time + - \;TZID=%Z:%Y%m%dT%H%M%S\ for local time with explicit timezone + - \:%Y%m%dT%H%M%SZ\ for time expressed in Universal Time + :group 'org-export-icalendar - :type 'boolean) + :type '(choice + (const :tag Local time :%Y%m%dT%H%M%S) + (const :tag Explicit local time ;TZID=%Z:%Y%m%dT%H%M%S) + (const :tag Universal time :%Y%m%dT%H%M%SZ) + (string :tag Explicit format))) + +(defun org-icalendar-use-UTC-date-timep () + (char-equal (elt org-icalendar-date-time-format (1- (length org-icalendar-date-time-format))) ?Z)) ;;; iCalendar export @@ -641,12 +654,11 @@ a time), or the day by one (if it does not contain a time). (setq h (+ 2 h))) (setq d (1+ d (setq time (encode-time s mi h d m y))) - (setq fmt (if have-time (if org-icalendar-use-UTC-date-time - :%Y%m%dT%H%M%SZ - :%Y%m%dT%H%M%S) + (setq fmt (if have-time + (replace-regexp-in-string %Z org-icalendar-timezone org-icalendar-date-time-format) ;VALUE=DATE:%Y%m%d)) (concat keyword (format-time-string fmt time - (and org-icalendar-use-UTC-date-time + (and (org-icalendar-use-UTC-date-timep) have-time)) (provide 'org-icalendar) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] PATCH: org-open-at-point curation
Patch 564 (http://patchwork.newartisans.com/patch/564/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3Cm1lj22z7wo.fsf%40gmail.com%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] PATCH: org-open-at-point curation
Date: Sun, 30 Jan 2011 21:13:43 -
From: Dan Davison dandavis...@gmail.com
X-Patchwork-Id: 564
Message-Id: m1lj22z7wo@gmail.com
To: emacs org-mode mailing list emacs-orgmode@gnu.org
While fiddling with the way babel uses org-open-at-point, I noticed a
coupe of things:
1. There's a bug when using the prefix arg with a text search
link. E.g. try C-u C-c C-o on [[foo]]
2. The prefix arg is used in three different ways (two of them
undocumented), not all of which correspond to the variable name used
for the prefix arg. I'm leaving the extra uses undocumented, but have
renamed the
prefix arg with a more generic name.
Dan
~
Some curation of `org-open-at-point'
* lisp/org.el (org-open-at-point): Fix bug when using prefix arg to
construct `org-link-search' call. Rename prefix arg with a more
generic name, to reflect its diverse uses in this function.
#+begin_src diff
#+end_src
diff --git a/lisp/org.el b/lisp/org.el
index a49d3e2..186af9d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9084,12 +9084,12 @@ Functions in this hook must return t if they identify
and follow
a link at point. If they don't find anything interesting at point,
they must return nil.)
-(defun org-open-at-point (optional in-emacs reference-buffer)
+(defun org-open-at-point (optional arg reference-buffer)
Open link at or after point.
If there is no link at point, this function will search forward up to
the end of the current line.
Normally, files will be opened by an appropriate application. If the
-optional argument IN-EMACS is non-nil, Emacs will visit the file.
+optional prefix argument ARG is non-nil, Emacs will visit the file.
With a double prefix argument, try to open outside of Emacs, in the
application the system uses for this file type.
(interactive P)
@@ -9107,7 +9107,7 @@ application the system uses for this file type.
org-angle-link-re \\|
[ \t]:[^ \t\n]+:[ \t]*$)))
(not (get-text-property (point) 'org-linked-text)))
-(or (org-offer-links-in-entry in-emacs)
+(or (org-offer-links-in-entry arg)
(progn (require 'org-attach) (org-attach-reveal 'if-exists
((run-hook-with-args-until-success 'org-open-at-point-functions))
((org-at-timestamp-p t) (org-follow-timestamp-link))
@@ -9212,7 +9212,7 @@ application the system uses for this file type.
(browse-url (concat type : path)))
((string= type tags)
- (org-tags-view in-emacs path))
+ (org-tags-view arg path))
((string= type tree-match)
(org-occur (concat \\[ (regexp-quote path) \\])))
@@ -9226,7 +9226,7 @@ application the system uses for this file type.
path (substring path 0 (match-beginning 0)
(if (string-match [*?{] (file-name-nondirectory path))
(dired path)
- (org-open-file path in-emacs line search)))
+ (org-open-file path arg line search)))
((string= type shell)
(let ((cmd path))
@@ -9258,14 +9258,14 @@ application the system uses for this file type.
'org-open-link-functions path)))
((string= type thisfile)
- (if in-emacs
+ (if arg
(switch-to-buffer-other-window
(org-get-buffer-for-internal-link (current-buffer)))
(org-mark-ring-push))
(let ((cmd `(org-link-search
,path
-,(cond ((equal in-emacs '(4)) 'occur)
- ((equal in-emacs '(16)) 'org-occur)
+,(cond ((equal arg '(4)) ''occur)
+ ((equal arg '(16)) ''org-occur)
(t nil))
,pos)))
(condition-case nil (eval cmd)
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Orgmode] [Accepted] [Orgmode, 1/2] Only match complete words in org-export-add-options-to-plist
Patch 551 (http://patchwork.newartisans.com/patch/551/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1c07dac7fa0dd036dec6a1147fde83c5cddf8639.1295529378.git.wence%40gmx.li%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode, 1/2] Only match complete words in org-export-add-options-to-plist Date: Thu, 20 Jan 2011 18:23:22 - From: Lawrence Mitchell we...@gmx.li X-Patchwork-Id: 551 Message-Id: 1c07dac7fa0dd036dec6a1147fde83c5cddf8639.1295529378.git.we...@gmx.li To: emacs-orgmode@gnu.org Cc: Lawrence Mitchell we...@gmx.li * org-exp.el (org-export-add-options-to-plist): Require match to start at a word-boundary. Previously, if an option was the suffix of another option (such as TeX and LaTeX) the setting for the former would propagator to the latter. This seems like an unintended consequence of a lax regexp in org-export-add-options-to-plist. This patch allows options to share a suffix with another option by requiring that the match against an option starts at a word-boundary. --- lisp/org-exp.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 9954227..d099c82 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -824,7 +824,7 @@ security risks. (let ((op org-export-plist-vars)) (while (setq o (pop op)) (if (and (nth 1 o) -(string-match (concat (regexp-quote (nth 1 o)) +(string-match (concat \\ (regexp-quote (nth 1 o)) :\\([^ \t\n\r;,.]*\\)) options)) (setq p (plist-put p (car o) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Better sitemap formating
Patch 594 (http://patchwork.newartisans.com/patch/594/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87lj1m7hts.fsf%40univ-nantes.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Better sitemap formating Date: Fri, 11 Feb 2011 19:43:11 - From: Manuel Giraud manuel.gir...@univ-nantes.fr X-Patchwork-Id: 594 Message-Id: 87lj1m7hts@univ-nantes.fr To: emacs-orgmode emacs-orgmode@gnu.org Hi, Here's a patch that make the sitemap entry formating coherent with the new html-pre/postamble one. While here I was trying to add some documentation about this feature in org.texi but I end up copy/pasting or paraphrasing the docstring of correspondant customs. Is it acceptable for the documentation or plain useless? From 766b0db7d0189d2edb0d8799c3424d62f9ac4e47 Mon Sep 17 00:00:00 2001 From: Manuel Giraud manuel.gir...@univ-nantes.fr Date: Fri, 11 Feb 2011 15:32:58 +0100 Subject: [PATCH] org-publish.el: sitemap formating coherent with new preamble Adopt downcase for format directive to be coherent with the new pre/postamble formating. Use `format-spec' function instead of `org-replace-escapes'. --- lisp/org-publish.el | 21 ++--- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index a7aaee2..3a29d06 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -55,6 +55,7 @@ (require 'cl)) (require 'org) (require 'org-exp) +(require 'format-spec) (eval-and-compile (unless (fboundp 'declare-function) @@ -271,13 +272,13 @@ in the sitemap. :group 'org-publish :type 'string) -(defcustom org-publish-sitemap-file-entry-format %T +(defcustom org-publish-sitemap-file-entry-format %t How a sitemap file entry is formated. You could use brackets to delimit on what part the link will be. -%T is the title. -%A is the author. -%D is the date formated using `org-publish-sitemap-date-format'. +%t is the title. +%a is the author. +%d is the date formated using `org-publish-sitemap-date-format'. :group 'org-publish :type 'string) @@ -816,13 +817,11 @@ Default for SITEMAP-FILENAME is 'sitemap.org'. (or visiting (kill-buffer sitemap-buffer (defun org-publish-format-file-entry (fmt file project-plist) - (org-replace-escapes fmt -(list (cons %T (org-publish-find-title file)) - (cons %D (format-time-string - sitemap-date-format - (org-publish-find-date file))) - (cons %A (or (plist-get project-plist :author) - user-full-name) + (format-spec fmt + `((?t . ,(org-publish-find-title file)) +(?d . ,(format-time-string sitemap-date-format + (org-publish-find-date file))) +(?a . ,(or (plist-get project-plist :author) user-full-name) (defun org-publish-find-title (file) Find the title of FILE in project. -- 1.7.1 ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Orgmode] [Accepted] [Orgmode,2/2] org-publish
Patch 590 (http://patchwork.newartisans.com/patch/590/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87bp2lcs6d.fsf%40univ-nantes.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode,2/2] org-publish Date: Wed, 09 Feb 2011 17:23:54 - From: Manuel Giraud manuel.gir...@univ-nantes.fr X-Patchwork-Id: 590 Message-Id: 87bp2lcs6d@univ-nantes.fr To: Bastien bastien.gue...@wikimedia.fr Cc: emacs-orgmode emacs-orgmode@gnu.org Bastien bastien.gue...@wikimedia.fr writes: I'd welcome a reworked version of this idea! Hi Bastien, Thanks for accepting my previous patch. Here's a new version of this last patch that support formated sitemap entry. --8---cut here---start-8--- commit 660ece15eca316075da6529560bf66565934b713 Author: Manuel Giraud manuel.gir...@univ-nantes.fr Date: Tue Nov 23 16:20:15 2010 +0100 formated sitemap Modified lisp/org-publish.el --8---cut here---end---8--- Best regards, diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 47b80db..98e09f3 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -267,6 +267,22 @@ You can overwrite this default per project in your :group 'org-publish :type 'boolean) +(defcustom org-publish-sitemap-date-format %Y-%m-%d + Format for `format-time-string' which is used to print a date +in the sitemap. + :group 'org-publish + :type 'string) + +(defcustom org-publish-sitemap-file-entry-format %T + How a sitemap file entry is formated. +You could use brackets to delimit on what part the link will be. + +%T is the title. +%A is the author. +%D is the date formated using `org-publish-sitemap-date-format'. + :group 'org-publish + :type 'string) + ;;; Timestamp-related functions @@ -370,6 +386,8 @@ This splices all the components into the list. (defvar sitemap-sort-folders) (defvar sitemap-ignore-case) (defvar sitemap-requested) +(defvar sitemap-date-format) +(defvar sitemap-file-entry-format) (defun org-publish-compare-directory-files (a b) Predicate for `sort', that sorts folders and files for sitemap. (let ((retval t)) @@ -392,8 +410,10 @@ This splices all the components into the list. (not (string-lessp B A)) ((or (equal sitemap-sort-files 'chronologically) (equal sitemap-sort-files 'anti-chronologically)) - (let ((A (org-publish-find-date a)) -(B (org-publish-find-date b))) + (let* ((adate (org-publish-find-date a)) + (bdate (org-publish-find-date b)) + (A (+ (lsh (car adate) 16) (cadr adate))) + (B (+ (lsh (car bdate) 16) (cadr bdate (setq retval (if (equal sitemap-sort-files 'chronologically) (= A B) (= A B))) @@ -701,6 +721,10 @@ If :makeindex is set, also produce a file theindex.org. sitemap.org)) (sitemap-function (or (plist-get project-plist :sitemap-function) 'org-publish-org-sitemap)) + (sitemap-date-format (or (plist-get project-plist :sitemap-date-format) +org-publish-sitemap-date-format)) + (sitemap-file-entry-format (or (plist-get project-plist :sitemap-file-entry-format) + org-publish-sitemap-file-entry-format)) (preparation-function (plist-get project-plist :preparation-function)) (completion-function (plist-get project-plist :completion-function)) (files (org-publish-get-base-files project exclude-regexp)) file) @@ -776,12 +800,32 @@ Default for SITEMAP-FILENAME is 'sitemap.org'. (setq indent-str (make-string (+ (length indent-str) 2) ?\ ))) ;; This is common to 'flat and 'tree - (insert (concat indent-str + [[file: link ][ - (org-publish-find-title file) - ]]\n) + (let ((entry +(org-publish-format-file-entry sitemap-file-entry-format + file project-plist)) + (regexp \\(.*\\)\\[\\([^][]+\\)\\]\\(.*\\))) + (cond ((string-match-p regexp entry) + (string-match regexp entry) + (insert (concat indent-str + (match-string 1 entry) + [[file: link ][ + (match-string 2 entry) + ]]
[Accepted] [Orgmode] org-mhe-store-link alters window layout
Patch 584 (http://patchwork.newartisans.com/patch/584/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1337.1297074568%40maps%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] org-mhe-store-link alters window layout Date: Mon, 07 Feb 2011 15:29:28 - From: Stephen Eglen s.j.eg...@damtp.cam.ac.uk X-Patchwork-Id: 584 Message-Id: 1337.1297074568@maps To: emacs-orgmode@gnu.org Cc: thomas.baum...@ch.tum.de, Stephen Eglen s.j.eg...@damtp.cam.ac.uk If I run M-x org-store-link when my current emacs frame is just showing one MH-E window (and nothing else in the frame), e.g. the show-+inbox buffer, then the link to that email is created okay, but the window frames are altered so that the +inbox summary window is also shown. In general, the previous window contents are forgotten. I suggest adding a 'save-window-excursion' into org-mhe-store-link so that the window arrangement is preserved on exit from the function. Patch below is long just because of the extra indentation. Stephen diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el index c384062..c9b0481 100644 --- a/lisp/org-mhe.el +++ b/lisp/org-mhe.el @@ -83,27 +83,28 @@ supported by MH-E. Store a link to an MH-E folder or message. (when (or (equal major-mode 'mh-folder-mode) (equal major-mode 'mh-show-mode)) -(let* ((from (org-mhe-get-header From:)) -(to (org-mhe-get-header To:)) -(message-id (org-mhe-get-header Message-Id:)) -(subject (org-mhe-get-header Subject:)) -(date (org-mhe-get-header Date:)) -(date-ts (and date (format-time-string -(org-time-stamp-format t) (date-to-time date -(date-ts-ia (and date (format-time-string - (org-time-stamp-format t t) - (date-to-time date -link desc) - (org-store-link-props :type mh :from from :to to - :subject subject :message-id message-id) - (when date - (org-add-link-props :date date :date-timestamp date-ts - :date-timestamp-inactive date-ts-ia)) - (setq desc (org-email-link-description)) - (setq link (org-make-link mhe: (org-mhe-get-message-real-folder) # - (org-remove-angle-brackets message-id))) - (org-add-link-props :link link :description desc) - link))) +(save-window-excursion + (let* ((from (org-mhe-get-header From:)) + (to (org-mhe-get-header To:)) + (message-id (org-mhe-get-header Message-Id:)) + (subject (org-mhe-get-header Subject:)) + (date (org-mhe-get-header Date:)) + (date-ts (and date (format-time-string + (org-time-stamp-format t) (date-to-time date + (date-ts-ia (and date (format-time-string + (org-time-stamp-format t t) + (date-to-time date + link desc) + (org-store-link-props :type mh :from from :to to + :subject subject :message-id message-id) + (when date + (org-add-link-props :date date :date-timestamp date-ts + :date-timestamp-inactive date-ts-ia)) + (setq desc (org-email-link-description)) + (setq link (org-make-link mhe: (org-mhe-get-message-real-folder) # + (org-remove-angle-brackets message-id))) + (org-add-link-props :link link :description desc) + link (defun org-mhe-open (path) Follow an MH-E message link specified by PATH. ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] org-crypt: cache encrypted text
Patch 586 (http://patchwork.newartisans.com/patch/586/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1297102717-5071-1-git-send-email-julien%40danjou.info%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] org-crypt: cache encrypted text Date: Mon, 07 Feb 2011 23:18:37 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 586 Message-Id: 1297102717-5071-1-git-send-email-jul...@danjou.info To: emacs-orgmode@gnu.org Cc: Julien Danjou jul...@danjou.info * lisp/org-crypt.el (org-encrypt-string): New function. (org-encrypt-entry): Use org-encrypt-string to encrypt, so we use cached crypted values. (org-decrypt-entry): Store crypted text in decrypted text. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-crypt.el | 26 -- 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 7c28d70..291c540 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -103,6 +103,15 @@ This setting can also be overridden in the CRYPTKEY property. (and (boundp 'epa-file-encrypt-to) epa-file-encrypt-to) (message No crypt key set, using symmetric encryption. +(defun org-encrypt-string (str crypt-key) + Return STR encrypted with CRYPT-KEY. + ;; Text and key have to be identical, otherwise we re-crypt. + (if (and (string= crypt-key (get-text-property 0 'org-crypt-key str)) +(string= (sha1 str) (get-text-property 0 'org-crypt-checksum str))) + (get-text-property 0 'org-crypt-text str) +(let ((epg-context (epg-make-context nil t t))) + (epg-encrypt-string epg-context str (epg-list-keys epg-context crypt-key) + (defun org-encrypt-entry () Encrypt the content of the current headline. (interactive) @@ -122,10 +131,7 @@ This setting can also be overridden in the CRYPTKEY property. (org-back-over-empty-lines) (setq end (point) encrypted-text -(epg-encrypt-string - epg-context - (buffer-substring-no-properties beg end) - (epg-list-keys epg-context crypt-key))) + (org-encrypt-string (buffer-substring beg end) crypt-key)) (delete-region beg end) (insert encrypted-text) (when folded @@ -152,16 +158,24 @@ This setting can also be overridden in the CRYPTKEY property. (forward-line) (point))) (epg-context (epg-make-context nil t t)) + (encrypted-text (buffer-substring-no-properties (point) end)) (decrypted-text (decode-coding-string (epg-decrypt-string epg-context - (buffer-substring-no-properties (point) end)) + encrypted-text) 'utf-8))) ;; Delete region starting just before point, because the ;; outline property starts at the \n of the heading. (delete-region (1- (point)) end) - (insert \n decrypted-text) + ;; Store a checksum of the decrypted and the encrypted + ;; text value. This allow to reuse the same encrypted text + ;; if the text does not change, and therefore avoid a + ;; re-encryption process. + (insert \n (propertize decrypted-text + 'org-crypt-checksum (sha1 decrypted-text) + 'org-crypt-key (org-crypt-key-for-heading) + 'org-crypt-text encrypted-text)) (when heading-was-invisible-p (goto-char heading-point) (org-flag-subtree t)) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] org-bbdb: allow anniversaries with unknown years
Patch 585 (http://patchwork.newartisans.com/patch/585/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1297078995-9030-1-git-send-email-cwg%40falma.de%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] org-bbdb: allow anniversaries with unknown years
Date: Mon, 07 Feb 2011 16:43:15 -
From: Christoph Groth c...@falma.de
X-Patchwork-Id: 585
Message-Id: 1297078995-9030-1-git-send-email-...@falma.de
To: emacs-orgmode@gnu.org
Cc: Christoph Groth c...@falma.de
Anniversaries in BBDB can be now also specified in the format MM-DD
next to -MM-DD.
---
doc/org.texi | 11 ++-
lisp/org-bbdb.el | 27 ++-
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index b406d29..bfcef06 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -7098,14 +7098,15 @@ following to one your your agenda files:
You can then go ahead and define anniversaries for a BBDB record. Basically,
you need to press @kbd{C-o anniversary @key{RET}} with the cursor in a BBDB
-record and then add the date in the format @code{-MM-DD}, followed by a
-space and the class of the anniversary (@samp{birthday} or @samp{wedding}, or
-a format string). If you omit the class, it will default to @samp{birthday}.
-Here are a few examples, the header for the file @file{org-bbdb.el} contains
-more detailed information.
+record and then add the date in the format @code{-MM-DD} or @code{MM-DD},
+followed by a space and the class of the anniversary (@samp{birthday} or
+@samp{wedding}, or a format string). If you omit the class, it will default
to
+@samp{birthday}. Here are a few examples, the header for the file
+@file{org-bbdb.el} contains more detailed information.
@example
1973-06-22
+06-22
1955-08-02 wedding
2008-04-14 %s released version 6.01 of org-mode, %d years ago
@end example
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 4155f58..c04b7ff 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -136,12 +136,12 @@
'((birthday lambda
(name years suffix)
(concat Birthday: [[bbdb: name ][ name (
- (number-to-string years)
+ (format %s years); handles numbers as well as strings
suffix )]]))
(wedding lambda
(name years suffix)
(concat [[bbdb: name ][ name 's
- (number-to-string years)
+ (format %s years)
suffix wedding anniversary]])))
How different types of anniversaries should be formatted.
An alist of elements (STRING . FORMAT) where STRING is the name of an
@@ -239,11 +239,16 @@ italicized, in all other cases it is left unchanged.
(defun org-bbdb-anniv-extract-date (time-str)
Convert -MM-DD to (month date year).
-Argument TIME-STR is the value retrieved from BBDB.
- (multiple-value-bind (y m d) (values-list (bbdb-split time-str -))
-(list (string-to-number m)
- (string-to-number d)
- (string-to-number y
+Argument TIME-STR is the value retrieved from BBDB. If - is omitted
+it will be considered unknown.
+ (multiple-value-bind (a b c) (values-list (bbdb-split time-str -))
+(if (eq c nil)
+(list (string-to-number a)
+ (string-to-number b)
+ nil)
+ (list (string-to-number b)
+(string-to-number c)
+(string-to-number a)
(defun org-bbdb-anniv-split (str)
Split multiple entries in the BBDB anniversary field.
@@ -326,8 +331,12 @@ This is used by Org to re-create the anniversary hash
table.
class org-bbdb-anniversary-format-alist t))
class)) ; (as format string)
(name (nth 1 rec))
- (years (- y (car rec)))
- (suffix (diary-ordinal-suffix years))
+ (years (if (eq (car rec) nil)
+unknown
+ (- y (car rec
+ (suffix (if (eq (car rec) nil)
+
+ (diary-ordinal-suffix years)))
(tmp (cond
((functionp form)
(funcall form name years suffix))
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Orgmode] [Accepted] [Orgmode,1/2] org-publish
Patch 429 (http://patchwork.newartisans.com/patch/429/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C87mxop7qp3.fsf%40univ-nantes.fr%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode,1/2] org-publish
Date: Wed, 01 Dec 2010 15:06:16 -
From: Manuel Giraud manuel.gir...@univ-nantes.fr
X-Patchwork-Id: 429
Message-Id: 87mxop7qp3@univ-nantes.fr
To: emacs-orgmode emacs-orgmode@gnu.org
Hi,
This first patch adds sort options to the sitemap. In addition to
alphabetical order, one can choose chronological or anti-chronological
ordering of sitemap entries. To retrieve file date, it tries to parse
the #+date keyword and if not present defaults to file modification
time.
diff --git a/doc/org.texi b/doc/org.texi
index 4e8eb63..c283503 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -10859,9 +10859,13 @@ of links to all files in the project.
(default) or @code{last} to display folders first or last,
respectively. Any other value will mix files and folders.
-@item @code{:sitemap-alphabetically}
-@tab The site map is normally sorted alphabetically. Set this explicitly to
-@code{nil} to turn off sorting.
+@item @code{:sitemap-sort-files}
+@tab How the files are sorted in the site map. Set this
+@code{alphabetically} (default), @code{chronologically} or
+@code{anti-chronologically}. @code{chronologically} sorts the files with
+older date first while @code{anti-chronologically} sorts the files with newer
+date first. @code{alphabetically} sorts the files alphabetically. The date of
+a file is retrieved with @code{org-publish-find-date}.
@item @code{:sitemap-ignore-case}
@tab Should sorting be case-sensitive? Default @code{nil}.
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index c66cd29..edc0b5c 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -186,8 +186,9 @@ sitemap of files or summary page for a given project.
Set this to `first' (default) or `last' to
display folders first or last, respectively.
Any other value will mix files and folders.
- :sitemap-alphabetically The site map is normally sorted alphabetically.
- Set this explicitly to nil to turn off sorting.
+ :sitemap-sort-files The site map is normally sorted alphabetically.
+ You can change this behaviour setting this to
+ `chronologically', `anti-chronologically' or nil.
:sitemap-ignore-case Should sorting be case-sensitive? Default nil.
The following properties control the creation of a concept index.
@@ -233,13 +234,18 @@ Any changes made by this hook will be saved.
:group 'org-publish
:type 'hook)
-(defcustom org-publish-sitemap-sort-alphabetically t
- Should sitemaps be sorted alphabetically by default?
+(defcustom org-publish-sitemap-sort-files 'alphabetically
+ How sitemaps files should be sorted by default?
+Possible values are `alphabetically', `chronologically',
`anti-chronologically' and nil.
+If `alphabetically', files will be sorted alphabetically.
+If `chronologically', files will be sorted with older modification time
first.
+If `anti-chronologically', files will be sorted with newer modification time
first.
+nil won't sort files.
You can overwrite this default per project in your
-`org-publish-project-alist', using `:sitemap-alphabetically'.
+`org-publish-project-alist', using `:sitemap-sort-files'.
:group 'org-publish
- :type 'boolean)
+ :type 'symbol)
(defcustom org-publish-sitemap-sort-folders 'first
A symbol, denoting if folders are sorted first in sitemaps.
@@ -360,30 +366,37 @@ This splices all the components into the list.
(nreverse (org-publish-delete-dups (delq nil rtn)
-(defvar sitemap-alphabetically)
+(defvar sitemap-sort-files)
(defvar sitemap-sort-folders)
(defvar sitemap-ignore-case)
(defvar sitemap-requested)
(defun org-publish-compare-directory-files (a b)
- Predicate for `sort', that sorts folders-first/last and alphabetically.
+ Predicate for `sort', that sorts folders and files for sitemap.
(let ((retval t))
-(when (or sitemap-alphabetically sitemap-sort-folders)
- ;; First we sort alphabetically:
- (when sitemap-alphabetically
-(let* ((adir (file-directory-p a))
- (aorg (and (string-match \\.org$ a) (not adir)))
- (bdir (file-directory-p b))
- (borg (and (string-match \\.org$ b) (not bdir)))
- (A (if aorg
- (concat (file-name-directory a)
- (org-publish-find-title a)) a))
- (B (if borg
- (concat (file-name-directory b)
[Accepted] [Orgmode] Re: [Accepted] Re: Bug: Jumping to a date in the agenda changes view back to 'day' [7.4 (release_7.4.80.g0e5e5)]
Patch 587 (http://patchwork.newartisans.com/patch/587/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87sjvzaezr.fsf%40keller.adm.naquadah.org%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Re: [Accepted] Re: Bug: Jumping to a date in the agenda changes view back to 'day' [7.4 (release_7.4.80.g0e5e5)] Date: Mon, 07 Feb 2011 16:39:17 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 587 Message-Id: 87sjvzaezr@keller.adm.naquadah.org To: Matt Lundin m...@imapmail.org Cc: Bastien Guerry b...@altern.org, emacs-orgmode@gnu.org On Sat, Feb 05 2011, Matt Lundin wrote: This results in only a day view because org-agenda-current-span is still 'day. Here's a proposal fix. I could have setq org-agenda-current-span to nil as a work around, but it seems more logical to just kill all the local variables. That is, a custom agenda view would not keep any of the local variable of the previous agenda, which seems logical to me. From b48fc7c395dffea60df20c23b26e362ac0354b01 Mon Sep 17 00:00:00 2001 From: Julien Danjou jul...@danjou.info Date: Mon, 7 Feb 2011 12:36:42 +0100 Subject: [PATCH] org-agenda: kill local variables in agenda view * org-agenda.el (org-agenda): Kill all local variables. This assures we are not keeping buffer variable from an old agenda view when switching to a new custom agenda. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-agenda.el |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index d146f83..9a3d953 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2161,6 +2161,8 @@ Pressing `' twice means to restrict to the current subtree or region (put 'org-agenda-redo-command 'org-lprops nil) ;; Remember where this call originated (setq org-agenda-last-dispatch-buffer (current-buffer)) + ;; Remove all local variables + (kill-all-local-variables) (unless keys (setq ans (org-agenda-get-restriction-and-command prefix-descriptions) keys (car ans) -- 1.7.2.3 ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] make export dispatcher go away promptly
Patch 582 (http://patchwork.newartisans.com/patch/582/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm1oc6rq1q8.fsf%40gmail.com%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] make export dispatcher go away promptly Date: Fri, 04 Feb 2011 20:05:35 - From: Dan Davison dandavis...@gmail.com X-Patchwork-Id: 582 Message-Id: m1oc6rq1q8@gmail.com To: emacs-orgmode@gnu.org Following on from Stephen's recent post, a thing-that-slightly-bothers-me is the way the export dispatcher window doesn't go away until export is complete. I've briefly looked at the code twice now and it wasn't obvious to me why the save-window-excursion (line 941 org-exp.el) wasn't already doing what I wanted. However, the change below seems to have the effect I wanted. While this particular solution may be a hack, I wonder whether people would prefer its behaviour? E.g. try exporting this: #+title: title #+begin_src sh :exports results sleep 5 echo hello #+end_src export can often take several seconds and it's nice to be able to zone out looking at your org document rather than the dispatcher window. Modified lisp/org-exp.el (I see that (sit-for .0001) is used in a couple of places in Org for this effect, so maybe that should be used instead.) Dan diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 13fa549..3d291e2 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -963,6 +963,7 @@ value of `org-export-run-in-background'. (setq r1 (read-char-exclusive))) (error No enclosing node with LaTeX_CLASS or EXPORT_FILE_NAME) ) +(redisplay) (and bpos (goto-char bpos)) (setq r2 (if ( r1 27) (+ r1 96) r1)) (unless (setq ass (assq r2 cmds)) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] face: make org-link inherit from link
Patch 576 (http://patchwork.newartisans.com/patch/576/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1296663684-2312-1-git-send-email-julien%40danjou.info%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] face: make org-link inherit from link Date: Wed, 02 Feb 2011 21:21:24 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 576 Message-Id: 1296663684-2312-1-git-send-email-jul...@danjou.info To: emacs-orgmode@gnu.org Cc: Julien Danjou jul...@danjou.info * org-faces.el (org-link): Make org-link inherits from link face. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-faces.el |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org-faces.el b/lisp/org-faces.el index bd509ae..aeadb9b 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -247,9 +247,10 @@ column view defines special faces for each outline level. See the file :group 'org-faces) (defface org-link - 'class color) (background light)) (:foreground Purple :underline t)) -(((class color) (background dark)) (:foreground Cyan :underline t)) -(t (:underline t))) + (org-compatible-face 'link +'class color) (background light)) (:foreground Purple :underline t)) + (((class color) (background dark)) (:foreground Cyan :underline t)) + (t (:underline t Face for links. :group 'org-faces) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] face: make org-special-keyword inherit
Patch 575 (http://patchwork.newartisans.com/patch/575/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1296667028-3225-1-git-send-email-julien%40danjou.info%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] face: make org-special-keyword inherit Date: Wed, 02 Feb 2011 22:17:08 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 575 Message-Id: 1296667028-3225-1-git-send-email-jul...@danjou.info To: emacs-orgmode@gnu.org Cc: Julien Danjou jul...@danjou.info * org-faces.el (org-special-keyword): Make it inherited from font-lock-keyword-face. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-faces.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-faces.el b/lisp/org-faces.el index aeadb9b..c237a0e 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -137,7 +137,7 @@ color of the frame. :group 'org-faces) (defface org-special-keyword ;; originally copied from font-lock-string-face - (org-compatible-face nil + (org-compatible-face 'font-lock-keyword-face 'class color) (min-colors 16) (background light)) (:foreground RosyBrown)) (((class color) (min-colors 16) (background dark)) (:foreground LightSalmon)) (t (:italic t ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] put emacs functions in code font
Patch 470 (http://patchwork.newartisans.com/patch/470/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-14-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] put emacs functions in code font
Date: Thu, 09 Dec 2010 02:05:36 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 470
Message-Id: 1291842341-15199-14-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi | 44 ++--
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index c30378c..aecb224 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -12381,13 +12381,13 @@ are active:
@multitable @columnfractions 0.25 0.75
@kindex C-c C-c
-@item @kbd{C-c C-c} @tab org-babel-execute-src-block
+@item @kbd{C-c C-c} @tab @code{org-babel-execute-src-block}
@kindex C-c C-o
-@item @kbd{C-c C-o} @tab org-babel-open-src-block-result
+@item @kbd{C-c C-o} @tab @code{org-babel-open-src-block-result}
@kindex C-up
-@item @kbd{C-@key{up}}@tab org-babel-load-in-session
+@item @kbd{C-@key{up}}@tab @code{org-babel-load-in-session}
@kindex M-down
-@item @kbd{M-@key{down}} @tab org-babel-pop-to-session
+@item @kbd{M-@key{down}} @tab @code{org-babel-pop-to-session}
@end multitable
In an Org-mode buffer, the following key bindings are active:
@@ -12395,46 +12395,46 @@ In an Org-mode buffer, the following key bindings
are active:
@multitable @columnfractions 0.45 0.55
@kindex C-c C-v a
@kindex C-c C-v C-a
-@item @kbd{C-c C-v a} @ @ @r{or} @ @ @kbd{C-c C-v C-a} @tab
org-babel-sha1-hash
+@item @kbd{C-c C-v a} @ @ @r{or} @ @ @kbd{C-c C-v C-a} @tab
@code{org-babel-sha1-hash}
@kindex C-c C-v b
@kindex C-c C-v C-b
-@item @kbd{C-c C-v b} @ @ @r{or} @ @ @kbd{C-c C-v C-b} @tab
org-babel-execute-buffer
+@item @kbd{C-c C-v b} @ @ @r{or} @ @ @kbd{C-c C-v C-b} @tab
@code{org-babel-execute-buffer}
@kindex C-c C-v f
@kindex C-c C-v C-f
-@item @kbd{C-c C-v f} @ @ @r{or} @ @ @kbd{C-c C-v C-f} @tab
org-babel-tangle-file
+@item @kbd{C-c C-v f} @ @ @r{or} @ @ @kbd{C-c C-v C-f} @tab
@code{org-babel-tangle-file}
@kindex C-c C-v g
-@item @kbd{C-c C-v g} @tab org-babel-goto-named-source-block
+@item @kbd{C-c C-v g} @tab @code{org-babel-goto-named-source-block}
@kindex C-c C-v h
-@item @kbd{C-c C-v h} @tab org-babel-describe-bindings
+@item @kbd{C-c C-v h} @tab @code{org-babel-describe-bindings}
@kindex C-c C-v l
@kindex C-c C-v C-l
-@item @kbd{C-c C-v l} @ @ @r{or} @ @ @kbd{C-c C-v C-l} @tab
org-babel-lob-ingest
+@item @kbd{C-c C-v l} @ @ @r{or} @ @ @kbd{C-c C-v C-l} @tab
@code{org-babel-lob-ingest}
@kindex C-c C-v p
@kindex C-c C-v C-p
-@item @kbd{C-c C-v p} @ @ @r{or} @ @ @kbd{C-c C-v C-p} @tab
org-babel-expand-src-block
+@item @kbd{C-c C-v p} @ @ @r{or} @ @ @kbd{C-c C-v C-p} @tab
@code{org-babel-expand-src-block}
@kindex C-c C-v s
@kindex C-c C-v C-s
-@item @kbd{C-c C-v s} @ @ @r{or} @ @ @kbd{C-c C-v C-s} @tab
org-babel-execute-subtree
+@item @kbd{C-c C-v s} @ @ @r{or} @ @ @kbd{C-c C-v C-s} @tab
@code{org-babel-execute-subtree}
@kindex C-c C-v t
@kindex C-c C-v C-t
-@item @kbd{C-c C-v t} @ @ @r{or} @ @ @kbd{C-c C-v C-t} @tab org-babel-tangle
+@item @kbd{C-c C-v t} @ @ @r{or} @ @ @kbd{C-c C-v C-t} @tab
@code{org-babel-tangle}
@kindex C-c C-v z
@kindex C-c C-v C-z
-@item @kbd{C-c C-v z} @ @ @r{or} @ @ @kbd{C-c C-v C-z} @tab
org-babel-switch-to-session
+@item @kbd{C-c C-v z} @ @ @r{or} @ @ @kbd{C-c C-v C-z} @tab
@code{org-babel-switch-to-session}
@end multitable
@c When possible these keybindings were extended to work when the control
key is
@c kept pressed, resulting in the following additional keybindings.
@c @multitable @columnfractions 0.25 0.75
-@c @item @kbd{C-c C-v C-a} @tab org-babel-sha1-hash
-@c @item @kbd{C-c C-v C-b} @tab org-babel-execute-buffer
-@c @item @kbd{C-c C-v C-f} @tab org-babel-tangle-file
-@c @item @kbd{C-c C-v C-l} @tab org-babel-lob-ingest
-@c @item @kbd{C-c C-v C-p} @tab org-babel-expand-src-block
-@c @item @kbd{C-c C-v C-s} @tab org-babel-execute-subtree
-@c @item @kbd{C-c C-v C-t} @tab org-babel-tangle
-@c @item @kbd{C-c C-v C-z} @tab org-babel-switch-to-session
+@c @item @kbd{C-c C-v C-a} @tab @code{org-babel-sha1-hash}
+@c @item @kbd{C-c C-v C-b} @tab @code{org-babel-execute-buffer}
+@c @item @kbd{C-c C-v C-f} @tab @code{org-babel-tangle-file}
+@c @item @kbd{C-c C-v C-l} @tab @code{org-babel-lob-ingest}
+@c @item @kbd{C-c C-v C-p} @tab @code{org-babel-expand-src-block}
+@c @item @kbd{C-c C-v C-s} @tab @code{org-babel-execute-subtree}
+@c @item @kbd{C-c
[Accepted] [Orgmode] make time stamps consistent with timestamps
Patch 454 (http://patchwork.newartisans.com/patch/454/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-11-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] make time stamps consistent with timestamps
Date: Thu, 09 Dec 2010 02:05:33 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 454
Message-Id: 1291842341-15199-11-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 930f948..553d670 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6608,7 +6608,7 @@ create new nodes as new parents for refiling on the
fly, check the
variable @code{org-refile-allow-creating-parent-nodes}.
When the variable @code{org-log-refile}@footnote{with corresponding
@code{#+STARTUP} keywords @code{logrefile}, @code{lognoterefile},
-and @code{nologrefile}} is set, a time stamp or a note will be
+and @code{nologrefile}} is set, a timestamp or a note will be
recorded when an entry has been refiled.
@orgkey{C-u C-c C-w}
Use the refile interface to jump to a heading.
@@ -7987,7 +7987,7 @@ $ @r{Archive all selected entries.}
A @r{Archive entries by moving them to their respective archive siblings.}
t @r{Change TODO state. This prompts for a single TODO keyword and}
@r{changes the state of all selected entries, bypassing blocking and}
- @r{suppressing logging notes (but not time stamps).}
+ @r{suppressing logging notes (but not timestamps).}
+ @r{Add a tag to all selected entries.}
- @r{Remove a tag from all selected entries.}
s @r{Schedule all items to a new date. To shift existing schedule dates}
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] typo/grammar fix for .done CSS explanation
Patch 456 (http://patchwork.newartisans.com/patch/456/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-17-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] typo/grammar fix for .done CSS explanation
Date: Thu, 09 Dec 2010 02:05:39 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 456
Message-Id: 1291842341-15199-17-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 1c44a79..6b6d643 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -9701,7 +9701,7 @@ p.date @r{publishing date}
p.creator @r{creator info, about org-mode version}
.title @r{document title}
.todo @r{TODO keywords, all not-done states}
-.done @r{the DONE keywords, all stated the count as done}
+.done @r{the DONE keywords, all states that count as done}
.WAITING@r{each TODO keyword also uses a class named after
itself}
.timestamp @r{timestamp}
.timestamp-kwd @r{keyword associated with a timestamp, like SCHEDULED}
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] use code font for example footnote labels
Patch 450 (http://patchwork.newartisans.com/patch/450/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-15-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] use code font for example footnote labels
Date: Thu, 09 Dec 2010 02:05:37 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 450
Message-Id: 1291842341-15199-15-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index aecb224..a29f544 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -12892,9 +12892,9 @@ fninline@r{define footnotes inline}
fnnoinline @r{define footnotes in separate section}
fnlocal @r{define footnotes near first reference, but not inline}
fnprompt@r{prompt for footnote labels}
-fnauto @r{create [fn:1]-like labels automatically (default)}
+fnauto @r{create @code{[fn:1]}-like labels automatically (default)}
fnconfirm @r{offer automatic label for editing or confirmation}
-fnplain @r{create [1]-like labels automatically}
+fnplain @r{create @code{[1]}-like labels automatically}
fnadjust@r{automatically renumber and sort footnotes}
nofnadjust @r{do not renumber and sort automatically}
@end example
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] explain how to check the default version of Org
Patch 452 (http://patchwork.newartisans.com/patch/452/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-18-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] explain how to check the default version of Org
Date: Thu, 09 Dec 2010 02:05:40 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 452
Message-Id: 1291842341-15199-18-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 6b6d643..3a7356b 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -813,8 +813,7 @@ questions (FAQ), links to tutorials, etc@. This page is
located at
@cindex XEmacs
@b{Important:} @i{If you are using a version of Org that is part of the Emacs
-distribution or an XEmacs package, please skip this section and go directly
-to @ref{Activation}.}
+distribution or an XEmacs package, please skip this section and go directly
to @ref{Activation}. To see what version of Org (if any) is part of your
Emacs distribution, type @kbd{M-x load-library RET org} and then @kbd{M-x
org-version}.}
If you have downloaded Org from the Web, either as a distribution @file{.zip}
or @file{.tar} file, or as a Git archive, you must take the following steps
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] add index entries
Patch 462 (http://patchwork.newartisans.com/patch/462/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-19-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] add index entries
Date: Thu, 09 Dec 2010 02:05:41 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 462
Message-Id: 1291842341-15199-19-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 3a7356b..2cb8ce2 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6135,6 +6135,7 @@ suggestion.} for capturing new material.
@orgcmd{C-c c,org-capture}
Call the command @code{org-capture}. Note that this keybinding is global and
not active by default - you need to install it. If you have templates
+@cindex date tree
defined @pxref{Capture templates}, it will offer these templates for
selection or use a new Org outline node as the default template. It will
insert the template into the target file and switch to an indirect buffer
@@ -7365,6 +7366,7 @@ the files listed in
@code{org-agenda-text-search-extra-files}.
@node Stuck projects, , Search view, Built-in agenda views
@subsection Stuck projects
+@pindex GTD, Getting Things Done
If you are following a system like David Allen's GTD to organize your
work, one of the ``duties'' you have is a regular review to make sure
@@ -11255,6 +11257,7 @@ markup language for a wiki.
@comment Extracting source code, Evaluating code blocks, Exporting code
blocks, Working With Source Code
@node Extracting source code, Evaluating code blocks, Exporting code blocks,
Working With Source Code
@section Extracting source code
+@cindex tangling
@cindex source code, extracting
@cindex code block, extracting source code
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Re: Bug: Jumping to a date in the agenda changes view back to 'day' [7.4 (release_7.4.80.g0e5e5)]
Patch 543 (http://patchwork.newartisans.com/patch/543/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Csa3ei8b1sbv.fsf%40cigue.easter-eggs.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Re: Bug: Jumping to a date in the agenda changes view back to 'day' [7.4 (release_7.4.80.g0e5e5)] Date: Mon, 17 Jan 2011 20:08:04 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 543 Message-Id: sa3ei8b1sbv@cigue.easter-eggs.fr To: Carsten Dominik carsten.domi...@gmail.com Cc: Bernt Hansen be...@norang.ca, Org Mode emacs-orgmode@gnu.org, Noorul Islam K M noo...@noorul.com On Mon, Jan 17 2011, Carsten Dominik wrote: have you been following this thread? I think this has to do with your rewrite of the dagenda span stuff. Maybe you can find out better and faster that I why this goes wrong? Please read the entire thread. I've followed but not sure I understood what the bug is. But from my various tries, I found a bug: when pressing 'j', the current span is discarded. Attached is a patch that should fix that, even for future use of `org-agenda-list' with the span unspecified. :) From 9dd2fe6650b858a4083ebc083bb8d10a0d6ac7f2 Mon Sep 17 00:00:00 2001 From: Julien Danjou jul...@danjou.info Date: Mon, 17 Jan 2011 16:05:28 +0100 Subject: [PATCH] Fix agenda span on date jump * org-agenda.el (org-agenda-list): Use org-agenda-current-span as a possible default span if it is set. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-agenda.el |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 0cd620c..0d695b5 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3450,7 +3450,10 @@ given in `org-agenda-start-on-weekday'. (setq org-agenda-last-arguments (list include-all start-day span)) (org-compile-prefix-format 'agenda) (org-set-sorting-strategy 'agenda) - (let* ((span (org-agenda-ndays-to-span (or span org-agenda-ndays org-agenda-span))) + (let* ((span (org-agenda-ndays-to-span (or span + org-agenda-current-span + org-agenda-ndays + org-agenda-span))) (today (org-today)) (sd (or start-day today)) (ndays (org-agenda-span-to-ndays span sd)) -- 1.7.2.3 ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] org-crypt: fix decrypt outline display bug
Patch 561 (http://patchwork.newartisans.com/patch/561/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1296045989-11068-1-git-send-email-julien%40danjou.info%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] org-crypt: fix decrypt outline display bug Date: Wed, 26 Jan 2011 17:46:29 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 561 Message-Id: 1296045989-11068-1-git-send-email-jul...@danjou.info To: emacs-orgmode@gnu.org Cc: Julien Danjou jul...@danjou.info, John Wiegley jo...@gnu.org, Peter Jones pjo...@pmade.com * org-crypt.el (org-decrypt-entry): Delete \n on top level heading. This avoids a display bug showing the heading outlined where the text is not since it does not have the outline property. Restore subtree visibility state after decryption. Cc: John Wiegley jo...@gnu.org Cc: Peter Jones pjo...@pmade.com Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-crypt.el | 43 ++- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 1758a81..7c28d70 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -140,23 +140,32 @@ This setting can also be overridden in the CRYPTKEY property. (unless (org-before-first-heading-p) (save-excursion (org-back-to-heading t) - (forward-line) - (when (looking-at -BEGIN PGP MESSAGE-) - (let* ((beg (point)) -(end (save-excursion - (search-forward -END PGP MESSAGE-) - (forward-line) - (point))) -(epg-context (epg-make-context nil t t)) -(decrypted-text - (decode-coding-string - (epg-decrypt-string - epg-context - (buffer-substring-no-properties beg end)) - 'utf-8))) - (delete-region beg end) - (insert decrypted-text) - nil) + (let ((heading-point (point)) + (heading-was-invisible-p + (save-excursion +(outline-end-of-heading) +(outline-invisible-p + (forward-line) + (when (looking-at -BEGIN PGP MESSAGE-) + (let* ((end (save-excursion + (search-forward -END PGP MESSAGE-) + (forward-line) + (point))) + (epg-context (epg-make-context nil t t)) + (decrypted-text + (decode-coding-string +(epg-decrypt-string + epg-context + (buffer-substring-no-properties (point) end)) +'utf-8))) + ;; Delete region starting just before point, because the + ;; outline property starts at the \n of the heading. + (delete-region (1- (point)) end) + (insert \n decrypted-text) + (when heading-was-invisible-p + (goto-char heading-point) + (org-flag-subtree t)) + nil)) (defun org-encrypt-entries () Encrypt all top-level entries in the current buffer. ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Export issue of URL when the text begins with a date
Patch 565 (http://patchwork.newartisans.com/patch/565/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87sjwae2ar.wl%25dmaus%40ictsoc.de%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Export issue of URL when the text begins with a =?UTF-8?B?ZGF0ZeKAjw==?= Date: Sun, 30 Jan 2011 22:20:28 - From: David Maus dm...@ictsoc.de X-Patchwork-Id: 565 Message-Id: 87sjwae2ar.wl%dm...@ictsoc.de To: Bastien bastien.gue...@wikimedia.fr Cc: David Maus dm...@ictsoc.de, Vincent =?UTF-8?B?QmVsYcOvY2hl?= vincent@hotmail.fr, Org mode emacs-orgmode@gnu.org At Mon, 17 Jan 2011 18:55:54 +0100, Bastien wrote: David Maus dm...@ictsoc.de writes: It seems that such a non-regression test base and script do not exist. However that would be good to have in order to check that any correction does not break anything. That's exactly what the testing framework[1] could and should do. I've just not figured out how to best write tests for entire export operations. Thinking of it: We could create an input file dedicated to test link exporting, put in different kinds of links, export and then use regexps to check if the links have been exported fine. I've just added testing/links.org to the testing framework. Vincent, feel free to suggest any addition to testing/ so that we can enrich our test-base with various examples! Being able to reproduce errors on those files will help people feel confident the error does not come from their configuration. Attached patch factors out the link handling part of `org-export-as-html' in a separat function which takes the processed line and the exporting options as arguments and returns the possibly modified line. Having the link handling in a separate function makes it way easier to test this specific behaviour of export. Best, -- David --- OpenPGP... 0x99ADB83B5A4478E6 Jabber dmj...@jabber.org Email. dm...@ictsoc.de From ea1c1e8528af0490c03133a09575e72fa4d0f352 Mon Sep 17 00:00:00 2001 From: David Maus dm...@ictsoc.de Date: Sun, 30 Jan 2011 18:12:06 +0100 Subject: [PATCH] Factor out link Handling during export * org-html.el (org-html-handle-links): New function. Factor out link Handling during export. (org-export-as-html): Use new function. Putting the entire logic of link handling in a separate function makes it easier to test the link creation during html export and maybe refactor the function in the future. The body of the function is a 1:1 copy of the original code in `org-export-as-html', symbols which were used by the link handling exclusively are removed from `org-export-as-html'. --- lisp/org-html.el | 332 -- 1 files changed, 171 insertions(+), 161 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 9a5d225..2216852 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -795,6 +795,173 @@ MAY-INLINE-P allows inlining it as an image. (org-export-html-format-desc desc) /a) +(defun org-html-handle-links (line opt-plist) + Return LINE with markup of Org mode links. +OPT-PLIST is the export options list. + (let ((start 0) + (current-dir (if buffer-file-name + (file-name-directory buffer-file-name) + default-directory)) + (link-validate (plist-get opt-plist :link-validation-function)) + type id-file fnc + rpl path attr desc descp desc1 desc2 link) +(while (string-match org-bracket-link-analytic-regexp++ line start) + (setq start (match-beginning 0)) + (setq path (save-match-data (org-link-unescape +(match-string 3 line + (setq type (cond + ((match-end 2) (match-string 2 line)) + ((save-match-data + (or (file-name-absolute-p path) + (string-match ^\\.\\.?/ path))) +file) + (t internal))) + (setq path (org-extract-attributes (org-link-unescape path))) + (setq attr (get-text-property 0 'org-attributes path)) + (setq desc1 (if (match-end 5) (match-string 5 line)) + desc2 (if (match-end 2) (concat type : path) path) + descp (and desc1 (not (equal desc1 desc2))) + desc (or desc1 desc2)) + ;; Make an image out of the description if that is so wanted + (when (and descp (org-file-image-p + desc org-export-html-inline-image-extensions)) + (save-match-data + (if (string-match ^file: desc) + (setq desc (substring desc (match-end 0) + (setq desc (org-add-props +(concat img src=\ desc \/) +'(org-protected t
[Accepted] [Orgmode] org-faq: Invalid XHTML
Patch 563 (http://patchwork.newartisans.com/patch/563/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87lj23eqa7.wl%25dmaus%40ictsoc.de%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] org-faq: Invalid XHTML Date: Sat, 29 Jan 2011 19:30:08 - From: David Maus dm...@ictsoc.de X-Patchwork-Id: 563 Message-Id: 87lj23eqa7.wl%dm...@ictsoc.de To: Jambunathan K kjambunat...@gmail.com Cc: emacs-orgmode@gnu.org At Tue, 11 Jan 2011 03:31:11 +0530, Jambunathan K wrote: There are 16 errors while validating org-faq page. http://validator.w3.org/check?uri=http%3A%2F%2Forgmode.org%2Fworg%2Forg-faq.htmlcharset=%28detect+automatically%29doctype=Inlinegroup=0 Can such errors be not caught as soon as it happens? Attached patch fixes a glitch in Org's HTML export and mitigates the problem of invalid id and name attributes. Best, -- David --- OpenPGP... 0x99ADB83B5A4478E6 Jabber dmj...@jabber.org Email. dm...@ictsoc.de From 7d3072bec82934499d463a076488dc7b36192756 Mon Sep 17 00:00:00 2001 From: David Maus dm...@ictsoc.de Date: Sat, 29 Jan 2011 15:19:53 +0100 Subject: [PATCH] Create proper id and name attribute values * org-html.el (org-export-as-html) (org-export-html-format-image, org-format-org-table-html) (org-html-level-start): Solidify link targets. * org-exp.el (org-solidify-link-text): Use better regexp and replace string for id attributes. This fixes a problem with HTML export reported by Jambunathan K kjambunathan at gmail.com. The regexp of invalid characters in `org-solidify-link-text' is oriented towards the xml:id 1.0 specification (cf. http://www.w3.org/TR/xml-id/). --- lisp/org-exp.el |2 +- lisp/org-html.el | 17 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index a055bac..97f17e5 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1971,7 +1971,7 @@ can work correctly. (let* ((rtn (mapconcat 'identity - (org-split-string s [ \t\r\n]+) ==)) + (org-split-string s [^a-zA-Z0-9_\\.-]+) --)) (a (assoc rtn alist))) (or (cdr a) rtn diff --git a/lisp/org-html.el b/lisp/org-html.el index 9a5d225..8faf60f 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1150,7 +1150,7 @@ lang=\%s\ xml:lang=\%s\ (setq href (replace-regexp-in-string \\. _ (format sec-%s snumber))) - (setq href (or (cdr (assoc href org-export-preferred-target-alist)) href)) + (setq href (org-solidify-link-text (or (cdr (assoc href org-export-preferred-target-alist)) href))) (push (format (if todo @@ -1814,7 +1814,7 @@ lang=\%s\ xml:lang=\%s\ (format %sdiv %sclass=\figure\ p (if org-par-open /p\n ) - (if label (format id=\%s\ label) ))) + (if label (format id=\%s\ (org-solidify-link-text label)) ))) (format img src=\%s\%s / src (if (string-match \\alt= (or attr )) @@ -1999,7 +1999,7 @@ for formatting. This is required for the DocBook exporter. ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format caption%s/caption (or caption )) html) - (when label (push (format a name=\%s\ id=\%s\/a label label) + (when label (push (format a name=\%s\ id=\%s\/a (org-solidify-link-text label) (org-solidify-link-text label)) html)) (push html-table-tag html)) (setq html (mapcar @@ -2327,7 +2327,8 @@ When TITLE is nil, just close all open levels. (setq extra-targets (remove (or preferred target) extra-targets)) (setq extra-targets (mapconcat (lambda (x) -(if (org-uuidgen-p x) (setq x (concat ID- x))) +(setq x (org-solidify-link-text + (if (org-uuidgen-p x) (concat ID- x) x))) (format a name=\%s\ id=\%s\/a x x)) extra-targets @@ -2363,13 +2364,13 @@ When TITLE is nil, just close all open levels. (progn (org-close-li) (if target - (insert (format li id=\%s\ (or preferred target)) + (insert (format li id=\%s\ (org-solidify-link-text (or preferred target))) extra-targets title br/\n) (insert
[Accepted] [Orgmode] org-agenda: fix regexp in progress for state logging
Patch 562 (http://patchwork.newartisans.com/patch/562/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1296057132-14557-1-git-send-email-julien%40danjou.info%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] org-agenda: fix regexp in progress for state logging Date: Wed, 26 Jan 2011 20:52:12 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 562 Message-Id: 1296057132-14557-1-git-send-email-jul...@danjou.info To: emacs-orgmode@gnu.org Cc: Julien Danjou jul...@danjou.info * org-agenda.el (org-agenda-get-progress): Fix regexp for statep: it must has \\ at the end of the line. This avoid matching the following heading when there's no newline between the logged state and the next heading. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-agenda.el | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 3c1104e..6e8d07a 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4814,15 +4814,15 @@ be skipped. (setq clocked (match-string 2 rest))) (setq clocked -))) (save-excursion - (setq extra nil) - (cond -((not org-agenda-log-mode-add-notes)) -(statep - (and (looking-at .*\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$) - (setq extra (match-string 1 -(clockp - (and (looking-at .*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$) - (setq extra (match-string 1) + (setq extra + (cond + ((not org-agenda-log-mode-add-notes) nil) + (statep + (and (looking-at .*\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$) +(match-string 1))) + (clockp + (and (looking-at .*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$) +(match-string 1) (if (not (re-search-backward ^\\*+ nil t)) (setq txt org-agenda-no-heading-message) (goto-char (match-beginning 0)) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Re: [PATCH] org: remove org-invisible-p
Patch 560 (http://patchwork.newartisans.com/patch/560/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Csa3wrlshsnu.fsf%40cigue.easter-eggs.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Re: [PATCH] org: remove org-invisible-p Date: Wed, 26 Jan 2011 15:21:25 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 560 Message-Id: sa3wrlshsnu@cigue.easter-eggs.fr To: emacs-orgmode@gnu.org I just found a left over in org-list.el. :) Updated patch attached. From bf6c65a42e04d4753c58795442a479685bb5f318 Mon Sep 17 00:00:00 2001 From: Julien Danjou jul...@danjou.info Date: Wed, 26 Jan 2011 11:14:11 +0100 Subject: [PATCH] org: remove org-invisible-p * org.el: Remove org-invisible-p: outline-invisible-p is available in Emacs 22 and in recent XEmacs 21. Replace in various files. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-clock.el |2 +- lisp/org-crypt.el |2 +- lisp/org-exp.el |2 +- lisp/org-list.el |3 +- lisp/org.el | 59 +--- 5 files changed, 28 insertions(+), 40 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 8bb67d9..dac035f 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2481,7 +2481,7 @@ The details of what will be saved are regulated by the variable (goto-char (cdr resume-clock)) (let ((org-clock-auto-clock-resolution nil)) (org-clock-in) - (if (org-invisible-p) + (if (outline-invisible-p) (org-show-context)) ;;;###autoload diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 1d76104..1758a81 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -112,7 +112,7 @@ This setting can also be overridden in the CRYPTKEY property. (let ((start-heading (point))) (forward-line) (when (not (looking-at -BEGIN PGP MESSAGE-)) -(let ((folded (org-invisible-p)) +(let ((folded (outline-invisible-p)) (epg-context (epg-make-context nil t t)) (crypt-key (org-crypt-key-for-heading)) (beg (point)) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 7c814cd..e84a7c2 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2615,7 +2615,7 @@ command. (goto-char (point-min)) (while (re-search-forward org-drawer-regexp nil t) (goto-char (match-beginning 1)) - (or (org-invisible-p) (org-flag-drawer nil + (or (outline-invisible-p) (org-flag-drawer nil (with-current-buffer buffer (erase-buffer)) (save-excursion (setq s (goto-char (point-min))) diff --git a/lisp/org-list.el b/lisp/org-list.el index bc8e7bd..0c519fc 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -44,7 +44,6 @@ (defvar org-ts-regexp) (defvar org-ts-regexp-both) -(declare-function org-invisible-p org ()) (declare-function org-on-heading-p org (optional invisible-ok)) (declare-function outline-next-heading outline ()) (declare-function org-back-to-heading org (optional invisible-ok)) @@ -1101,7 +1100,7 @@ item is invisible. (unless (or (not (org-in-item-p)) (save-excursion (goto-char (org-get-item-beginning)) - (org-invisible-p))) + (outline-invisible-p))) (if (save-excursion (goto-char (org-get-item-beginning)) (org-at-item-timer-p)) diff --git a/lisp/org.el b/lisp/org.el index fcdf245..d6b9c0d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6010,7 +6010,7 @@ in special contexts. (save-excursion (goto-char eos) (outline-next-heading) - (if (org-invisible-p) (org-flag-heading nil + (if (outline-invisible-p) (org-flag-heading nil ((and (or (= eol eos) (not (string-match \\S- (buffer-substring eol eos (or has-children @@ -6024,7 +6024,7 @@ in special contexts. (save-excursion (goto-char eos) (outline-next-heading) - (if (org-invisible-p) (org-flag-heading nil))) + (if (outline-invisible-p) (org-flag-heading nil))) (setq org-cycle-subtree-status 'children) (run-hook-with-args 'org-cycle-hook 'children)) ((or children-skipped @@ -6191,9 +6191,9 @@ This function is the default value of the hook `org-cycle-hook'. ;; Properly fold already folded siblings (goto-char (point-min)) (while (re-search-forward re nil t) - (if (and (not (org-invisible-p)) + (if (and (not (outline-invisible-p)) (save-excursion -(goto-char (point-at-eol)) (org-invisible-p))) +(goto-char (point-at-eol)) (outline-invisible-p)))
[Accepted] [Orgmode] PATCH: Support `org-export-process-option-filters' in latex export
Patch 554 (http://patchwork.newartisans.com/patch/554/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Cm14o92l2wz.fsf%4094.197.132.141.threembb.co.uk%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] PATCH: Support `org-export-process-option-filters' in latex export Date: Fri, 21 Jan 2011 19:58:04 - From: Dan Davison dandavis...@gmail.com X-Patchwork-Id: 554 Message-Id: m14o92l2wz@94.197.132.141.threembb.co.uk To: emacs-orgmode@gnu.org `org-export-process-option-filters' is supported for HTML export but not for latex export. The patch at the bottom fixes that. I note that there is one other location in the same function where it seems the same change could be made. I suspect this is not necessary, but if someone is familiar with the org-latex code they might like to have a look. (I didn't manage to understand the roles of the several variables with names like *-opt-plist *-options-plist in that function.) I'm protecting this patch from patchwork with ^$; it's the patch at the bottom that I propose. $ diff --git a/lisp/org-latex.el b/lisp/org-latex.el $ index 51ee6d2..53d6b40 100644 $ --- a/lisp/org-latex.el $ +++ b/lisp/org-latex.el $ @@ -700,7 +700,8 @@ when PUB-DIR is set, use this as the publishing directory. $ '(:org-license-to-kill nil $(org-update-radio-target-regexp) $(org-export-latex-set-initial-vars ext-plist arg) $ - (setq org-export-opt-plist org-export-latex-options-plist) $ + (setq org-export-opt-plist $ + (org-export-process-option-filters org-export-latex-options-plist)) $(org-install-letbind) $(run-hooks 'org-export-latex-after-initial-vars-hook) $(let* ((wcf (current-window-configuration)) $ Support `org-export-process-option-filters' in latex export * lisp/org-latex.el (org-export-as-latex): Process export property list with `org-export-process-option-filters' early in latex export Modified lisp/org-latex.el diff --git a/lisp/org-latex.el b/lisp/org-latex.el index ecaf1c0..51ee6d2 100644 --- a/lisp/org-latex.el +++ b/lisp/org-latex.el @@ -704,7 +704,8 @@ when PUB-DIR is set, use this as the publishing directory. (org-install-letbind) (run-hooks 'org-export-latex-after-initial-vars-hook) (let* ((wcf (current-window-configuration)) - (opt-plist org-export-latex-options-plist) + (opt-plist + (org-export-process-option-filters org-export-latex-options-plist)) (region-p (org-region-active-p)) (rbeg (and region-p (region-beginning))) (rend (and region-p (region-end))) ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] use @result{} instead of -- (looks nicer)
Patch 458 (http://patchwork.newartisans.com/patch/458/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1291842341-15199-1-git-send-email-bjg%40network-theory.co.uk%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] use @result{} instead of -- (looks nicer)
Date: Thu, 09 Dec 2010 02:05:23 -
From: Brian Gough b...@network-theory.co.uk
X-Patchwork-Id: 458
Message-Id: 1291842341-15199-1-git-send-email-...@network-theory.co.uk
To: emacs-orgmode@gnu.org
Cc: Barry Gidden bar...@network-theory.co.uk,
Brian Gough b...@network-theory.co.uk
---
doc/org.texi | 54 +++---
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index 7df03fe..94a4290 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -5304,20 +5304,20 @@ various inputs will be interpreted, the items filled
in by Org-mode are
in @b{bold}.
@example
-3-2-5 -- 2003-02-05
-2/5/3 -- 2003-02-05
-14-- @b{2006}-@b{06}-14
-12-- @b{2006}-@b{07}-12
-2/5 -- @b{2007}-02-05
-Fri -- nearest Friday (default date or later)
-sep 15-- @b{2006}-09-15
-feb 15-- @b{2007}-02-15
-sep 12 9 -- 2009-09-12
-12:45 -- @b{2006}-@b{06}-@b{13} 12:45
-22 sept 0:34 -- @b{2006}-09-22 0:34
-w4-- ISO week for of the current year @b{2006}
-2012 w4 fri -- Friday of ISO week 4 in 2012
-2012-w04-5-- Same as above
+3-2-5 @result{} 2003-02-05
+2/5/3 @result{} 2003-02-05
+14@result{} @b{2006}-@b{06}-14
+12@result{} @b{2006}-@b{07}-12
+2/5 @result{} @b{2007}-02-05
+Fri @result{} nearest Friday (default date or later)
+sep 15@result{} @b{2006}-09-15
+feb 15@result{} @b{2007}-02-15
+sep 12 9 @result{} 2009-09-12
+12:45 @result{} @b{2006}-@b{06}-@b{13} 12:45
+22 sept 0:34 @result{} @b{2006}-09-22 0:34
+w4@result{} ISO week for of the current year @b{2006}
+2012 w4 fri @result{} Friday of ISO week 4 in 2012
+2012-w04-5@result{} Same as above
@end example
Furthermore you can specify a relative date by giving, as the
@@ -5329,13 +5329,13 @@ a single letter, you use the abbreviation of day
name, the date will be
the Nth such day. E.g.
@example
-+0-- today
-. -- today
-+4d -- four days from today
-+4-- same as above
-+2w -- two weeks from today
-++5 -- five days from default date
-+2tue -- second Tuesday from now.
++0@result{} today
+. @result{} today
++4d @result{} four days from today
++4@result{} same as above
++2w @result{} two weeks from today
+++5 @result{} five days from default date
++2tue @result{} second Tuesday from now.
@end example
@vindex parse-time-months
@@ -5349,9 +5349,9 @@ start time and a duration (in HH:MM format). Use `-' or
`-{}-' as the separator
in the former case and use '+' as the separator in the latter case. E.g.
@example
-11am-1:15pm-- 11:00-13:15
-11am--1:15pm -- same as above
-11am+2:15 -- same as above
+11am-1:15pm@result{} 11:00-13:15
+11am--1:15pm @result{} same as above
+11am+2:15 @result{} same as above
@end example
@cindex calendar, for selecting date
@@ -13295,9 +13295,9 @@ Org will move the following key bindings in Org
files, and in the agenda
buffer (but not during date selection).
@example
-S-UP - M-p S-DOWN - M-n
-S-LEFT- M-- S-RIGHT- M-+
-C-S-LEFT - M-S-- C-S-RIGHT - M-S-+
+S-UP @result{} M-p S-DOWN @result{} M-n
+S-LEFT@result{} M-- S-RIGHT@result{} M-+
+C-S-LEFT @result{} M-S-- C-S-RIGHT @result{} M-S-+
@end example
@vindex org-disputed-keys
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Quote \[cmd] in docstring of org-export-with-LaTeX-fragments
Patch 550 (http://patchwork.newartisans.com/patch/550/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1295529226-12765-1-git-send-email-wence%40gmx.li%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Quote \[cmd] in docstring of org-export-with-LaTeX-fragments Date: Thu, 20 Jan 2011 18:13:46 - From: Lawrence Mitchell we...@gmx.li X-Patchwork-Id: 550 Message-Id: 1295529226-12765-1-git-send-email-we...@gmx.li To: emacs-orgmode@gnu.org Cc: Lawrence Mitchell we...@gmx.li * org-exp.el (org-export-with-LaTeX-fragments): Fix docstring so that \\[ a = b \\] is not interpreted as a keybinding by `substitute-command-keys'. In a docstring \\[text] is used to indicate that text should be interpreted by `substitute-command-keys'. To avoid this interpretation, we need to prefix it with \\=. --- lisp/org-exp.el |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 7c814cd..9954227 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -475,8 +475,8 @@ This option can also be set with the +OPTIONS line, e.g. \TeX:nil\. Non-nil means process LaTeX math fragments for HTML display. When set, the exporter will find and process LaTeX environments if the \\begin line is the first non-white thing on a line. It will also find -and process the math delimiters like $a=b$ and \\( a=b \\) for inline math, -$$a=b$$ and \\[ a=b \\] for display math. +and process the math delimiters like $a=b$ and \\( a=b \\) for inline math, +$$a=b$$ and \\=\\[ a=b \\] for display math. This option can also be set with the +OPTIONS line, e.g. \LaTeX:mathjax\. ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Doors links
Patch 542 (http://patchwork.newartisans.com/patch/542/) is now Accepted.
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C80lj2kblkx.fsf%40gmail.com%3E
Here is the original message containing the patch:
Content-Type: text/plain; charset=utf-8
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Orgmode] Doors links
Date: Mon, 17 Jan 2011 02:11:26 -
From: =?utf-8?b?VmluY2VudCBCZWxhw69jaGUgPHZpbmNlbnQuYi4xQGhvdG1haWwuZnI+?=
X-Patchwork-Id: 542
Message-Id: 80lj2kblkx@gmail.com
To: m...@christianmoe.com, Org mode emacs-orgmode@gnu.org
Cc: =?iso-8859-1?Q?Vincent_Bela=EFche?= vincent@hotmail.fr
Date: Fri, 14 Jan 2011 23:18:21 +0100
From: m...@christianmoe.com
To: emacs-orgmode@gnu.org
Subject: Re: [Orgmode] Doors links
Hi,
Try these:
[[info:org:Link abbreviations]]
[[info:org:Adding%20hyperlink%20types][info:org:Adding hyperlink types]]
Yours,
Christian
[...]
Thanks, I will try that ! I think that the trick deserves a forward link
in the documentation. I made a patch to the doc, attached.
Vincent.
diff --git a/doc/org.texi b/doc/org.texi
index 4d696ae..96e2e50 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3093,6 +3093,8 @@ elisp:org-agenda
@r{Interactive Elisp command}
elisp:(find-file-other-frame Elisp.org) @r{Elisp form to evaluate}
@end example
+For customizing Org to add new link types @ref{Adding hyperlink types}.
+
A link should be enclosed in double brackets and may contain a
descriptive text to be displayed instead of the URL (@pxref{Link
format}), for example:
___
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
[Accepted] [Orgmode] Re: Bug: Jumping to a date in the agenda changes view back to 'day' [7.4 (release_7.4.80.g0e5e5)]
Patch 544 (http://patchwork.newartisans.com/patch/544/) is now Accepted. Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3Csa3mxmzv4k0.fsf%40cigue.easter-eggs.fr%3E Here is the original message containing the patch: Content-Type: text/plain; charset=utf-8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Orgmode] Re: Bug: Jumping to a date in the agenda changes view back to 'day' [7.4 (release_7.4.80.g0e5e5)] Date: Mon, 17 Jan 2011 22:11:11 - From: Julien Danjou jul...@danjou.info X-Patchwork-Id: 544 Message-Id: sa3mxmzv4k0@cigue.easter-eggs.fr To: Bernt Hansen be...@norang.ca Cc: Org Mode emacs-orgmode@gnu.org, Noorul Islam K M noo...@noorul.com, Carsten Dominik carsten.domi...@gmail.com On Mon, Jan 17 2011, Bernt Hansen wrote: Thanks for this patch. I think this fixes the issue I was having with 'j' in the agenda switching from week-view back to single-day view when org-agenda-ndays is set to 1. There is still a (new?) problem with jumping to today. Set the following variable (setq org-agenda-start-on-weekday 6) | Key Sequence | Notes | |--+| | C-c a a | Display weekly agenda | | f| Go forward a week | | d| Display day agenda | | .| Go to to day - but it goes to Saturday instead | This should go to today and not the first day of the week. Attached is a fix for that. From f566a5612560f997f4760144ca850dda5c06bc5e Mon Sep 17 00:00:00 2001 From: Julien Danjou jul...@danjou.info Date: Mon, 17 Jan 2011 18:09:30 +0100 Subject: [PATCH] Fix org-agenda-goto-today not respecting the current span. * org-agenda.el (org-agenda-goto-today): Respect current span. Signed-off-by: Julien Danjou jul...@danjou.info --- lisp/org-agenda.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 0d695b5..241ed30 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6104,7 +6104,7 @@ Negative selection means regexp must not match for selection of an entry. (tdpos (goto-char tdpos)) ((eq org-agenda-type 'agenda) (let* ((sd (org-agenda-compute-starting-span - (org-today) (or org-agenda-ndays org-agenda-span))) + (org-today) (or org-agenda-current-span org-agenda-ndays org-agenda-span))) (org-agenda-overriding-arguments org-agenda-last-arguments)) (setf (nth 1 org-agenda-overriding-arguments) sd) (org-agenda-redo) -- 1.7.2.3 ___ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
