From: Ramesh Nedunchezian <rameshnedunchezian@outlook.com>
To: emacs-orgmode@gnu.org
Subject: Does wip-cite work with master or 9.4.5 release?
Date: Thu, 8 Apr 2021 19:20:22 +0530 [thread overview]
Message-ID: <TY2PR0101MB3693EB9943AF6D91EFBA34DBDA749@TY2PR0101MB3693.apcprd01.prod.exchangelabs.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
I tried checking out wip-cite like so.
git reset --hard release_9.4.5
git merge wip-cite
git diff > conflict.diff
I am seeing merge conflicts. See attached diff.
Does wip-cite doesn't work with master or 9.4.5? Am I doing something
wrong?
[-- Attachment #2: conflict.diff --]
[-- Type: text/x-patch, Size: 2833 bytes --]
diff --cc lisp/org-element.el
index 0f0e01e8a,2f1f972de..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -329,11 -295,14 +339,21 @@@ match group 2
Don't modify it, set `org-element-affiliated-keywords' instead.")
(defconst org-element-object-restrictions
++<<<<<<< HEAD
+ (let* ((minimal-set '(bold code entity italic latex-fragment strike-through
+ subscript superscript underline verbatim))
+ (standard-set (remq 'table-cell org-element-all-objects))
+ (standard-set-no-line-break (remq 'line-break standard-set)))
++=======
+ (let* ((standard-set
+ (remq 'citation-reference (remq 'table-cell org-element-all-objects)))
+ (standard-set-no-line-break (remq 'line-break standard-set))
+ (minimal-set '(bold code entity italic latex-fragment strike-through
+ subscript superscript underline verbatim)))
++>>>>>>> origin/wip-cite
`((bold ,@standard-set)
+ (citation citation-reference)
+ (citation-reference ,@(cons 'line-break minimal-set))
(footnote-reference ,@standard-set)
(headline ,@standard-set-no-line-break)
(inlinetask ,@standard-set-no-line-break)
@@@ -4516,21 -4610,21 +4700,39 @@@ to an appropriate container (e.g., a pa
(and (memq 'latex-fragment restriction)
(org-element-latex-fragment-parser)))))
(?\[
++<<<<<<< HEAD
+ (pcase (aref result 1)
+ ((and ?\[
+ (guard (memq 'link restriction)))
+ (org-element-link-parser))
+ ((and ?f
+ (guard (memq 'footnote-reference restriction)))
+ (org-element-footnote-reference-parser))
+ ((and (or ?% ?/)
+ (guard (memq 'statistics-cookie restriction)))
+ (org-element-statistics-cookie-parser))
+ (_
+ (or (and (memq 'timestamp restriction)
+ (org-element-timestamp-parser))
+ (and (memq 'statistics-cookie restriction)
+ (org-element-statistics-cookie-parser))))))
++=======
+ (cl-case (aref result 1)
+ (?\[ (and (memq 'link restriction)
+ (org-element-link-parser)))
+ ((?@ ?c ?\() (and (memq 'citation restriction)
+ (org-element-citation-parser)))
+ (?f (and (memq 'footnote-reference restriction)
+ (org-element-footnote-reference-parser)))
+ ((?% ?/) (and (memq 'statistics-cookie restriction)
+ (org-element-statistics-cookie-parser)))
+ (t (or (and (memq 'footnote-reference restriction)
+ (org-element-footnote-reference-parser))
+ (and (memq 'timestamp restriction)
+ (org-element-timestamp-parser))
+ (and (memq 'statistics-cookie restriction)
+ (org-element-statistics-cookie-parser))))))
++>>>>>>> origin/wip-cite
;; This is probably a plain link.
(_ (and (memq 'link restriction)
(org-element-link-parser)))))))
next reply other threads:[~2021-04-08 14:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 13:50 Ramesh Nedunchezian [this message]
2021-04-08 15:07 ` Does wip-cite work with master or 9.4.5 release? Nicolas Goaziou
2021-04-09 10:42 ` Ramesh Nedunchezian
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=TY2PR0101MB3693EB9943AF6D91EFBA34DBDA749@TY2PR0101MB3693.apcprd01.prod.exchangelabs.com \
--to=rameshnedunchezian@outlook.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.