From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aM3qJfINb2As6gAAgWs5BA (envelope-from ) for ; Thu, 08 Apr 2021 16:06:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WDjNH/INb2DwWwAAB5/wlQ (envelope-from ) for ; Thu, 08 Apr 2021 14:06:42 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B7528C0E1 for ; Thu, 8 Apr 2021 16:06:41 +0200 (CEST) Received: from localhost ([::1]:60330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUVIu-0002cE-6m for larch@yhetil.org; Thu, 08 Apr 2021 10:06:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUVIK-0002bt-Ih for emacs-orgmode@gnu.org; Thu, 08 Apr 2021 10:06:04 -0400 Received: from mail-oln040092255088.outbound.protection.outlook.com ([40.92.255.88]:61632 helo=APC01-HK2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUVI5-0000kY-Kd for emacs-orgmode@gnu.org; Thu, 08 Apr 2021 10:06:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DxWUb2nHcP+SJuiDGMD3RfYnTQ5X7nmSL4EKgj1pth7hGgfskIqbZeN7NjOWlouuY8fjrL0wEbaP2subSgVojx7qXHUYz+OiriqRxz1C4iOs3OiPx9CqZFBkfm1cRq/mitWe+nn0KDTeJFLLpZhVMTTT1PMjfsnheVSCzPAf5FN2vHyodPnmRvW1cUdEoh7kZe0EQYl10SRxJWIXFZJME2555zOLknA1eFNFOCu+N5X8YLzeNZn18ssdjlqXY3Oj0gpKAdwMJft0LAiGJbV2Oeaga0DWQN7CHXGwluWg4IxfySptcyPTJa9PAjT7aopQ5TKQb9nHLtoau6RG0WMoZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZhnDt9PorqFACxp4k76Bo6ypYZGPmKnHeWLzm2YOnrM=; b=PuP5aDlzVycwrgb0vahKVbJcy+Cmz7c3gm3aJ2qRaDZs2N9ZVWp+pvurc3LompAw2tXZTynEcUMKpTV/x7ROmVWKYI7h4e3izECVOo26sh4q83QPXaU7hZ6UtsptG36UfpQauYYd6wyqCG3EMwYFgKv/rxrWQevVbxq5qtEjhMmYD5mvlSba9BT7FMlWzThtcWImMsUhZGnslT5oKpbQ2XrjUYaiiHoE/sIljucNB5Wmo353cMuIxhbkz6+jKnBxGADyGJhxvnRcvJBvkKe+Ed32KG2lWhgOt7h0EjaRZgmORphEmqK1O3A48cd6LFVedfs5g/QAQ1slV8dJdM179g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZhnDt9PorqFACxp4k76Bo6ypYZGPmKnHeWLzm2YOnrM=; b=sbMosJhxSkZ4ADbQEmecrf0HaH7YwTZqkfu9yn+DPj9Q80Z99QP2PUfnS3/RooFtlnHr1N3LfWPG04zGor1PQfjMaCmbD/w4DlzZY8wuvuonA7eJLuK8QqqXzhW+4ujQtnT0hFIAKv4kY+0kyO/tEBmHq/B4OwpbXzas5QbrMuM5DfuinMpOHkWT3RolljlsqMLHgr9J0Ho2/A2HYib3b+WwGi8mqsaS1HfyfwHlCq8CBHvaadKoARNwMiVJb8h8P0nwAHHvRn1CxY2sFGaDF2N4y3EWkosYLnavH/Ljvr4lHvY++PElWFKBIyII0LUW4Chu/RJnt6fkKPpG5IIZ8w== Received: from TY2PR0101MB3693.apcprd01.prod.exchangelabs.com (2603:1096:404:800f::16) by TYZPR01MB3823.apcprd01.prod.exchangelabs.com (2603:1096:400:31::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Thu, 8 Apr 2021 13:50:29 +0000 Received: from TY2PR0101MB3693.apcprd01.prod.exchangelabs.com ([fe80::4980:4d7f:474b:de2c]) by TY2PR0101MB3693.apcprd01.prod.exchangelabs.com ([fe80::4980:4d7f:474b:de2c%3]) with mapi id 15.20.4020.018; Thu, 8 Apr 2021 13:50:29 +0000 To: emacs-orgmode@gnu.org From: Ramesh Nedunchezian Subject: Does wip-cite work with master or 9.4.5 release? Message-ID: Date: Thu, 8 Apr 2021 19:20:22 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 Content-Type: multipart/mixed; boundary="------------D4CBD4D2012DEFDF31C055B4" Content-Language: en-US X-TMN: [A5MTssJ9R366Kq6CwC6397Np6DSyS5OpepbmTMK1HWAlaW/ng9YKzGIcp+8Dvxxd] X-ClientProxiedBy: MAXPR0101CA0022.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::32) To TY2PR0101MB3693.apcprd01.prod.exchangelabs.com (2603:1096:404:800f::16) X-Microsoft-Original-Message-ID: <37c090e9-a9ce-63e8-dcb3-e51973abb1e8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2401:4900:376b:d655:ffbc:f1a:c3b:754c] (2401:4900:376b:d655:ffbc:f1a:c3b:754c) by MAXPR0101CA0022.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 8 Apr 2021 13:50:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 829a9918-f528-421e-c11d-08d8fa9544a8 X-MS-TrafficTypeDiagnostic: TYZPR01MB3823: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aAlLwoR4caqsVNv3Qxnr36qw1ckbI3YmvwE8RdyNnFPIe5pxCdWGejF6qMb8JeJTdQgF9IcoLE9mAwtQ3/2mqOtvpDOiCS/4o3RveQ6ql548cXgqQufmXaZUTj+RM6zk3cv8npCLZ3S/VjoOw3iAfHJ4wZ1ADVKSI4U3ZVwsrhd16YXVEK2sNF59ozMqVA3Zpbtfyl+2VCbSsbqvbHxUEMCDRwwS70uJO7tfFNfguNnuZdU8dk5qSCSIKm/y0h1Rshpj9dWz42tP1LKgEA68+Y99VvtqL5nC/xD1cL0/b1hxkYE+WqkqYxHk2ZaU8GxO7DduyrJhiPmG1/zPWfUkD8m2Rh1dWuiCS3awR4E/deqJEHiFEQPNtzcmqohsvrpV6iIOZFXd0o1XZUU/XU7pQw== X-MS-Exchange-AntiSpam-MessageData: 4HR9Cp1h4HnJKFYmG4EX2kcpJMTOwAvdv+vq4bfNlhZ4JO8rCM/be33YcTE4pfqsbOxYtdwsVdl6qbJprjCqJh1UAxVK4EUH8SuHug8xwz0h10ARHT8qG7pZJK2A8gNb21yoxaknqjHhGJ453DJS6CW8Y2Tl6mxPIfEUtqv2TOL7GcJUBBEjuBBurs5Ctpbe4quLfvSWUtZBQ/PamkNKLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 829a9918-f528-421e-c11d-08d8fa9544a8 X-MS-Exchange-CrossTenant-AuthSource: TY2PR0101MB3693.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 13:50:29.2928 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR01MB3823 Received-SPF: pass client-ip=40.92.255.88; envelope-from=rameshnedunchezian@outlook.com; helo=APC01-HK2-obe.outbound.protection.outlook.com X-Spam_score_int: 21 X-Spam_score: 2.1 X-Spam_bar: ++ X-Spam_report: (2.1 / 5.0 requ) BAYES_20=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617890801; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZhnDt9PorqFACxp4k76Bo6ypYZGPmKnHeWLzm2YOnrM=; b=ZozKs/j68laRc7jPasPG7aiNzitezE8boqOvldGftj6S8im/JKVrStMU6dz9Kyoyh86zy+ zG4Q0+nsOrFG2kV3M297hhz3QncgvsVqxArqSaVzKRsn9m1X7Hi07khuwtX26zoTA2Jwbo 0lED3zL5X9J5vs/I6fC8qMUU3VrZrD7K2Qzz1xmr+JsyzF22Sz+B47beMK+B7+lBmUJFlx +KmuuVtOlvem5CLPC5itLVyo1LrN+nF9xVkWO5zu5oE3bE3ziiTtA1bGocsRp4KoBOymyr 4NPxCu1O/jm8d23v0Y1rAfncJ1oL+TJt9vXj/Wy9TWMteflqgcOZ9EijEP8phA== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1617890801; a=rsa-sha256; cv=pass; b=IXXhayxPJnMRwAY33cf5o2Nfjvo2TXSAu1iHgEpFVXsbvYE3B+nHqIfkGgCvDEWaamFKcJ iCO7POFOWfCtxTfCh2cvxXW3OE7hogQPXqIuQMnNp02R+IQmPbcanUqtn7eP4fpxsLbkOU /sqccFYdy2/0+m3hwe5ciP8s9InsgZ1xiXv+0a1YRjvUK2yC73lnzBJtkEtAgkpuZCWogC HoDjYICKJcCMJ8Tq7XHovy+c/mJqexxUhxHAUbiggKag3c1oOD3mXLnl1hyK+FJ5ZpzMGy yFpz0XcYHG0AJ9eGO/aYTzQlfDO1oENwjQL4qaH5rNnwZxgSYV+8S0VwIbpDVQ== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=outlook.com header.s=selector1 header.b=sbMosJhx; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=outlook.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -3.14 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=outlook.com header.s=selector1 header.b=sbMosJhx; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=outlook.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: B7528C0E1 X-Spam-Score: -3.14 X-Migadu-Scanner: scn0.migadu.com X-TUID: bWeRNWywLaSB --------------D4CBD4D2012DEFDF31C055B4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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? --------------D4CBD4D2012DEFDF31C055B4 Content-Type: text/x-patch; charset=UTF-8; name="conflict.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="conflict.diff" 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))))))) --------------D4CBD4D2012DEFDF31C055B4--