[Orgmode] Isolate export parameters in file from currently exporting subtree

2010-01-19 Thread Alan E. Davis
In one large file, I would like to keep a large number of individual
subtrees, each for independent export to LaTeX.  Is it possible to isolate
the extra parameters needed for a subtree isolated from the rest of the
file?

For example:
* Handouts
** Plants
#+TITLE: 125 General Principles of Plant Reproduction
#+AUTHOR:
#+DATE:
#+LaTeX_HEADER: \usepackage{fullpage}

I will have to either archive each subtree or delete these parameters if
they are not to influence the export of another subtree.

I am thinking about Selective Export.  To make things simpler, can I put
these items into a property drawer?

Thank you once again for Org-Mode.  In the last many, many months I have
become more and more dependent upon Org Mode for a diverse range of work.


Alan Davis
___
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


Re: [Orgmode] Isolate export parameters in file from currently exporting subtree

2010-01-19 Thread Giovanni Ridolfi
"Alan E. Davis"  writes:

> In one large file, I would like to keep a large number of individual
> subtrees,  each for independent export to LaTeX.  
> Is it possible to isolate the extra parameters needed for a subtree 
> isolated from the rest of the file?

Answer:
* procedure 3
:PROPERTIES:
:EXPORT_FILE_NAME: STA.html
:EXPORT_TITLE: Procedure 3
:EXPORT_OPTIONS: H:4 toc:nil
:END:
** here begins
--
Reference (Org-manual) :
   When exporting only a single subtree by selecting it with `C-c @'
before calling an export command, the subtree can overrule some of the
file's export settings with properties `EXPORT_FILE_NAME',
`EXPORT_TITLE', `EXPORT_TEXT', `EXPORT_AUTHOR', `EXPORT_DATE', and
`EXPORT_OPTIONS'.

Many thanks to Carsten who invested a lot of time
writing the fine manual.

Giovanni


___
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


Re: [Orgmode] Removing footnotes

2010-01-19 Thread Carsten Dominik

Hi Joe,

as an alternative to the solution proposed by Jan (turning off
footnote support entirely), you might also consider marking
that snippet as verbatim code, for example

   * Tips
   ** Average bytes transferred
   : perl -lane'$n+=$F[9]; ++$i; END{print $n/$i}' logfile


or maybe


   * Tips
   ** Average bytes transferred
   #+begin_src shell
   perl -lane'$n+=$F[9]; ++$i; END{print $n/$i}' logfile
   #+end_src

- Carsten


On Jan 18, 2010, at 10:50 PM, Joe Python wrote:


Orgmode Gurus,

How to remove the footnotes from my file.
I have some perl code in my notes which I like to export to html and  
tex.


--< org file begins  
here>---

* Tips** Average bytes transferred
perl -lane'$n+=$F[9]; ++$i; END{print $n/$i}' logfile
< org file ends  
here>


The F[9] above is interpreted as a Foot Note by org.
Is there a way to prevent it?

Please let me know.

Thank you,
Joe
___
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

- Carsten






___
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


Re: [Orgmode] org-mode from git and emacs in trunk

2010-01-19 Thread Carsten Dominik


On Jan 19, 2010, at 12:16 AM, Xiao-Yong Jin wrote:


Hi, I am trying the new emacs develop version in trunk.  I
build org-mode from git as usual.  But I just realized I am
actually using the org-mode bundled with emacs instead of
the version I installed from git.  My configuration files
are the same before and after I switched to bzr version of
emacs.

Here is what I see.  After starting emacs,

GNU Emacs 23.1.91.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.18.5)  
of 2010-01-18


I check the org-version to be

Org-mode version 6.33x

I need to run "org-reload" to make org-version to be

Org-mode version 6.34c

But restarting emacs gives me back the "6.33x".  What is the
problem?  Of course I have put my installed org-mode
directory to 'load-path and I have the line "(require
'org-install)" in my "~/.emacs".  It worked before 23.1 and
was working for me with 23.1, but not with the current
trunk.  Is there something I am missing?  Some additional
setup I should do?


Most likely, when you start Emacs, you have something in your config
that will load org.el *before* you have added path of Org-mode's
git distribution to the load path.  Then you add to the
load-path variable, so when you reload, the new version
is loaded instead.

Solution:  Move up the lisp statement that adds org-mode's
lisp directory to load-path.

HTH

- Carsten





Right now, I am doing "org-reload" every time I start emacs.
Should I put it in my "~/.emacs"?  It seems to me quite
unnecessary, but it is the only way to load my latest
org-mode working.

Is anyone seeing the same problem?

--
Jc/*__o/*
X<\ * (__
Y*/\  <


___
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


- Carsten





___
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


Re: [Orgmode] org-encrypt-entries seems to break perl- and cperl-mode

2010-01-19 Thread Carsten Dominik

Hi Jeffrey,

indeed you need to make sure that this hook runs only in Org-mode files.
This is automatically done by calling

(org-crypt-use-before-save-magic)

after loading org-crypt.el.

Internally, this achieves it's goal by installing
a function into `org-mode-hook', which will then install
a function into the buffer-local version of before-save-hook.

This information is also
given in the file commentary in org-crypt.el, but I think
we should get this info also into WOrg, or maybe even
into the manual.  I'd be happy to accept a patch in
this direction.

Hope this helps

- Carsten


On Jan 18, 2010, at 10:00 PM, Jeffrey Ratcliffe wrote:


With

(add-hook 'before-save-hook 'org-encrypt-entries)

and a file with the following contents:

package G;

in perl- or cperl-mode, when saving, I get the following error
message:

org-scan-tags: Wrong type argument: consp, nil

Can I make the add-hook org-mode specific, or this is a bug in
org-mode?

Please cc on replies, as I am not subscribed.

Regards

Jeff
___
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


- Carsten





___
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] changing \href to \myhref in LaTex export

2010-01-19 Thread Martin G. Skjæveland

Hi,

is it possible to change how hyperlinks are exported to LaTex without 
going into to org-latex.el, but setting by a variable or similar in my 
.emacs file?


I would like to export hyperlinks in Latex as \myhref (or something 
else) instead of \href, so that I can redefine \myhref using \href, like 
this


   \usepackage{ifthen}
   \newcommand{\myhref}[2]{
 \ifthenelse{\equal{#1}{#2}}
   {\href{#1}{#2}}
   {\href{#1}{#2}\footnote{\url{#1}}}
 }

and thus include the URLs of the links as footnotes.

(I thought I could set this with a parameter of the hyperref package in 
LaTex, but I have not found a way.)


Thanks!
Martin



___
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


Re: [Orgmode] org-mode from git and emacs in trunk

2010-01-19 Thread Xiao-Yong Jin
> On Tue, 19 Jan 2010 16:03:17 +0100, Carsten Dominik 
>  said:

> Most likely, when you start Emacs, you have something in your config
> that will load org.el *before* you have added path of Org-mode's
> git distribution to the load path.  Then you add to the
> load-path variable, so when you reload, the new version
> is loaded instead.

> Solution:  Move up the lisp statement that adds org-mode's
> lisp directory to load-path.

Thanks for the guidance!  It turns out that nxhtml is the
intruder that required org.el before I had the chance to
change the load path.  I overlooked the elisp package
dependence.  Problem solved.  Thank you again for the good
work.

-- 
Jc/*__o/*
X<\ * (__
Y*/\  <


___
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


Re: [Orgmode] Removing footnotes

2010-01-19 Thread Joe Python
Thank you all for these great answers.
God Bless.

- Joe

On Tue, Jan 19, 2010 at 9:57 AM, Carsten Dominik
wrote:

> Hi Joe,
>
> as an alternative to the solution proposed by Jan (turning off
> footnote support entirely), you might also consider marking
> that snippet as verbatim code, for example
>
>
>   * Tips
>   ** Average bytes transferred
>   : perl -lane'$n+=$F[9]; ++$i; END{print $n/$i}' logfile
>
>
> or maybe
>
>
>   * Tips
>   ** Average bytes transferred
>   #+begin_src shell
>
>   perl -lane'$n+=$F[9]; ++$i; END{print $n/$i}' logfile
>   #+end_src
>
> - Carsten
>
>
>
> On Jan 18, 2010, at 10:50 PM, Joe Python wrote:
>
>  Orgmode Gurus,
>>
>> How to remove the footnotes from my file.
>> I have some perl code in my notes which I like to export to html and tex.
>>
>> --< org file begins
>> here>---
>> * Tips** Average bytes transferred
>> perl -lane'$n+=$F[9]; ++$i; END{print $n/$i}' logfile
>> < org file ends
>> here>
>>
>> The F[9] above is interpreted as a Foot Note by org.
>> Is there a way to prevent it?
>>
>> Please let me know.
>>
>> Thank you,
>> Joe
>> ___
>> 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
>>
>> - Carsten
>>
>>
>>
>>
___
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] Re: org-encrypt-entries seems to break perl- and cperl-mode

2010-01-19 Thread Richard Riley
Carsten Dominik  writes:

> Hi Jeffrey,
>
> indeed you need to make sure that this hook runs only in Org-mode files.
> This is automatically done by calling
>
> (org-crypt-use-before-save-magic)
>
> after loading org-crypt.el.
>
> Internally, this achieves it's goal by installing
> a function into `org-mode-hook', which will then install
> a function into the buffer-local version of before-save-hook.
>
> This information is also
> given in the file commentary in org-crypt.el, but I think
> we should get this info also into WOrg, or maybe even
> into the manual.  I'd be happy to accept a patch in
> this direction.
>
> Hope this helps


A quick note to say how wonderful this mode is. I had been using a .gpg
file with the mode in  a file variable. This thread pushed me to try
org-crypt. Amazingly good and well thought out!

,
| (require 'org-crypt)
| (org-crypt-use-before-save-magic)
| (setq org-crypt-key "r...@richardriley.net")
`

And encryption "just works" when I add the tag :crypt:.

The only slight hiccup I saw was that when I added the crypt tag to
another element in another org file and saved it, it did not encrypt 
that after the initial encryption of the first file I had tagged. When I
restarted emacs and rewrote it it did.

Which brings up my next query : when does org reread tags? I added a
filetag  (#+FILETAGS) to an open org file and saved it but the agenda
match did not find it. How can I force a refresh of the tags buffer when
I save a file? 




___
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] Re: org-encrypt-entries seems to break perl- and cperl-mode

2010-01-19 Thread Matt Lundin
Richard Riley  writes:

> Which brings up my next query : when does org reread tags? I added a
> filetag  (#+FILETAGS) to an open org file and saved it but the agenda
> match did not find it. How can I force a refresh of the tags buffer when
> I save a file? 

You can type C-c C-c on the #+FILETAGS line to refresh the buffer. This
applies to all settings added at the top of a file.

Best,
Matt


___
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] clock based context settings

2010-01-19 Thread Richard Riley

I would like to be able to execute arbitrary elisp when I clock in or
out of a certain org.item This would be very, very useful for defining
variables or even keystrokes on a "per project" basis. Ideally it would
work using inheritance so if an item does not have something then the
project or file level values would be used.

e.g at the file level:

#+CLOCKINEXEC: (setq curr-url "project1.com")

Or at the org item level 

** touch up picture of the org logo
  :PROPERTIES:
  :CLOCKINEXEC:   (setq curr-url "org-mode.com/images")
  :END:

Would others think this might be useful or is there another way/approach
to achieve something similar?

My example might for instance having a key bound to launching a url and
the url will set depending n´on which web project I am working on.

-- 
Google Talk : rileyrg...@googlemail.com  http://www.google.com/talk


___
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] [PATCH] added a new modeline face for tasks which have overrun their effort estimate

2010-01-19 Thread Richard Riley

This small patch (be gentle, its my first) adds a new
face,org-mode-line-clock-overrun, for the modeline task clock when a
task has overrun its allotted Estimate.

I will try to set up the remote repo thing described here
http://orgmode.org/worg/org-contribute.php#sec-3 but I'm not 100% sure
of what it is I'm supposed to set up there. Should it be a mirror of the
master git repo?

Comments on elisp ineptitude welcome.

Subject: [PATCH] added a new modeline face for tasks which have overrun
their effort estimate


---
 lisp/org-clock.el |8 +---
 lisp/org-faces.el |2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 07f5e81..03df5b6 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -388,6 +388,8 @@ pointing to it."
(insert (format "[%c] %-15s %s\n" i cat task))
(cons i marker)
 
+(defvar org-task-overrun nil)
+
 (defun org-clock-get-clock-string ()
   "Form a clock-string, that will be show in the mode line.
 If an effort estimate was defined for current item, use
@@ -406,6 +408,7 @@ If not, show simply the clocked time like 01:50."
  h m org-clock-heading
 
 (defun org-clock-update-mode-line ()
+  (if org-clock-effort (org-clock-notify-once-if-expired))
   (setq org-mode-line-string
(org-propertize
 (let ((clock-string (org-clock-get-clock-string))
@@ -417,8 +420,7 @@ If not, show simply the clocked time like 01:50."
 (org-propertize clock-string 'help-echo help-text)))
 'local-map org-clock-mode-line-map
 'mouse-face (if (featurep 'xemacs) 'highlight 'mode-line-highlight)
-'face 'org-mode-line-clock))
-  (if org-clock-effort (org-clock-notify-once-if-expired))
+'face (if  org-task-overrun 'org-mode-line-clock-overrun 
'org-mode-line-clock)))
   (force-mode-line-update))
 
 (defun org-clock-get-clocked-time ()
@@ -473,7 +475,7 @@ Notification is shown only once."
   (when (marker-buffer org-clock-marker)
 (let ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort))
  (clocked-time (org-clock-get-clocked-time)))
-  (if (>= clocked-time effort-in-minutes)
+  (if (setq org-task-overrun (>= clocked-time effort-in-minutes ))
  (unless org-clock-notification-was-shown
(setq org-clock-notification-was-shown t)
(org-notify
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index e3294eb..dad2b5e 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -641,6 +641,8 @@ If it is less than 8, the level-1 face gets re-used for 
level N+1 etc."
 
 (org-copy-face 'modeline 'org-mode-line-clock
   "Face used for clock display in mode line.")
+(org-copy-face 'modeline 'org-mode-line-clock-overrun
+  "Face used for clock display for overrun tasks in mode line.")
 
 (provide 'org-faces)
 
-- 
1.6.5


-- 
Google Talk : rileyrg...@googlemail.com  http://www.google.com/talk


___
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] Re: [PATCH] added a new modeline face for tasks which have overrun their effort estimate

2010-01-19 Thread Richard Riley

I believe I now have a repo set up that can be pulled from. Not sure if
its done the correct way since I didnt clone org-mode. Rather I pushed
my clone master and then the overrun branch. I *think* that should be
ok.

Anyway, the URL is

http://repo.or.cz/w/rgr-org-mode.git

and the branch with patch is called "overrun". Sorry about the octopus
at the head of overrun - you will note that I didnt set my email
properly and all hell broke loose as I tried to reset the head and 

Any comments on usage to put me further onto the right track, if I have
strayed, most welcome!

regards

r.


Richard Riley  writes:

> This small patch (be gentle, its my first) adds a new
> face,org-mode-line-clock-overrun, for the modeline task clock when a
> task has overrun its allotted Estimate.
>
> I will try to set up the remote repo thing described here
> http://orgmode.org/worg/org-contribute.php#sec-3 but I'm not 100% sure
> of what it is I'm supposed to set up there. Should it be a mirror of the
> master git repo?
>
> Comments on elisp ineptitude welcome.
>
> Subject: [PATCH] added a new modeline face for tasks which have overrun
> their effort estimate
>
> ---
>  lisp/org-clock.el |8 +---
>  lisp/org-faces.el |2 ++
>  2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index 07f5e81..03df5b6 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -388,6 +388,8 @@ pointing to it."
>   (insert (format "[%c] %-15s %s\n" i cat task))
>   (cons i marker)
>
> +(defvar org-task-overrun nil)
> +
>  (defun org-clock-get-clock-string ()
>"Form a clock-string, that will be show in the mode line.
>  If an effort estimate was defined for current item, use
> @@ -406,6 +408,7 @@ If not, show simply the clocked time like 01:50."
> h m org-clock-heading
>
>  (defun org-clock-update-mode-line ()
> +  (if org-clock-effort (org-clock-notify-once-if-expired))
>(setq org-mode-line-string
>   (org-propertize
>(let ((clock-string (org-clock-get-clock-string))
> @@ -417,8 +420,7 @@ If not, show simply the clocked time like 01:50."
>(org-propertize clock-string 'help-echo help-text)))
>'local-map org-clock-mode-line-map
>'mouse-face (if (featurep 'xemacs) 'highlight 'mode-line-highlight)
> -  'face 'org-mode-line-clock))
> -  (if org-clock-effort (org-clock-notify-once-if-expired))
> +  'face (if  org-task-overrun 'org-mode-line-clock-overrun 
> 'org-mode-line-clock)))
>(force-mode-line-update))
>
>  (defun org-clock-get-clocked-time ()
> @@ -473,7 +475,7 @@ Notification is shown only once."
>(when (marker-buffer org-clock-marker)
>  (let ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort))
> (clocked-time (org-clock-get-clocked-time)))
> -  (if (>= clocked-time effort-in-minutes)
> +  (if (setq org-task-overrun (>= clocked-time effort-in-minutes ))
> (unless org-clock-notification-was-shown
>   (setq org-clock-notification-was-shown t)
>   (org-notify
> diff --git a/lisp/org-faces.el b/lisp/org-faces.el
> index e3294eb..dad2b5e 100644
> --- a/lisp/org-faces.el
> +++ b/lisp/org-faces.el
> @@ -641,6 +641,8 @@ If it is less than 8, the level-1 face gets re-used for 
> level N+1 etc."
>
>  (org-copy-face 'modeline 'org-mode-line-clock
>  "Face used for clock display in mode line.")
> +(org-copy-face 'modeline 'org-mode-line-clock-overrun
> +"Face used for clock display for overrun tasks in mode line.")
>
>  (provide 'org-faces)
>
> -- 
> 1.6.5

-- 
Google Talk : rileyrg...@googlemail.com  http://www.google.com/talk



___
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


Re: [Orgmode] Re: [PATCH] added a new modeline face for tasks which have overrun their effort estimate

2010-01-19 Thread Jan Böcker
On 20.01.2010 06:22, Richard Riley wrote:
> 
> I believe I now have a repo set up that can be pulled from. Not sure if
> its done the correct way since I didnt clone org-mode. Rather I pushed
> my clone master and then the overrun branch. I *think* that should be
> ok.
> 
> Anyway, the URL is
> 
> http://repo.or.cz/w/rgr-org-mode.git
> 
> and the branch with patch is called "overrun".

That is the URL to the web interface, which cannot be pulled from.
The correct URL to clone/pull from is:

git://repo.or.cz/rgr-org-mode.git

> Sorry about the octopus
> at the head of overrun - you will note that I didnt set my email
> properly and all hell broke loose as I tried to reset the head and 

The cool thing about git is that it lets you fix this :)
I see that you have committed the same patch three times with a
different email address and/or commit message. What you want to do is to
delete two of these commits.

Enter git rebase --interactive, which allows you to rewrite history.
Let's do this on a new branch, because rewriting history that others
have already pulled can break things for them:

$ git checkout overrun
$ git checkout -b overrun-fixed

We want to modify HEAD and the two commits before that:

$ git rebase -i HEAD~2

You are now dropped into a text editor. Each line in the file you edit
represents one commit. To drop a commit, simply delete the line (or
comment it out). I assume that you want to keep commit 34b13cb... with
the gmail address, so you would comment out the other two lines:

# pick 09f2e0e added a new modeline face for tasks which have...
pick 34b13cb added new face for task modeline clock for when...
# pick da65d04 added a new modeline face for tasks which have...

Then save the file and exit the editor.
If everything succeeded, git rebase should say:
Successfully rebased and updated refs/heads/overrun-fixed.

Start gitk and take a look at your new, tidy overrun-fixed branch.

If something goes wrong, you can abort the rebase with:
$ git rebase --abort


I cannot comment on the patch itself, as I am new to elisp myself and
have never done anything with faces or mode-lines.



___
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] Re: [PATCH] added a new modeline face for tasks which have overrun their effort estimate

2010-01-19 Thread Richard Riley
Jan Böcker  writes:

> On 20.01.2010 06:22, Richard Riley wrote:
>> 
>> I believe I now have a repo set up that can be pulled from. Not sure if
>> its done the correct way since I didnt clone org-mode. Rather I pushed
>> my clone master and then the overrun branch. I *think* that should be
>> ok.
>> 
>> Anyway, the URL is
>> 
>> http://repo.or.cz/w/rgr-org-mode.git
>> 
>> and the branch with patch is called "overrun".
>
> That is the URL to the web interface, which cannot be pulled from.
> The correct URL to clone/pull from is:
>
> git://repo.or.cz/rgr-org-mode.git

Yes, I realised that - it is listed on the web page - I kind of figured
people would want to see the (now defunct) "octopus" graphically before
adding this as a remote ;)

>
>> Sorry about the octopus
>> at the head of overrun - you will note that I didnt set my email
>> properly and all hell broke loose as I tried to reset the head and 
>
> The cool thing about git is that it lets you fix this :)
> I see that you have committed the same patch three times with a
> different email address and/or commit message. What you want to do is to
> delete two of these commits.

Yes, I had thought my git repo clone would inherit my top level git user
settings but it didnt seem to. Possibly global not set. On my list to
now check.

>
> Enter git rebase --interactive, which allows you to rewrite history.
> Let's do this on a new branch, because rewriting history that others
> have already pulled can break things for them:
>
> $ git checkout overrun
> $ git checkout -b overrun-fixed
>
> We want to modify HEAD and the two commits before that:
>
> $ git rebase -i HEAD~2

What I did (before I saw this) was to reset to HEAD~2, the do a commit
and a force push. Worked well.

Git rebase is now on my list to review! There are so many ways to do the
same thing.


>
> You are now dropped into a text editor. Each line in the file you edit
> represents one commit. To drop a commit, simply delete the line (or
> comment it out). I assume that you want to keep commit 34b13cb... with
> the gmail address, so you would comment out the other two lines:
>
> # pick 09f2e0e added a new modeline face for tasks which have...
> pick 34b13cb added new face for task modeline clock for when...
> # pick da65d04 added a new modeline face for tasks which have...
>
> Then save the file and exit the editor.
> If everything succeeded, git rebase should say:
> Successfully rebased and updated refs/heads/overrun-fixed.
>
> Start gitk and take a look at your new, tidy overrun-fixed branch.
>
> If something goes wrong, you can abort the rebase with:
> $ git rebase --abort
>
> I cannot comment on the patch itself, as I am new to elisp myself and
> have never done anything with faces or mode-lines.

Many thanks for the feedback.  Was quite hairy for a while. For some
reason my new repo wouldnt acept a push for about half an hour after I
created it. At least I dont think I did anything to suddenly make it
work. But seems fine now.

>
> ___
> 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
>

-- 
Google Talk : rileyrg...@googlemail.com  http://www.google.com/talk



___
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