[Accepted] org-capture and XEmacs, indenting too far

[Bastien Guerry <bzg@altern.org>]

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 -0000
> From: Michael Sperber <sperber@deinprogramm.de>
> X-Patchwork-Id: 1002
> Message-Id: <y9lipnhjd8w.fsf@deinprogramm.de>
> To: emacs-orgmode@gnu.org, Robert Pluim <rpluim@gmail.com>,
> 	carsten.dominik@gmail.com
> 
> Robert Pluim <rpluim@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
>