From: Qiang Fang <godblessfq@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Request on modification of org-element.el
Date: Sat, 24 Nov 2018 10:31:33 +0800 [thread overview]
Message-ID: <CAOHC6G8Py69_8mcW-jGgXeW7ugmuJLye1=AJOo6WX9xUyCTZJg@mail.gmail.com> (raw)
In-Reply-To: <87va4ol2xk.fsf@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]
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 <mail@nicolasgoaziou.fr>
wrote:
> Hello,
>
> Qiang Fang <godblessfq@gmail.com> 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
>
[-- Attachment #2: Type: text/html, Size: 3221 bytes --]
next prev parent reply other threads:[~2018-11-24 2:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 0:51 Request on modification of org-element.el Qiang Fang
2018-11-23 6:32 ` Nicolas Goaziou
2018-11-24 2:31 ` Qiang Fang [this message]
2018-11-24 10:23 ` Nicolas Goaziou
2018-11-23 6:42 ` Eric S Fraga
2018-11-24 2:35 ` Qiang Fang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOHC6G8Py69_8mcW-jGgXeW7ugmuJLye1=AJOo6WX9xUyCTZJg@mail.gmail.com' \
--to=godblessfq@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.