From mboxrd@z Thu Jan 1 00:00:00 1970 From: Qiang Fang Subject: Re: Request on modification of org-element.el Date: Sat, 24 Nov 2018 10:31:33 +0800 Message-ID: References: <87va4ol2xk.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000ae5ff3057b5fe6bf" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:32999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQNjY-0004L8-Hb for emacs-orgmode@gnu.org; Fri, 23 Nov 2018 21:31:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQNjX-0000Vr-IY for emacs-orgmode@gnu.org; Fri, 23 Nov 2018 21:31:48 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:41917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gQNjX-0000VK-CK for emacs-orgmode@gnu.org; Fri, 23 Nov 2018 21:31:47 -0500 Received: by mail-pl1-x630.google.com with SMTP id u6so11311063plm.8 for ; Fri, 23 Nov 2018 18:31:46 -0800 (PST) In-Reply-To: <87va4ol2xk.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: emacs-orgmode@gnu.org --000000000000ae5ff3057b5fe6bf Content-Type: text/plain; charset="UTF-8" Hello Nicolas, The complete diff is: $ ~/src$ git clone https://code.orgmode.org/bzg/org-mode.git $ cd org-mode $ git merge origin/wip-cite Auto-merging testing/lisp/test-org-element.el Auto-merging lisp/org-element.el CONFLICT (content): Merge conflict in lisp/org-element.el Automatic merge failed; fix conflicts and then commit the result. $ git diff diff --cc lisp/org-element.el index cdb574e17,f7498fbd1..000000000 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil (strike-through ,@standard-set) (subscript ,@standard-set) (superscript ,@standard-set) ++<<<<<<< HEAD + ;; Ignore inline babel call and inline source block as formulas + ;; are possible. Also ignore line breaks and statistics + ;; cookies. + (table-cell bold code entity export-snippet footnote-reference italic + latex-fragment link macro radio-target strike-through + subscript superscript target timestamp underline verbatim) ++======= + ;; Ignore inline babel call and inline src block as formulas are + ;; possible. Also ignore line breaks and statistics cookies. + (table-cell ,@(append '(export-snippet footnote-reference link macro + radio-target target timestamp) + minimal-set)) ++>>>>>>> origin/wip-cite (table-row table-cell) (underline ,@standard-set) (verse-block ,@standard-set))) On Fri, Nov 23, 2018 at 2:32 PM Nicolas Goaziou wrote: > Hello, > > Qiang Fang writes: > > > I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs > some > > changed in the upstream org mode. Can you please kindly review the > > request? > > You need to pull again "wip-cite" branch. It was rebased against master > yesterday. So was "wip-cite-awe". > > Regards, > > -- > Nicolas Goaziou > --000000000000ae5ff3057b5fe6bf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Nicolas,
The complete diff is:

$ ~/src$ git cl=
one https://code.orgm=
ode.org/bzg/org-mode.git
$ cd org-mode
$ git merge origin/wip-cite

Auto-merging testing/lisp/test-org-element.el
Auto-merging lisp/org-element.el
CONFLICT (content): Merge conflict in lisp/org-element.el
Automatic merge failed; fix conflicts and then commit the result.

$ git diff
diff --cc lisp/org-element.el
index cdb574e17,f7498fbd1..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil
        (strike-through ,@standard-set)
        (subscript ,@standard-set)
        (superscript ,@standard-set)
++<<<<<<< HEAD
 +      ;; Ignore inline babel call and inline source block as formulas
 +      ;; are possible.  Also ignore line breaks and statistics
 +      ;; cookies.
 +      (table-cell bold code entity export-snippet footnote-reference ital=
ic
 +                latex-fragment link macro radio-target strike-through
 +                subscript superscript target timestamp underline verbatim=
)
++=3D=3D=3D=3D=3D=3D=3D
+       ;; Ignore inline babel call and inline src block as formulas are
+       ;; possible.  Also ignore line breaks and statistics cookies.
+       (table-cell ,@(append '(export-snippet footnote-reference link =
macro
+                                            radio-target target timestamp)
+                           minimal-set))
++>>>>>>> origin/wip-cite
        (table-row table-cell)
        (underline ,@standard-set)
        (verse-block ,@standard-set)))


On Fri, Nov 23, 2018 at 2:32 PM Nic= olas Goaziou <mail@nicolasgoaz= iou.fr> wrote:
Hello,

Qiang Fang <go= dblessfq@gmail.com> writes:

> I am a user of kjambunathan's org-mode-ox-odt. The odt exporter ne= eds some
> changed in the upstream org mode. Can you please kindly review the
> request?

You need to pull again "wip-cite" branch. It was rebased against = master
yesterday. So was "wip-cite-awe".

Regards,

--
Nicolas Goaziou
--000000000000ae5ff3057b5fe6bf--