From mboxrd@z Thu Jan 1 00:00:00 1970 From: Charles Durst Subject: Re: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Thu, 8 Dec 2016 18:37:53 -0500 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> Reply-To: cwdurst+orgmode@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF8HY-0000zi-VF for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:39:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cF8HT-0000HK-4m for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:39:20 -0500 Received: from mail-vk0-f42.google.com ([209.85.213.42]:35195) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cF8HT-0000HF-0g for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:39:15 -0500 Received: by mail-vk0-f42.google.com with SMTP id w194so841534vkw.2 for ; Thu, 08 Dec 2016 15:39:14 -0800 (PST) In-Reply-To: <87pol2f34e.fsf@nicolasgoaziou.fr> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Lungang Fang , emacs-orgmode@gnu.org, Charles Durst They do conflict. My version is slightly more complicated since it also supports nested mixed lists. For example: 1. Here * is * an 2. example * of * a 3. mixed 4. list Which translates to: # Here #- is #- an # example #- of #- a # mixed # list Which is effectively the same as the example in the Confluence documentation: https://confluence.atlassian.com/confcloud/confluence-wiki-markup-724765099.html#ConfluenceWikiMarkup-Mixedlists -- Charles Durst cwdurst+orgmode@gmail.com On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou wrote: > Hello, > > Lungang Fang writes: > >> Attached is a patch for contrib/lisp/ox-confluence.el generated following >> instructions on http://orgmode.org/worg/org-contribute.html#patches . It >> adds support for ordered list. > > Thank you. > > However, this somewhat conflicts with a patch recently sent on the ML, > but not yet applied, by Charles Durst (Cc'ed). > > Could one double-check if one doesn't supersede the other, or if they > could be merged (although I suspect the former) and report back so > I know what patch to apply? > > Regards, > > -- > Nicolas Goaziou