Now that the patch is "official", how do I conduct my next git pull since I don't really want to commit my modified file in favor of the incoming from the git server?

Sorry... never really done this part before. I have had a hard enough time trying to learn some git basics; merging is still elusive to me!


John

On Wed, Aug 11, 2010 at 2:50 AM, Carsten Dominik <cdominik@newartisans.com> wrote:
Patch 211 (http://patchwork.newartisans.com/patch/211/) is now "Accepted".

Maintaner comment: No comment

This relates to the following submission:

http://mid.gmane.org/%3C87bp9a8a8b.wl%25n.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: [Orgmode] Re: [PATCH] Table caption produces trailing "nil" in pdf
>       export
> Date: Wed, 11 Aug 2010 01:48:52 -0000
> From: Nicolas Goaziou <n.goaziou@gmail.com>
> X-Patchwork-Id: 211
> Message-Id: <87bp9a8a8b.wl%n.goaziou@gmail.com>
> To: John Hendy <jw.hendy@gmail.com>
> Cc: emacs-orgmode <emacs-orgmode@gnu.org>
>
> Hello,
>
> >>>>> John Hendy writes:
>
> > Suddenly I'm getting a line with nothing but "nil" between the caption and
> > the table when exporting from org-mode to LaTeX. I swear this not happening.
> > I believe I did a git pull on Friday or some time last week. The only reason
> > I noticed is that I just set up emacs, org, and LaTeX on a new computer and
> > tested an old file to make sure the export was working. I then checked my
> > other computer with what I thought was a fine install and it's doing it now,
> > too. I originally thought I missed something on the new computer, but now
> > I'm wondering if it's from the fresh pull.
>
> This patch (needed by my own mistake) should correct the problem.
>
> Regards,
>
> -- Nicolas
> >From 38a3ae8cf8716af0db87a47a421b6d5af654d045 Mon Sep 17 00:00:00 2001
> From: Nicolas Goaziou <n.goaziou@gmail.com>
> Date: Tue, 10 Aug 2010 22:43:35 +0200
> Subject: [PATCH] Fix empty label bug
>
> * org-latex.el (org-export-latex-tables): Return "" instead of nil
>   when no label is attached.
>
> ---
> lisp/org-latex.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/lisp/org-latex.el b/lisp/org-latex.el
> index 056f1b3..b0ba939 100644
> --- a/lisp/org-latex.el
> +++ b/lisp/org-latex.el
> @@ -1683,7 +1683,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
>                               "\\caption%s{%s} %s"
>                               (if shortn (concat "[" shortn "]") "")
>                               (or caption "")
> -                          (when label (format "\\label{%s}" label))))
> +                          (if label (format "\\label{%s}" label) "")))
>                          (if (and longtblp caption) "\\\\\n" "\n")
>                          (if (and org-export-latex-tables-centered (not longtblp))
>                              "\\begin{center}\n")
>

_______________________________________________
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