unofficial mirror of emacs-orgmode@gnu.org
 help / color / mirror / code / Atom feed
* Does wip-cite work with master or 9.4.5 release?
@ 2021-04-08 13:50 Ramesh Nedunchezian
  2021-04-08 15:07 ` Nicolas Goaziou
  0 siblings, 1 reply; 3+ messages in thread
From: Ramesh Nedunchezian @ 2021-04-08 13:50 UTC (permalink / raw)
  To: emacs-orgmode

[-- 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)))))))

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Does wip-cite work with master or 9.4.5 release?
  2021-04-08 13:50 Does wip-cite work with master or 9.4.5 release? Ramesh Nedunchezian
@ 2021-04-08 15:07 ` Nicolas Goaziou
  2021-04-09 10:42   ` Ramesh Nedunchezian
  0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Goaziou @ 2021-04-08 15:07 UTC (permalink / raw)
  To: Ramesh Nedunchezian; +Cc: emacs-orgmode

Hello,

Ramesh Nedunchezian <rameshnedunchezian@outlook.com> writes:

> Does wip-cite doesn't work with master or 9.4.5?  Am I doing something
> wrong?

Although most of it is still relevant, wip-cite branch is to be
considered as slightly outdated at the moment.

I have a local wip-cite-new that I did not take time to polish and push
yet.

Regards,
-- 
Nicolas Goaziou


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Does wip-cite work with master or 9.4.5 release?
  2021-04-08 15:07 ` Nicolas Goaziou
@ 2021-04-09 10:42   ` Ramesh Nedunchezian
  0 siblings, 0 replies; 3+ messages in thread
From: Ramesh Nedunchezian @ 2021-04-09 10:42 UTC (permalink / raw)
  To: emacs-orgmode



On 08/04/21 8:37 pm, Nicolas Goaziou wrote:
> Hello,
> 
> Ramesh Nedunchezian <rameshnedunchezian@outlook.com> writes:
> 
>> Does wip-cite doesn't work with master or 9.4.5?  Am I doing something
>> wrong?
> 
> Although most of it is still relevant, wip-cite branch is to be
> considered as slightly outdated at the moment.
> 
> I have a local wip-cite-new that I did not take time to polish and push
> yet.
>

wip-cite-new merges cleanly with both the master and release_9.4.5
branch.  It also compiles fine.

    git reset --hard  release_9.4.5
    git merge origin/wip-cite-new

I am hoping that it is usable ... 



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-04-09 10:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 13:50 Does wip-cite work with master or 9.4.5 release? Ramesh Nedunchezian
2021-04-08 15:07 ` Nicolas Goaziou
2021-04-09 10:42   ` Ramesh Nedunchezian

unofficial mirror of emacs-orgmode@gnu.org

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/orgmode/0 orgmode/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 orgmode orgmode/ https://yhetil.org/orgmode \
		emacs-orgmode@gnu.org
	public-inbox-index orgmode

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.emacs.orgmode
	nntp://news.gmane.io/gmane.emacs.orgmode


code repositories for project(s) associated with this inbox:

	orgmode.git.git (no URL configured)

AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git