From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iB2FL3zFc2MrvAAAbAwnHQ (envelope-from ) for ; Tue, 15 Nov 2022 17:59:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MN2lLnzFc2OeRQEAG6o9tA (envelope-from ) for ; Tue, 15 Nov 2022 17:59:40 +0100 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 65812BAD2 for ; Tue, 15 Nov 2022 17:59:40 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouzH0-0003G6-GK; Tue, 15 Nov 2022 11:58:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouzGz-0003Fh-6A for emacs-orgmode@gnu.org; Tue, 15 Nov 2022 11:58:57 -0500 Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouzGx-0005cq-Pr for emacs-orgmode@gnu.org; Tue, 15 Nov 2022 11:58:56 -0500 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1ouzGv-0004Ts-QK for emacs-orgmode@gnu.org; Tue, 15 Nov 2022 17:58:53 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: Re: [OT] org and diff Date: Tue, 15 Nov 2022 23:58:44 +0700 Message-ID: References: <87zgcv773a.fsf@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US In-Reply-To: Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 26 X-Spam_score: 2.6 X-Spam_bar: ++ X-Spam_report: (2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=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.29 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668531580; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CjkoL2pK91pKCfkT3NtnfaKBDI0Ri/WTyo1Nt8aZXkk=; b=vATBVxwunKZdmfEd9U64LlP3wrcDOne+9OurLDCvifF4paq5QUFWZdnuXgjFEOZyqAB86E hlf33JYRe6jVRm8k9EOsJ8OSDZxuFp/cnu57hjI4Ccfy7DpB4rb/Q62UMvKM8Ciz57WbyE 5WQg6xYHtSoUBCnjtiA83UEnATK/ygJyAQ6ycFhSyjwicjJ4WlnDq73rJgeIGTJl7+K+1i hbVp+iKt3W4F5cXqMfFJ+781qoMzjProxYpiVT+NTg4Wpar1yiJLSAC7dsl9aHkcln9VAh cx2T83SyJBcadyeVg/WxaTlTlitNGqRMJftW0L+a/HT6AWws39XT4y2vJreSSg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668531580; a=rsa-sha256; cv=none; b=t6kZA7z1/hXjVZczUs7YMFaSqCBjiKzGxVFepuB9gEq90AKZp1rZOiUe7K6eWShGfCSeQZ OMBkFl9ONupNYFcK7VGcjV4s0/Zkejmp64jwIbipoNGD5VGbKBqUz91PrgGvj9BzEubaqi DRK1eRwHOMrjCKpfssuIk8Jfs8N+G26M9i+Qg/8qThZ6h+/xAnHacFl8AdCWnDA5w7XE/f 4XV2UiDCOUwBaduNCYgTiNal18TTPiNqCYx3SgukJzcaZxSimVgVHYJwp0rV+xgsezylX3 I4o3801CSB/9moeMQOlrKoX7wbbLq2ky/lqgL1daC8KYUiDv72gyzAWo05fCGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.66 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 65812BAD2 X-Spam-Score: 2.66 X-Migadu-Scanner: scn1.migadu.com X-TUID: rmP+tfcRd9Yl On 13/11/2022 13:06, Samuel Wales wrote: > On 11/12/22, Ihor Radchenko wrote: >> I have the following in my ~/.gitconfig: >> >> [diff "org"] >> xfuncname = "^(\\*+ +.*)$" Thank you for sharing this. I was sure it should be possible, but I was not motivated enough to configure hunk headers for elisp and org. It seems even a shorter regexp works well xfuncname = "^\\*+ .*" >> [core] >> attributesfile = /home/yantar92/.gitattributes Git may find ~/.config/git/attributes without explicit configuration > this looks interesting. i thought this stuff was just for configuring > the helper text on the hunk headers that tell you what function the > hunk is in, kind of thing. I am unsure that it affects diff as well. Once I have experienced noisy diff on attempt to refile a subtree. Finally I did it by moving headings by small portions. It allowed to confirm changes during each steps. >> Source: https://protesilaos.com/codelog/2021-01-26-git-diff-hunk-elisp-org/ > > idk why but this page is blank for me. then if i try to disable > noscript restrictions, noscript says "This is a privileged page, whose > permissions cannot be configured". Perhaps you were unlucky to fetch the page during server maintenance. Firefox-106 renders the page with active NoScript. The approach is documented in the "Defining a custom hunk-header" section of gitattributes(5). The value of the page is that it has a recipe for elisp (indented `cl-defstruct' is not handled though).