Re: [O] Export as HTML does not preserve nonstandard entities as TODO signs

2011-10-16 Thread Christian Moe

Hi,

I can't reproduce this. After adding your example to a test buffer and 
re-saving the buffer, I get the expected html export. (Before 
resaving, the buffer was still exported in iso-8859-1, producing 
garbage -- but not underscores -- in html; after resaving, in utf-8.)


With point in your example buffer, what does `C-h v 
buffer-file-coding-system' say?


Yours,
Christian


On 10/14/11 5:47 PM, Arne Babenhauserheide wrote:

Hi,

I started using ✔ and ❢ as replacement for DONE und TODO and I realized that 
they get replaced by an underscore (_) in HTML output. Since I really like 
using symbols for TODO and DONE¹, I wanted to ask, if this is a bug.

Best wishes,
Arne

¹: Just compare:

* ✔ Sent bug question
* ❢ check for response

and

* DONE Sent bug question
* TODO check for response

PS: I actually have ✔ on my keyboard, and C-c C-t makes it easy to use any kind 
of symbol for TODO states which is supported by the font.







Re: [O] Export as HTML does not preserve nonstandard entities as TODO signs

2011-10-16 Thread Arne Babenhauserheide
Hi Cristian,

Am Sonntag, 16. Oktober 2011, 08:39:08 schrieb Christian Moe:
 On 10/14/11 5:47 PM, Arne Babenhauserheide wrote:
  I started using ✔ and ❢ as replacement for DONE und TODO and I realized
  that they get replaced by an underscore (_) in HTML output. Since I
  really like using symbols for TODO and DONE¹, I wanted to ask, if this
  is a bug.

 I can't reproduce this. After adding your example to a test buffer and
 re-saving the buffer, I get the expected html export. (Before
 resaving, the buffer was still exported in iso-8859-1, producing
 garbage -- but not underscores -- in html; after resaving, in utf-8.)

 With point in your example buffer, what does `C-h v
 buffer-file-coding-system' say?

Its value is utf-8-unix
Local in buffer emacs-plan.org; global value is utf-8

What I get is output like this:

h3 id=sec-11-10span class=section-number-311.10/span span
class=done ✔ _/span Müll runter /h3

(copied to the clipboard)

Interesting is that ✔ gets correctly exported as class name, but not as
identifier in the text.

Best wishes,
Arne

signature.asc
Description: This is a digitally signed message part.


Re: [O] Cannot insert a footnote after certain verbatim text?

2011-10-16 Thread Nicolas Goaziou
Hello,

CS Fuu csf...@gmail.com writes:

 I am using org to write a document correcting some of my students' more
 common LaTeX blunders, and I keep running into places where I am not able to
 insert a footnote (Cannot insert a footnote here.). Some of these problems
 I am unable to reproduce consistently, but I think it usually occurs when a
 paragraph (or list item) contains verbatim or code text with a backslash
 (\), and only after the verbatim text. Here is one such example.  Create an
 .org file with the following three paragraphs (including the two blank
 likes):


 Blah, blah, blah.

 Woof, woof, =\begin{document}=, woof.

 Cry, cry, cry.


 If you're me, then you can insert a footnote after any word or punctuation
 in the first and third paragraphs, and after the first two words and the
 first comma in the second paragraph, but nowhere past the second comma in
 the second paragraph.

 I'm running the latest org (7.7) from the git repository in GNU emacs
 23.1.1.

For what it's worth, this not directly related to footnotes.  It's
a weakness in `org-inside-LaTeX-fragment-p', which returns a non-nil
value after =\begin{document}= instead of nil.  And, obviously, one
cannot add a footnote inside a LaTeX fragment...

Regards,

-- 
Nicolas Goaziou



Re: [O] `f' in agenda view

2011-10-16 Thread Carsten Dominik

On 13.10.2011, at 10:47, Rainer Stengele wrote:

 Am 04.10.2011 23:04, schrieb John Wiegley:
 Dave Abrahams d...@boostpro.com writes:
 
 It always strikes me as odd that `f' in agenda view moves the item forward
 by a day even if that leaves it still in the past.  Typically if I have an
 overdue item, I just want to schedule it for today or a certain number of
 days in the future, and as it stands it's even a bit non-obvious when I've
 finally bumped it up to today if it's a few days old.  Shouldn't the first
 `f' on an overdue item schedule it for today?
 
 Just to clarify, by 'f' dave means `org-agenda-date-later'.  I believe he's
 using my keybinding for this command...
 
 I'm happy to hack something locally if the group doesn't agree, but moving
 things around in the past seems like such a corner case that I thought maybe
 this would be a better default behavior.
 
 I agree with Dave here.  'f' on a past-dated item maybe should move it today
 on the first press, and then into the future on subsequent presses.
 
 John
 
 
 
 +1
 
 Me too I sometimes run into this situation where I just want to shift 
 past-dated items to today.
 I never had a use case where I wanted to shift an item from past to 
 past+n-daystoday.

I think this is all very reasonable, and this is how it works now.

- Carsten




[O] Problems with org-publish w/ #+INCLUDE:

2011-10-16 Thread daniel
Hi!

And another problem after an upgrade vom V6.something to a 7.7
release: Org-mode version 7.7 (release_7.7.380.g54d7df). When I use the
org-publish to produce a set of HTML pages I run into a error. Here is
an example:

I have a file index.org:

--8--
#+TITLE: Foo!
#+AUTHOR:Daniel
#+EMAIL: daniel@monkey
#+DATE:  2011-10-14 Fr
#+INCLUDE: include.org

Export it!
--8--

Then I have a file include.org with all the options etc. (option
template included via C-c C-e t):

--8--
#+DESCRIPTION:
#+KEYWORDS:
#+LANGUAGE:  en
#+OPTIONS:   H:3 num:t toc:t \n:nil @:t ::t |:t ^:t -:t f:t *:t :t
#+OPTIONS:   TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 
path:http://orgmode.org/org-info.js
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+LINK_UP:   
#+LINK_HOME: 
#+XSLT:

#+BEGIN_HTML
  h1Bar/h1
#+END_HTML
--8--

Then I set the org-publish-project-alist:

--8--
(require 'org-publish)
(setq org-publish-project-alist
  (list (list foo
  :base-directory /home/dbr/tmp/omtests
  :base-extension org
  :publishing-directory /home/dbr/tmp/omtests/pub
  :publishing-function 'org-publish-org-to-html)))
--8--

Org-publish is from the 7.7 distribution directory. Then I visit
index.org and do a C-c C-e P and run in the following error:

--8--
Debugger entered--Lisp error: (wrong-type-argument integerp nil)
  lsh(nil 16)
  org-publish-cache-ctime-of-src(/home/dbr/tmp/omtests/include.org\n\nExport)
  org-publish-cache-file-needs-publishing(/home/dbr/tmp/omtests/index.org 
/home/dbr/tmp/omtests/pub/ org-publish-org-to-html)
  org-publish-needed-p(/home/dbr/tmp/omtests/index.org 
/home/dbr/tmp/omtests/pub/ org-publish-org-to-html 
/home/dbr/tmp/omtests/pub/)
  org-publish-file(/home/dbr/tmp/omtests/index.org (foo :base-directory 
/home/dbr/tmp/omtests :base-extension org :publishing-directory 
/home/dbr/tmp/omtests/pub :publishing-function org-publish-org-to-html) t)
  #[(project) @!ˆAÇ  \Ç \Ç \†   \†#ÍÇ  \†-  \†8!\
\ \\n\#$ƒXÔ!ˆƒa
\f\ˆ#‰A#@‰$ƒxÖ$#ˆ‚aÇ \ƒ’Ù   \!ˆÛÇ  \\#ˆƒ›Ô!ˆ .‡ [project 
project-plist exclude-regexp sitemap-p sitemap-filename sitemap-function 
org-publish-initialize-cache plist-get :exclude :auto-sitemap :sitemap-filename 
sitemap.org :sitemap-function org-publish-org-sitemap :sitemap-date-format 
:sitemap-file-entry-format :preparation-function :completion-function 
org-publish-get-base-files nil run-hooks preparation-function org-publish-file 
t :makeindex org-publish-index-generate-theindex :base-directory 
expand-file-name theindex.org completion-function 
org-publish-write-cache-file org-publish-sitemap-date-format 
org-sitemap-date-format org-publish-sitemap-file-entry-format 
org-sitemap-file-entry-format files file] 6]((foo :base-directory 
/home/dbr/tmp/omtests :base-extension org :publishing-directory 
/home/dbr/tmp/omtests/pub :publishing-function org-publish-org-to-html))
  mapc(#[(project) @!ˆAÇ \Ç \Ç \†   \†#ÍÇ  \†-  
\†8!\\ \\n\#$ƒXÔ!ˆƒa
\f\ˆ#‰A#@‰$ƒxÖ$#ˆ‚aÇ \ƒ’Ù   \!ˆÛÇ  \\#ˆƒ›Ô!ˆ .‡ [project 
project-plist exclude-regexp sitemap-p sitemap-filename sitemap-function 
org-publish-initialize-cache plist-get :exclude :auto-sitemap :sitemap-filename 
sitemap.org :sitemap-function org-publish-org-sitemap :sitemap-date-format 
:sitemap-file-entry-format :preparation-function :completion-function 
org-publish-get-base-files nil run-hooks preparation-function org-publish-file 
t :makeindex org-publish-index-generate-theindex :base-directory 
expand-file-name theindex.org completion-function 
org-publish-write-cache-file org-publish-sitemap-date-format 
org-sitemap-date-format org-publish-sitemap-file-entry-format 
org-sitemap-file-entry-format files file] 6] ((foo :base-directory 
/home/dbr/tmp/omtests :base-extension org :publishing-directory 
/home/dbr/tmp/omtests/pub :publishing-function org-publish-org-to-html)))
  org-publish-projects(((foo :base-directory /home/dbr/tmp/omtests 
:base-extension org :publishing-directory /home/dbr/tmp/omtests/pub 
:publishing-function org-publish-org-to-html)))
  byte-code(?…   Ä\n;ƒ\n\C‚\nC!)‡ [force 
org-publish-use-timestamps-flag project org-publish-project-alist 
org-publish-projects assoc] 4)
  org-publish((foo :base-directory /home/dbr/tmp/omtests :base-extension 
org :publishing-directory /home/dbr/tmp/omtests/pub :publishing-function 
org-publish-org-to-html))
  byte-code(Ä \?…   ‰„Ç \ˆ\n!*‡ [force org-publish-use-timestamps-flag 
project org-publish-get-project-from-filename buffer-file-name up error File 
%s is not part of any known project org-publish] 4)
  org-publish-current-project(nil)
  call-interactively(org-publish-current-project)
  org-export(nil)
  call-interactively(org-export nil nil)
--8--

It seemed that due to the #+INCLUDE tag the
org-publish-cache-file-need-publishing gets a bit 

Re: [O] Hide drawers in indirect buffers?

2011-10-16 Thread Carsten Dominik

On 4.10.2011, at 17:22, Dave Abrahams wrote:

 
 on Tue Oct 04 2011, Carsten Dominik carsten.dominik-AT-gmail.com wrote:
 
 On Oct 2, 2011, at 9:36 PM, Dave Abrahams wrote:
 
 
 on Sat Oct 01 2011, Dave Abrahams dave-AT-boostpro.com wrote:
 
 When I initially request an indirect buffer for an item (especially from
 the agenda) it shows up with all its drawers open.  I'd prefer it if
 they were closed by default.  Is there a way to do that?
 
 To follow up my own post...
 
 This is actually very surprising, because the entry shows up in a state
 that can't be reached by tabbing on its headline, with all the drawers
 open.  If you run (org-show-entry) in the indirect buffer it goes into a
 less-noisy configuration.
 
 This is indeed a bug, fixed now.
 
 Thanks.  So, just for my education, can you explain why running
 `org-cycle-hook 'all' is superior to just `org-show-entry' (which was my
 workaround)?

Because this would also show, for example, archived trees etc.

- Carsten
 
 -- 
 Dave Abrahams
 BoostPro Computing
 http://www.boostpro.com




Re: [O] Bug: spreadsheet [7.7]

2011-10-16 Thread Carsten Dominik

On 2.10.2011, at 18:35, Nick Dokos wrote:

 Paul Stansell paulstans...@gmail.com wrote:
 
 To reproduce the bug do the following:
 
 Edit this file with emacs orgmode.
 
 Place the cursor in the small table below and type C-c } to toggle on the
 display a labelled grid giving the cell references.
 
 Change the c=1 in the CONSTANTS line to c=2 and refresh this line with C-c
 C-c.
 
 Put the cursor on the TBLFM line and refresh this line with C-c C-c.
 
 An I*1 appears above the table which should not appear and can't be
 removed with the usual emacs commands.
 
 
  |---|
  | 1 |
  |---|
 #+TBLFM: $1=$c
 #+CONSTANTS: c=1
 
 
 Yup: I can reproduce it too. Toggling the table coordinates inserts
 overlays and apparently something is out of sync and that particular
 overlay does not get deleted appropriately.
 
 You can check that there is an overlay there by placing the cursor
 right after it and evaluating
 
 (overlay-at (point))
 
 which should return a list of overlays at point. Assuming that you
 get a non-nil result with just that one overlay in the list, you can
 delete it with
 
 (delete-overlay (car (overlay-at (point
 
 Haven't figured out why it gets left over though.

I have made a brute force solution for this issue, pressing
C-c C-c on a #+ line will remove these overlays first.
Not nice, but it helps with this problem.

- Carsten



Re: [O] bug#9695: allowed date range

2011-10-16 Thread Michael Brand
Hi Carsten

On Thu, Oct 13, 2011 at 10:27, Carsten Dominik
carsten.domi...@gmail.com wrote:
 Furthermore, pressing C-c C-c on
 a time stamp will fill in or fix the day name.

Thank you, this is something I always wanted to have for convenience
instead of using S-up + S-down.

 However, I am not sure if this patch is complete, or if it
 has side effects.  So it would be good if a few people could
 apply it and test it during their daily work for a few weeks,
 and then report problems in this thread.

I started to use this patch too.

Michael



[O] org-odt: turning off Table of Contents

2011-10-16 Thread Mehul Sanghvi
I do not want a table of contents as it makes no sense for a resume.
How do I disable the generation of that ?
I ran the unit test for ODT and it generated a ToC, although I didn't
see anything in the test.org file to indicate
such a  behaviour.



-- 
Mehul N. Sanghvi
email: mehul.sang...@gmail.com



Re: [O] Export as HTML does not preserve nonstandard entities as TODO signs

2011-10-16 Thread Christian Moe

Hi,

First, sorry about the noise: I had failed to activate your symbols as 
TODO keywords. Now I do reproduce your results.


It also doesn't seem to help to add your special characters to Emacs 
word syntax, as the FAQ says you should.

http://orgmode.org/worg/org-faq.html#sec-9-6

I think there's a bug in org-html.el (org-export-as-html), around line 
1611. A function that is meant to get a valid class name for the todo 
keyword is not called when the class attribute of the span tag is 
inserted, but a  line below, where the visible text content of the 
span tag is inserted. I'm posting a patch.


Yours,
Christian








[O] [PATCH] Re: Export as HTML does not preserve nonstandard entities as TODO signs

2011-10-16 Thread Christian Moe

Correct html export of todo keywords

 * org-html.el (org-export-as-html): Apply
   org-export-html-get-todo-kwd-class-name to the the class attribute
   of the todo-keyword span tag, not to its text content

The problem was that special characters in todo keywords were being
replaced by underscore. This was meant to happen to the class
attributes set around them.

TINYCHANGE

This only swaps two arguments to a concat.


diff --git a/lisp/org-html.el b/lisp/org-html.el
index a2a9426..47adfd2 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1608,9 +1608,9 @@ lang=\%s\ xml:lang=\%s\
(if (member (match-string 2 line)
org-done-keywords)
done todo)
- (match-string 2 line)
-   \  (org-export-html-get-todo-kwd-class-name
-   (match-string 2 line))
+ (org-export-html-get-todo-kwd-class-name
+(match-string 2 line))
+   \  (match-string 2 line)
/span (substring line (match-end 2)

  ;; Does this contain a reference to a footnote?



[O] Org, Diffs, and Version Control

2011-10-16 Thread Dave Abrahams

As I've been working on a fairly large Org outline over the past few
days, I've discovered that the format is very ill-suited to management
and review by (known) version control tools, like Git.  Indentation is
always changing and volatile information like tags and priorities
tends to mix with headlines, which makes diffs very hard to track.  This
is to say nothing of the fact that diff itself is a poor format for
understanding changes that simply reorganize parts of documents.

I was wondering what other people do.  I want to make sure I understand
the changes I'm making to my document and that I haven't unintentionally
wiped out a great deal of important material (all the more likely to
happen without me noticing because of Org's folding).

Hints most appreciated,

-- 
Dave Abrahams
BoostPro Computing
http://www.boostpro.com





Re: [O] Bug: spreadsheet [7.7]

2011-10-16 Thread Christian Moe




I have made a brute force solution for this issue, pressing
C-c C-c on a #+ line will remove these overlays first.
Not nice, but it helps with this problem.

- Carsten




make complains:

org.el:18170:33:Warning: reference to free variable
`org-table-coordinate-overlays'
org.el:18171:17:Warning: assignment to free variable
`org-table-coordinate-overlays'
org.el:18172:54:Warning: `t' called as a function
org.el:18177:71:Error: Invalid read syntax: )

Yours,
Christian




Re: [O] org-odt: turning off Table of Contents

2011-10-16 Thread Christian Moe

On 10/16/11 4:03 PM, Mehul Sanghvi wrote:

I do not want a table of contents as it makes no sense for a resume.
How do I disable the generation of that ?
I ran the unit test for ODT and it generated a ToC, although I didn't
see anything in the test.org file to indicate
such a  behaviour.





In the #+OPTIONS line, set toc:nil

http://orgmode.org/manual/Export-options.html#Export-options

Hope this helps,
Christian



Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Bernt Hansen
Dave Abrahams d...@boostpro.com writes:

 As I've been working on a fairly large Org outline over the past few
 days, I've discovered that the format is very ill-suited to management
 and review by (known) version control tools, like Git.  Indentation is
 always changing and volatile information like tags and priorities
 tends to mix with headlines, which makes diffs very hard to track.  This
 is to say nothing of the fact that diff itself is a poor format for
 understanding changes that simply reorganize parts of documents.

 I was wondering what other people do.  I want to make sure I understand
 the changes I'm making to my document and that I haven't unintentionally
 wiped out a great deal of important material (all the more likely to
 happen without me noticing because of Org's folding).

 Hints most appreciated,

The main thing I do is use org-indent-mode so indentation is not a
factor in the diffs.  Everything starts at column 1 and moving things
around and promoting headlines doesn't change the indent of the items.

I also use 'git log --stat' to get a quick overview of my hourly commits
to reassure myself that large parts of the document didn't get removed
by accident.  I normally only do this after archiving (which is monthly)
but this also makes is relatively easy to identify a commit where a
large block of content was removed in the event I want to restore the
old content.

I rarely have to resort to my git history to restore something (maybe 2
times a year?) but I really like the safety net of my hourly git commits
on my org-files so I can be confident I won't permanently lose anything
which is important to me.

HTH,
Bernt



Re: [O] org-odt: turning off Table of Contents

2011-10-16 Thread Mehul Sanghvi
On Sun, Oct 16, 2011 at 10:42, Christian Moe m...@christianmoe.com wrote:
 On 10/16/11 4:03 PM, Mehul Sanghvi wrote:

 I do not want a table of contents as it makes no sense for a resume.
 How do I disable the generation of that ?
 I ran the unit test for ODT and it generated a ToC, although I didn't
 see anything in the test.org file to indicate
 such a  behaviour.




 In the #+OPTIONS line, set toc:nil

 http://orgmode.org/manual/Export-options.html#Export-options

 Hope this helps,
 Christian



Thanks.  I really need to spend time with the Org manual at some point.


-- 
Mehul N. Sanghvi
email: mehul.sang...@gmail.com



Re: [O] How to get numbered lists (1), (2), … ?

2011-10-16 Thread Eric S Fraga
Carsten Dominik carsten.domi...@gmail.com writes:

 On 15.10.2011, at 16:14, Eric S Fraga wrote:

 Carsten Dominik carsten.domi...@gmail.com writes:
 
 On 14.10.2011, at 13:31, Nicolas Goaziou wrote:
 
 [...]
 
 
 I have nothing against (1) as item bullets, as it doesn't interfere
 with any existing Org syntax.
 
 That is not the only criterion.  Adding new syntax elements make more
 ASCII sequences special.  The Org markup is a heuristic set of
 special elements, and there is merrit in keeping it small.  We already
 have more bullets and in particular numbered types - and so far
 I have not seen a compelling reason to add more.
 
 - Carsten
 
 I am in the keep it simple school.  So long as org allows me to
 distinguish between numbered and unnumbered itemised lists, I am
 happy.  I actually would prefer less choices than there are currently
 because I would like to get to my choice more quickly when I do use
 C-c - to change the type!
 
 To me, org is about information and time management, not about
 formatting.  YMMV, of course!
 
 To be blunt, I would be happy with - and 1. in org, knowing that I
 can customise upon export if necessary!  I'm not suggesting we go this
 far, however ;-)

 Since backward compatibility is necessary, this counts as a vote for a
 customizable sequence, as proposed by Nicolas, do I see this right?

 So maybe this *is* a good idea, but I would be agains adding new list
 types.

I guess I was voting without realising that I was ;-)  I'm happy with
things as they are but definitely would have no problem with a
customisable list, one that I would tend to shorten!

-- 
: Eric S Fraga (GnuPG: 0xC89193D8FFFCF67D) in Emacs 24.0.90.1
: using Org-mode version 7.7 (release_7.7.381.g05ea)



Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Eric Schulte
 Hints most appreciated,

 The main thing I do is use org-indent-mode so indentation is not a
 factor in the diffs.  Everything starts at column 1 and moving things
 around and promoting headlines doesn't change the indent of the items.


I also always start my subtree content at column 1 (I never indent whole
section bodies) and I think this helps promote saner diffs and generally
encourages better Org-mode behavior.

Additionally you could try the --word-diff option to git, i.e.,

  git diff --word-diff

or

  git diff --word-diff=color

which returns diffs which ignore whitespace changes and which show
changes on the word rather than line level.  I believe it is possible to
make this behavior default for a git repository but I've never done so
and don't know how such a default would be specified.

Hope this helps -- Eric

-- 
Eric Schulte
http://cs.unm.edu/~eschulte/



Re: [O] Patch for bug in adjusting time ranges in Agenda

2011-10-16 Thread Niels Giesen
*bump*

Has this one slipped through (as I were posting two other patches round the
same date, one also having to do with date/time ranges in the agenda --
which were both accepted), or am I just impatient?

On Sun, Oct 2, 2011 at 12:24 PM, Niels Giesen niels.gie...@gmail.comwrote:

 Hi Orgers,

 The discussion in the recent thread Time range end in agenda view not
 displayed prompted me to take a closer look at time/date ranges in the
 Agenda view. I noticed that the commands `org-agenda-do-date-later' and
 `org-agenda-do-date-earlier' do not work correctly on timestamp ranges,
 in that they only shift the rightmost timestamp in the range. The patch
 below should fix this.

 #+begin_src diff
  From 2e6b64dc8dcae0fd312729af96ab10d8d2e9d91b Mon Sep 17 00:00:00 2001
  From: Niels Giesen niels.gie...@gmail.com
  Date: Sun, 2 Oct 2011 09:15:21 +0200
  Subject: [PATCH] Fix shift-adjusting time and date ranges from within
 Agenda.

  ,* org-mode/lisp/org-agenda.el (org-agenda-date-later): Adjust both
start and end timestamp for a range, and set
`org-last-changed-timestamp' to a representation of the new range.
  ---
   lisp/org-agenda.el |8 +++-
   1 files changed, 7 insertions(+), 1 deletions(-)

  diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
  index b1fa5f5..e4c1053 100644
  --- a/lisp/org-agenda.el
  +++ b/lisp/org-agenda.el
  @@ -7517,7 +7517,13 @@ the same tree node, and the headline of the tree
 node in the Org-mode file.
  (goto-char pos)
  (if (not (org-at-timestamp-p))
 (error Cannot find time stamp))
  -   (org-timestamp-change arg (or what 'day)))
  +   (org-timestamp-change arg (or what 'day))
  +   (when (org-at-date-range-p)
  + (let ((end org-last-changed-timestamp))
  +   (re-search-backward org-tr-regexp-both)
  +   (org-timestamp-change arg (or what 'day))
  +   (setq org-last-changed-timestamp
  +(concat org-last-changed-timestamp -- end)
(org-agenda-show-new-time marker org-last-changed-timestamp))
   (message Time stamp changed to %s org-last-changed-timestamp)))

  --
  1.7.2.5


 #+end_src

 Regards,
 niels
 --
 http://pft.github.com




-- 
http://pft.github.com


Re: [O] Problems with org-publish w/ #+INCLUDE:

2011-10-16 Thread Nick Dokos
dan...@dbrunner.de wrote:

 Hi!
 
 And another problem after an upgrade vom V6.something to a 7.7
 release: Org-mode version 7.7 (release_7.7.380.g54d7df). When I use the
 org-publish to produce a set of HTML pages I run into a error. Here is
 an example:
 

An *exemplary* bug report: an ECM to reproduce the problem and a
backtrace - what more can one ask for? Thank you!

I could not reproduce the problem at first, but it turned out that I had
gone back to org 7.6 to test something and forgot to move forward again.
On Org-mode version 7.7 (release_7.7.349.g3d835.dirty), I can reproduce
it: the first time I publish the project I get the error. If I force
republication, the error does not arise again - I haven't looked at why
that is, but the initial failure seems to be caused by a change in the
regexp on line 1109 of org-publish.el: if you look at the argument of
org-publish-cache-ctime-of-src in the backtrace, you can see that it's
not just the #+INCLUDE: filename, but some additional lines in the
including file as well.

I haven't checked yet but it would seem that the following commit
introduced the problem:

--8---cut here---start-8---
commit 920cf53e686daea4f406aa237b48fe2ef4730426
Author: Jon Anders Skorpen jo...@ifi.uio.no
Date:   Sat Jul 16 17:22:07 2011 +

org-publish: Fix regexp for include files

* org-publish.el (org-publish-cache-file-needs-publishing): Regexp did
  not find includes with double quoted file names.

TINYCHANGE

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 @@ (defun org-publish-cache-file-needs-publishing (filename 
optional pub-dir pub-f
   (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)
--8---cut here---end---8---

Nick


 I have a file index.org:
 
 --8--
 #+TITLE: Foo!
 #+AUTHOR:Daniel
 #+EMAIL: daniel@monkey
 #+DATE:  2011-10-14 Fr
 #+INCLUDE: include.org
 
 Export it!
 --8--
 
 Then I have a file include.org with all the options etc. (option
 template included via C-c C-e t):
 
 --8--
 #+DESCRIPTION:
 #+KEYWORDS:
 #+LANGUAGE:  en
 #+OPTIONS:   H:3 num:t toc:t \n:nil @:t ::t |:t ^:t -:t f:t *:t :t
 #+OPTIONS:   TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
 #+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 path:http:/=
 /orgmode.org/org-info.js
 #+EXPORT_SELECT_TAGS: export
 #+EXPORT_EXCLUDE_TAGS: noexport
 #+LINK_UP:=20=20=20
 #+LINK_HOME:=20
 #+XSLT:
 
 #+BEGIN_HTML
   h1Bar/h1
 #+END_HTML
 --8--
 
 Then I set the org-publish-project-alist:
 
 --8--
 (require 'org-publish)
 (setq org-publish-project-alist
   (list (list foo
 :base-directory /home/dbr/tmp/omtests
 :base-extension org
 :publishing-directory /home/dbr/tmp/omtests/pub
 :publishing-function 'org-publish-org-to-html)))
 --8--
 
 Org-publish is from the 7.7 distribution directory. Then I visit
 index.org and do a C-c C-e P and run in the following error:
 
 --8--
 Debugger entered--Lisp error: (wrong-type-argument integerp nil)
   lsh(nil 16)
   org-publish-cache-ctime-of-src(/home/dbr/tmp/omtests/include.org\n\nExpo=
 rt)
   org-publish-cache-file-needs-publishing(/home/dbr/tmp/omtests/index.org=
  /home/dbr/tmp/omtests/pub/ org-publish-org-to-html)
   org-publish-needed-p(/home/dbr/tmp/omtests/index.org /home/dbr/tmp/omt=
 ests/pub/ org-publish-org-to-html /home/dbr/tmp/omtests/pub/)
   org-publish-file(/home/dbr/tmp/omtests/index.org (foo :base-directory=
  /home/dbr/tmp/omtests :base-extension org :publishing-directory /home=
 /dbr/tmp/omtests/pub :publishing-function org-publish-org-to-html) t)
   #[(project) @!=88A=C7\=C7   \=C7   \=86=00=1C \=86#=CD=C7
 \=86-=0E=
 =1F   \=868=0E!\\=15   
 \=1D\n\#=1E$=15=83X=D4!=88=0B=83a=0D\f\=88#=89=
 A#@=89$=83x=D6$#=88=82a=C7   \=83=92=D9 \!=88=DB=C7
 \\#=88=1D=83=9B=D4!=
 =88 .=0B=87 [project project-plist exclude-regexp sitemap-p sitemap-filena=
 me sitemap-function org-publish-initialize-cache plist-get :exclude :auto-s=
 itemap :sitemap-filename sitemap.org :sitemap-function org-publish-org-si=
 temap :sitemap-date-format :sitemap-file-entry-format :preparation-function=
  :completion-function org-publish-get-base-files nil run-hooks preparation-=
 function org-publish-file t :makeindex org-publish-index-generate-theindex =
 :base-directory expand-file-name theindex.org 

Re: [O] Patch for bug in adjusting time ranges in Agenda

2011-10-16 Thread Nick Dokos
Niels Giesen niels.gie...@gmail.com wrote:

 *bump*
 
 Has this one slipped through (as I were posting two other patches round the 
 same date, one also
 having to do with date/time ranges in the agenda -- which were both 
 accepted), or am I just
 impatient?
 

I tried to check patchwork (http://patchwork.newartisans.com/project/org-mode/)
but the server seems to be having problems right now. However, that's the first
place to check when it comes back: if it's there, somebody will get to it sooner
or later.

Nick

 On Sun, Oct 2, 2011 at 12:24 PM, Niels Giesen niels.gie...@gmail.com wrote:
 
 Hi Orgers,

 The discussion in the recent thread Time range end in agenda view not
 displayed prompted me to take a closer look at time/date ranges in the
 Agenda view. I noticed that the commands `org-agenda-do-date-later' and
 `org-agenda-do-date-earlier' do not work correctly on timestamp ranges,
 in that they only shift the rightmost timestamp in the range. The patch
 below should fix this.

 #+begin_src diff
  From 2e6b64dc8dcae0fd312729af96ab10d8d2e9d91b Mon Sep 17 00:00:00 2001
  From: Niels Giesen niels.gie...@gmail.com
  Date: Sun, 2 Oct 2011 09:15:21 +0200
  Subject: [PATCH] Fix shift-adjusting time and date ranges from within 
 Agenda.

  ,* org-mode/lisp/org-agenda.el (org-agenda-date-later): Adjust both
    start and end timestamp for a range, and set
    `org-last-changed-timestamp' to a representation of the new range.
  ---
   lisp/org-agenda.el |    8 +++-
   1 files changed, 7 insertions(+), 1 deletions(-)

  diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
  index b1fa5f5..e4c1053 100644
  --- a/lisp/org-agenda.el
  +++ b/lisp/org-agenda.el
  @@ -7517,7 +7517,13 @@ the same tree node, and the headline of the tree 
 node in the Org-mode
 file.
          (goto-char pos)
          (if (not (org-at-timestamp-p))
         (error Cannot find time stamp))
  -       (org-timestamp-change arg (or what 'day)))
  +       (org-timestamp-change arg (or what 'day))
  +       (when (org-at-date-range-p)
  +         (let ((end org-last-changed-timestamp))
  +           (re-search-backward org-tr-regexp-both)
  +           (org-timestamp-change arg (or what 'day))
  +           (setq org-last-changed-timestamp
  +        (concat org-last-changed-timestamp -- end)
        (org-agenda-show-new-time marker org-last-changed-timestamp))
       (message Time stamp changed to %s org-last-changed-timestamp)))

  --
  1.7.2.5
 
 #+end_src

 Regards,
 niels
 --
 http://pft.github.com
 
 --
 http://pft.github.com
 
 
 
 Alternatives:
 
 



Re: [O] Org, Diffs, and Version Control

2011-10-16 Thread Herbert Sitz
Eric Schulte schulte.eric at gmail.com writes:

 Additionally you could try the --word-diff option to git, i.e.,
 
   git diff --word-diff
 
 or
 
   git diff --word-diff=color
 
 which returns diffs which ignore whitespace changes and which show
 changes on the word rather than line level.  I believe it is possible to
 make this behavior default for a git repository but I've never done so
 and don't know how such a default would be specified.
 
 Hope this helps -- Eric
 

Thanks for the tip.  Here's some info that I think shows how to make --word-diff
option the default for a particular type (e.g., .org) fie:

http://stackoverflow.com/questions/7542543/use-gits-word-diff-for-latex-files

-- Herb




Re: [O] Problems with org-publish w/ #+INCLUDE:

2011-10-16 Thread Carsten Dominik

On 16.10.2011, at 18:28, Nick Dokos wrote:

 dan...@dbrunner.de wrote:
 
 Hi!
 
 And another problem after an upgrade vom V6.something to a 7.7
 release: Org-mode version 7.7 (release_7.7.380.g54d7df). When I use the
 org-publish to produce a set of HTML pages I run into a error. Here is
 an example:
 
 
 An *exemplary* bug report: an ECM to reproduce the problem and a
 backtrace - what more can one ask for? Thank you!
 
 I could not reproduce the problem at first, but it turned out that I had
 gone back to org 7.6 to test something and forgot to move forward again.
 On Org-mode version 7.7 (release_7.7.349.g3d835.dirty), I can reproduce
 it: the first time I publish the project I get the error. If I force
 republication, the error does not arise again - I haven't looked at why
 that is, but the initial failure seems to be caused by a change in the
 regexp on line 1109 of org-publish.el: if you look at the argument of
 org-publish-cache-ctime-of-src in the backtrace, you can see that it's
 not just the #+INCLUDE: filename, but some additional lines in the
 including file as well.
 
 I haven't checked yet but it would seem that the following commit
 introduced the problem:

This should be fixed now, please verify.

- Carsten

 
 --8---cut here---start-8---
 commit 920cf53e686daea4f406aa237b48fe2ef4730426
 Author: Jon Anders Skorpen jo...@ifi.uio.no
 Date:   Sat Jul 16 17:22:07 2011 +
 
org-publish: Fix regexp for include files
 
* org-publish.el (org-publish-cache-file-needs-publishing): Regexp did
  not find includes with double quoted file names.
 
TINYCHANGE
 
 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 @@ (defun org-publish-cache-file-needs-publishing 
 (filename optional pub-dir pub-f
   (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)
 --8---cut here---end---8---
 
 Nick
 
 
 I have a file index.org:
 
 --8--
 #+TITLE: Foo!
 #+AUTHOR:Daniel
 #+EMAIL: daniel@monkey
 #+DATE:  2011-10-14 Fr
 #+INCLUDE: include.org
 
 Export it!
 --8--
 
 Then I have a file include.org with all the options etc. (option
 template included via C-c C-e t):
 
 --8--
 #+DESCRIPTION:
 #+KEYWORDS:
 #+LANGUAGE:  en
 #+OPTIONS:   H:3 num:t toc:t \n:nil @:t ::t |:t ^:t -:t f:t *:t :t
 #+OPTIONS:   TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
 #+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 path:http:/=
 /orgmode.org/org-info.js
 #+EXPORT_SELECT_TAGS: export
 #+EXPORT_EXCLUDE_TAGS: noexport
 #+LINK_UP:=20=20=20
 #+LINK_HOME:=20
 #+XSLT:
 
 #+BEGIN_HTML
  h1Bar/h1
 #+END_HTML
 --8--
 
 Then I set the org-publish-project-alist:
 
 --8--
 (require 'org-publish)
 (setq org-publish-project-alist
  (list (list foo
:base-directory /home/dbr/tmp/omtests
:base-extension org
:publishing-directory /home/dbr/tmp/omtests/pub
:publishing-function 'org-publish-org-to-html)))
 --8--
 
 Org-publish is from the 7.7 distribution directory. Then I visit
 index.org and do a C-c C-e P and run in the following error:
 
 --8--
 Debugger entered--Lisp error: (wrong-type-argument integerp nil)
  lsh(nil 16)
  org-publish-cache-ctime-of-src(/home/dbr/tmp/omtests/include.org\n\nExpo=
 rt)
  org-publish-cache-file-needs-publishing(/home/dbr/tmp/omtests/index.org=
 /home/dbr/tmp/omtests/pub/ org-publish-org-to-html)
  org-publish-needed-p(/home/dbr/tmp/omtests/index.org /home/dbr/tmp/omt=
 ests/pub/ org-publish-org-to-html /home/dbr/tmp/omtests/pub/)
  org-publish-file(/home/dbr/tmp/omtests/index.org (foo :base-directory=
 /home/dbr/tmp/omtests :base-extension org :publishing-directory /home=
 /dbr/tmp/omtests/pub :publishing-function org-publish-org-to-html) t)
  #[(project) @!=88A=C7\=C7   \=C7   \=86=00=1C \=86#=CD=C7
 \=86-=0E=
 =1F  \=868=0E!\\=15   
 \=1D\n\#=1E$=15=83X=D4!=88=0B=83a=0D\f\=88#=89=
 A#@=89$=83x=D6$#=88=82a=C7  \=83=92=D9 \!=88=DB=C7
 \\#=88=1D=83=9B=D4!=
 =88 .=0B=87 [project project-plist exclude-regexp sitemap-p sitemap-filena=
 me sitemap-function org-publish-initialize-cache plist-get :exclude :auto-s=
 itemap :sitemap-filename sitemap.org :sitemap-function org-publish-org-si=
 temap :sitemap-date-format :sitemap-file-entry-format :preparation-function=
 :completion-function org-publish-get-base-files nil run-hooks preparation-=
 function org-publish-file t 

[O] bug: ido refile presents default when it shouldn't

2011-10-16 Thread Samuel Wales
Refile with ido presents a default even if you have already
tried to narrow the headers.  This is user-surprising behavior.

Here is an example in detail.

===

Consider two headers in your refile targets for which one is an
ancestor of the other.

Normally I select the olpath computer/emacs by typing
ema using ido.  That works as expected.

Normally I select the olpath computer/emacs/org/myorg by
typing my using ido.  That works as expected.

If I refile to myorg this way, that works as expected.

If I then refile and don't type anything, myorg is then
provided as a default.  That is convenient and works as
expected.  This allows you to refile again to the same place.

If I then, without exiting the prompt, type ema, it /continues/ to
provide the default of myorg.  That is surprising.  I expect the
olpath computer/emacs instead.

===

The result is that if you do not notice the prompt and
select a different task, your task will get refiled in the
wrong place.

-- The user expectation being violated is that the same letters
typed will produce the same results. --

The result is different depending on your previous refile operation.
You might not even remember what your previous refile operation was.

The transaction is stateful, even though the
purpose of using state (keeping the very last refile)
is moot now that you have indicated that you want emacs.

It is never the case that you want myorg when you type ema
alone, because all you have to do is simply RET to get
myorg.

The solution is for Org or ido to somehow nix the default when letters are
typed.  This will present computer/emacs when you type ema.

As expected.

Samuel


===

(setq org-refile-use-cache t)
(setf org-refile-use-outline-path t)

I have a refile verify function and a refile targets
specification of ((org-agenda-files :tag . refile)) .

-- 
The Kafka Pandemic: http://thekafkapandemic.blogspot.com
===
Bigotry against people with serious diseases is still bigotry.



Re: [O] git describe in version of info file with make info_git_describe

2011-10-16 Thread Michael Brand
Hi all

I made a new patch replacing the previous, now considering the
Makefile targets target and help introduced meanwhile by Achim
Gratz and with a shorter name info-vg for the new target for easier
typing of the make command.

The previous patch attachment had a wrong mime type, could therefore
not be caught by patchwork and has not been accepted.

Michael

On Thu, Jun 2, 2011 at 21:36, Michael Brand michael.ch.br...@gmail.com wrote:
 The patch is ready and attached.

 On Thu, Jun 2, 2011 at 17:05, Michael Brand michael.ch.br...@gmail.com 
 wrote:
 [...]
 Since I would like to give the more often used git describe
 precedence I will make org-version and make info_git_describe
 consistent with git. The .dirty postfix of org-version I will leave
 untouched in org-version of course and support also in make
 info_git_describe.
From 148ddbe2b2bdc45d4e53312669dab207d51d9fd8 Mon Sep 17 00:00:00 2001
From: Michael Brand michael.ch.br...@gmail.com
Date: Sun, 16 Oct 2011 21:06:35 +0200
Subject: [PATCH] Makefile info-vg: set info version to git describe

* Makefile (info-vg): New target.
(release): Remove -a that has become idle already before from
command UTILITIES/set-version.pl.
(fixrelease): Remove command UTILITIES/set-version.pl -o $(TAG) that
has become idle already before.
(targets help): Include new target info-vg.
* UTILITIES/set-version.pl (org-texi):
New option --org.texi [optional_file].
* org.el (org-version): Output format consistent with git describe.

The new Makefile target info-vg builds the info file doc/org like the
target info but sets the info version to the output of the command
git describe.
---
 Makefile |   13 +++--
 UTILITIES/set-version.pl |   35 +--
 lisp/org.el  |1 -
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 8b9aa4d..30bc578 100644
--- a/Makefile
+++ b/Makefile
@@ -280,6 +280,15 @@ html_guide: doc/orgguide.texi
 
 info:  doc/org
 
+# The following target builds the info file doc/org like the target info
+# but sets the info version to the output of the command git describe
+info-vg: TAG=$(shell git describe --abbrev=4 HEAD)$(shell \
+   test `git diff-index --name-only HEAD --`  printf '.dirty')
+info-vg: doc/org.texi
+   cp doc/org.texi /tmp
+   UTILITIES/set-version.pl '$(TAG)' --org.texi /tmp/org.texi
+   $(MAKEINFO) --no-split /tmp/org.texi -o doc/org
+
 pdf:   doc/org.pdf doc/orgguide.pdf
 
 card:  doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgcard.txt
@@ -315,7 +324,7 @@ release:
git push -f origin maint
git checkout master
git merge -s ours maint
-   UTILITIES/set-version.pl -a $(TAG)
+   UTILITIES/set-version.pl $(TAG)
git commit -a -m Update website to show $(TAG) as current release
git push
 
@@ -343,7 +352,6 @@ fixrelease:
git push -f origin maint
git checkout master
git merge -s ours maint
-   UTILITIES/set-version.pl -o $(TAG)
git commit -a -m Update website to show $(TAG) as current release
git push
 
@@ -521,6 +529,7 @@ targets help:
@echo 
@echo make doc - make all documentation
@echo make info - make Info documentation
+   @echo make info-vg - make Info doc, set info version to git describe
@echo make html - make HTML documentation
@echo make pdf - make pdf documentation
@echo make card - make refcards documentation
diff --git a/UTILITIES/set-version.pl b/UTILITIES/set-version.pl
index ed185ea..47d439b 100755
--- a/UTILITIES/set-version.pl
+++ b/UTILITIES/set-version.pl
@@ -1,43 +1,58 @@
 #!/usr/bin/perl
 $version = $ARGV[0];
-if ($version eq --all or $version eq -a) {
+
+# if no further option is present then default to all
+if (not $ARGV[1]) {
   $all = 1;
-  $version = $ARGV[1]
 }
 
-if ($version eq --only or $version eq -o) {
-  $only = 1;
-  $version = $ARGV[1]
+# parse option --org.texi [optional_file]
+# (only simple parsing since no more than one option supported yet)
+if ($ARGV[1] eq --org.texi) {
+  $org_texi_opt = 1;
+  if ($ARGV[2]) {
+$org_texi_file = $ARGV[2];
+  }
 }
 
 die No version given unless $version=~/\S/;
 $date = `date +%B %Y`; chomp $date;
 $year = `date +%Y` ; chomp $year;
 
-print STDERR Changing version to \$version\ and date to \$date\ in all 
relevant files\n ;
-
-if (not $only) {
+print STDERR Changing version to \$version\ and date to \$date\ in the 
following files:\n ;
 
+if ($all) {
   print STDERR join(\n,glob(lisp/*.el)),\n;
   $cmd = qq{s/^(;; Version:)\\s+(\\S+)[ \t]*\$/\$1 $version/;s/^(\\(defconst 
org-version )(\\S+)/\$1$version/};
   $c1 = perl -pi -e '$cmd' lisp/*.el;
   system($c1);
+}
 
-  print STDERR doc/org.texi\n;
+if ($all or $org_texi_opt) {
+  if (not $org_texi_file) {
+$org_texi_file = doc/org.texi;
+  }
+  print STDERR $org_texi_file\n;
   $cmd = qq{s/^(\\\@set VERSION)\\s+(\\S+)[ \t]*\$/\$1 $version/;s/^(\\\@set 

Re: [O] Problems with org-publish w/ #+INCLUDE:

2011-10-16 Thread Daniel Brunner
Carsten Dominik carsten.domi...@gmail.com writes:

(...)

 This should be fixed now, please verify.

 - Carsten


Hi, 

thanks for the fast fix. I tested it with the test case and with my
working environment and the fix seems to work! Thanks a lot!

Best wishes, Daniel.




[O] org-protocol and new frames

2011-10-16 Thread Tom Prince
Is there any way to get org-protocol to create a new frame, when it
needs to open a buffer, but otherwise not open one.

  Tom



Re: [O] Problems with org-publish w/ #+INCLUDE:

2011-10-16 Thread Nick Dokos
Carsten Dominik carsten.domi...@gmail.com wrote:

  I haven't checked yet but it would seem that the following commit
  introduced the problem:
 
 This should be fixed now, please verify.
 

Works fine for me.

Thanks,
Nick

 - Carsten
 
 =20
  --8---cut here---start-8---
  commit 920cf53e686daea4f406aa237b48fe2ef4730426
  Author: Jon Anders Skorpen jo...@ifi.uio.no
  Date:   Sat Jul 16 17:22:07 2011 +
 =20
 org-publish: Fix regexp for include files
 =20
 * org-publish.el (org-publish-cache-file-needs-publishing): Regexp =
 did
   not find includes with double quoted file names.
 =20
 TINYCHANGE
 =20
  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 @@ (defun org-publish-cache-file-needs-publishing =
 (filename optional pub-dir pub-f
(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)
  --8---cut here---end---8---
 =20
  Nick
 =20
 =20
  I have a file index.org:
 =20
  --8--
  #+TITLE: Foo!
  #+AUTHOR:Daniel
  #+EMAIL: daniel@monkey
  #+DATE:  2011-10-14 Fr
  #+INCLUDE: include.org
 =20
  Export it!
  --8--
 =20
  Then I have a file include.org with all the options etc. (option
  template included via C-c C-e t):
 =20
  --8--
  #+DESCRIPTION:
  #+KEYWORDS:
  #+LANGUAGE:  en
  #+OPTIONS:   H:3 num:t toc:t \n:nil @:t ::t |:t ^:t -:t f:t *:t :t
  #+OPTIONS:   TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil =
 tags:not-in-toc
  #+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 =
 path:http:/=3D
  /orgmode.org/org-info.js
  #+EXPORT_SELECT_TAGS: export
  #+EXPORT_EXCLUDE_TAGS: noexport
  #+LINK_UP:=3D20=3D20=3D20
  #+LINK_HOME:=3D20
  #+XSLT:
 =20
  #+BEGIN_HTML
   h1Bar/h1
  #+END_HTML
  --8--
 =20
  Then I set the org-publish-project-alist:
 =20
  --8--
  (require 'org-publish)
  (setq org-publish-project-alist
   (list (list foo
   :base-directory /home/dbr/tmp/omtests
   :base-extension org
   :publishing-directory /home/dbr/tmp/omtests/pub
   :publishing-function 'org-publish-org-to-html)))
  --8--
 =20
  Org-publish is from the 7.7 distribution directory. Then I visit
  index.org and do a C-c C-e P and run in the following error:
 =20
  --8--
  Debugger entered--Lisp error: (wrong-type-argument integerp nil)
   lsh(nil 16)
   =
 org-publish-cache-ctime-of-src(/home/dbr/tmp/omtests/include.org\n\nExpo=3D=
 
  rt)
   =
 org-publish-cache-file-needs-publishing(/home/dbr/tmp/omtests/index.org=3D=
 
  /home/dbr/tmp/omtests/pub/ org-publish-org-to-html)
   org-publish-needed-p(/home/dbr/tmp/omtests/index.org =
 /home/dbr/tmp/omt=3D
  ests/pub/ org-publish-org-to-html /home/dbr/tmp/omtests/pub/)
   org-publish-file(/home/dbr/tmp/omtests/index.org (foo =
 :base-directory=3D
  /home/dbr/tmp/omtests :base-extension org :publishing-directory =
 /home=3D
  /dbr/tmp/omtests/pub :publishing-function org-publish-org-to-html) =
 t)
   #[(project) =08@!=3D88=08A=3DC7  \=3DC7 \=3DC7 \=3D86=3D00=3D1C   
  =
 \=3D86#=3DCD=3DC7\=3D86-=3D0E=3D
  =3D1F  \=3D868=3D0E!\\=3D15 =
 \=3D1D=08\n\#=3D1E$=3D15=3D83X=3DD4!=3D88=3D0B=3D83a=3D0D=08\f\=3D88#=3D=
 89=3D
  A#@=3D89$=3D83x=3DD6$=08#=3D88=3D82a=3DC7  \=3D83=3D92=3DD9   =
 \!=3D88=3DDB=3DC7\\=08#=3D88=3D1D=3D83=3D9B=3DD4!=3D
  =3D88 .=3D0B=3D87 [project project-plist exclude-regexp sitemap-p =
 sitemap-filena=3D
  me sitemap-function org-publish-initialize-cache plist-get :exclude =
 :auto-s=3D
  itemap :sitemap-filename sitemap.org :sitemap-function =
 org-publish-org-si=3D
  temap :sitemap-date-format :sitemap-file-entry-format =
 :preparation-function=3D
  :completion-function org-publish-get-base-files nil run-hooks =
 preparation-=3D
  function org-publish-file t :makeindex =
 org-publish-index-generate-theindex =3D
  :base-directory expand-file-name theindex.org completion-function =
 org-pub=3D
  lish-write-cache-file org-publish-sitemap-date-format =
 org-sitemap-date-form=3D
  at org-publish-sitemap-file-entry-format =
 org-sitemap-file-entry-format file=3D
  s file] 6]((foo :base-directory /home/dbr/tmp/omtests =
 :base-extension =3D
  org :publishing-directory /home/dbr/tmp/omtests/pub =
 :publishing-function=3D
  org-publish-org-to-html))
   mapc(#[(project) =08@!=3D88=08A=3DC7 \=3DC7 \=3DC7 =
 \=3D86=3D00=3D1C \=3D86#=3DCD=3DC7  \=3D86-=3D
  =3D0E=3D1F \=3D868=3D0E!\\=3D15 =
 

Re: [O] Export as HTML does not preserve nonstandard entities as TODO signs

2011-10-16 Thread Arne Babenhauserheide
Am Sonntag, 16. Oktober 2011, 16:33:52 schrieb Christian Moe:
 First, sorry about the noise: I had failed to activate your symbols as
 TODO keywords. Now I do reproduce your results.

No problem and many thanks for checking - and fixing!

As soon as it’s in the emacs 24 repo, I can test it.

Best wishes,
Arne
--
1w6 sie zu achten,
sie alle zu finden,
in Spiele zu leiten
und sacht zu verbinden.
→ http://1w6.org



signature.asc
Description: This is a digitally signed message part.