From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 26 Oct 2024 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 74027@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172992855623478 (code B ref -1); Sat, 26 Oct 2024 07:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Oct 2024 07:42:36 +0000 Received: from localhost ([127.0.0.1]:40465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4bRU-00066c-4Z for submit@debbugs.gnu.org; Sat, 26 Oct 2024 03:42:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:33496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4bRS-00066S-6V for submit@debbugs.gnu.org; Sat, 26 Oct 2024 03:42:34 -0400 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 1t4bQu-0008An-QB for bug-gnu-emacs@gnu.org; Sat, 26 Oct 2024 03:42:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4bQt-0006EW-2T for bug-gnu-emacs@gnu.org; Sat, 26 Oct 2024 03:42:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6CB57240027 for ; Sat, 26 Oct 2024 09:41:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729928515; bh=kIT7Uz1jd1b0aSa8KWIQJ+ZGrdUrwDCD8DWaOoq46fs=; h=From:To:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=f87gTju5LjZN1hDdkGZ+3YGX1JqX6OvlPaoocC7uD0dctq+uQX4UMcf1DqPeB2CG6 RQ8g63SeECiyCT/SJxQc1OwZIsdRTgFjnfp91c8rBBikwKVp0smLv9piz+NCKOEKvT F7I6SRgyPPBXVRGDwXv9rc1bJBMlpUOziGqM969els7mNkpgRensKE9EfHO+xoy8Fv 181ZtGg56YVxLSRZZQRNR6z2lfBzJ1AmlMYXf4T9tRYxlheqjUqpWsDAXMrE8phukk JgPeA5FKdvVYsO1YYRGNNs5opGiN5/Ch9EZLcCDNwCKl2nFRViDgFZYXRcRPwour1n iXn8JlPA/FTNg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XbBS23sKHz9rxL for ; Sat, 26 Oct 2024 09:41:54 +0200 (CEST) From: Philip Kaludercic Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Date: Sat, 26 Oct 2024 07:41:49 +0000 Message-ID: <87ed43e2f6.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain It appears "vc-steal-lock" is not compatible with automatic signatures, as the "I stole the lock on ..." is inserted at the end of the message, which can appear behind the signature. This should fix it: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Insert--Stealing-lock--at-the-beginning-of-a-mes.patch Content-Description: [PATCH] ; Insert "Stealing lock" at the beginning of a message >From b5539a1924bbcbb1ee68fcbb21310856fcd437a9 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sat, 26 Oct 2024 09:39:00 +0200 Subject: [PATCH] ; Insert "Stealing lock" at the beginning of a message * lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of jumping to 'point-max', to avoid inserting the message after signatures. --- lisp/vc/vc.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index a30ba06aec3..0d72b169e41 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1661,6 +1661,7 @@ vc-mark-resolved (format "%d files" (length files)) "this file")))) +(declare-function mail-text "sendmail" ()) (defun vc-steal-lock (file rev owner) "Steal the lock on FILE." (let (file-description) @@ -1681,7 +1682,7 @@ vc-steal-lock ;; goes wrong, we don't want to send any mail. (compose-mail owner (format "Stolen lock on %s" file-description)) (setq default-directory (expand-file-name "~/")) - (goto-char (point-max)) + (mail-text) (insert (format "I stole the lock on %s, " file-description) (current-time-string) -- 2.45.2 --=-=-= Content-Type: text/plain -- Philip Kaludercic on siskin --=-=-=-- From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Nov 2024 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Philip Kaludercic Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.173054687429791 (code B ref 74027); Sat, 02 Nov 2024 11:28:02 +0000 Received: (at 74027) by debbugs.gnu.org; 2 Nov 2024 11:27:54 +0000 Received: from localhost ([127.0.0.1]:53313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7CIL-0007kR-G6 for submit@debbugs.gnu.org; Sat, 02 Nov 2024 07:27:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7CII-0007kJ-RY for 74027@debbugs.gnu.org; Sat, 02 Nov 2024 07:27:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t7CID-0001Sf-0e; Sat, 02 Nov 2024 07:27:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=3XZZSt++WS2De60tPfViTPBdnMHy64eBJygmoSqh8c8=; b=APzlHVzhAOv1 IyF/+4r925+BzIEpNhKAo1zL6OKuGjfYTMdI5gZODUD5PxQKiXeAhCqMP84NoT7Zc4M8TcbQjkaJT orWftng8JLLwt6SDoA+YZ/WJqxD4K5V2lW9S46n6BDIg4oxvk4KxpIScC97CguEcCfJRdFz1JFsKX 7j3Y65UsZ6F8qBaOhqtlhlCARP9NWxLo59WT4NkK8DMm1j2rqpKQx9+s2MqtLw2naalBNpoYwb9+K MQvO/sq9apaGasxPPvcW6UyuROblAXK5/XJAt6TCaO1Uo3By9YHQqU5cCeYytLdAMc0GrUGF2hLzp hHGpPZctPkoiTuX16Ag/Lw==; Date: Sat, 02 Nov 2024 13:27:42 +0200 Message-Id: <86bjyxzxht.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <87ed43e2f6.fsf@posteo.net> (message from Philip Kaludercic on Sat, 26 Oct 2024 07:41:49 +0000) References: <87ed43e2f6.fsf@posteo.net> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Philip Kaludercic > Date: Sat, 26 Oct 2024 07:41:49 +0000 > > It appears "vc-steal-lock" is not compatible with automatic signatures, > as the "I stole the lock on ..." is inserted at the end of the message, > which can appear behind the signature. This should fix it: > > >From b5539a1924bbcbb1ee68fcbb21310856fcd437a9 Mon Sep 17 00:00:00 2001 > From: Philip Kaludercic > Date: Sat, 26 Oct 2024 09:39:00 +0200 > Subject: [PATCH] ; Insert "Stealing lock" at the beginning of a message > > * lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of > jumping to 'point-max', to avoid inserting the message after > signatures. > --- > lisp/vc/vc.el | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el > index a30ba06aec3..0d72b169e41 100644 > --- a/lisp/vc/vc.el > +++ b/lisp/vc/vc.el > @@ -1661,6 +1661,7 @@ vc-mark-resolved > (format "%d files" (length files)) > "this file")))) > > +(declare-function mail-text "sendmail" ()) > (defun vc-steal-lock (file rev owner) > "Steal the lock on FILE." > (let (file-description) > @@ -1681,7 +1682,7 @@ vc-steal-lock > ;; goes wrong, we don't want to send any mail. > (compose-mail owner (format "Stolen lock on %s" file-description)) > (setq default-directory (expand-file-name "~/")) > - (goto-char (point-max)) > + (mail-text) I guess you are using sendmail.el as your mail-user-agent? But the default is message.el, so I think we should either use message-goto-body here, or perhaps dispatch to either to message.el or sendmail.el based on the value of mail-user-agent. From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2024 14:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.17310753691598 (code B ref 74027); Fri, 08 Nov 2024 14:17:02 +0000 Received: (at 74027) by debbugs.gnu.org; 8 Nov 2024 14:16:09 +0000 Received: from localhost ([127.0.0.1]:51629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9PmT-0000Pf-9X for submit@debbugs.gnu.org; Fri, 08 Nov 2024 09:16:09 -0500 Received: from mout02.posteo.de ([185.67.36.66]:44343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9PmO-0000Ov-Ek for 74027@debbugs.gnu.org; Fri, 08 Nov 2024 09:16:08 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6526E240108 for <74027@debbugs.gnu.org>; Fri, 8 Nov 2024 15:15:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1731075358; bh=DG8rlg2ivouwlVEOkRpJ48ckTfbCALqKdhn2Xyr+1V0=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=OKbiCednJ4JF9+0Ha9Xakt25XQ6SWK0MnD37Ol7wU/G7V9cNunRTeiKKh7yFr91Iv tceT+m/Xvsqz2u+0D94DmX2msAZKvFa4hj40MZMxZj0JR1MKvLdzKN65Oopegr2cbM h6DK9e2ONDG4mAIGOo1NoleHcQmCfWdg0F5Yb+JrbdcalSoXi+3qHThNc7DklTU5R+ An5ERcU2OmF+/b6qhmxG9s8fvgUh8XhZfjH2DM990MTPCqNxdnSbO5E1qQh5VkB0+W FDJCuPkg6Kc+vluA/Kc7Bu6DXYbODHSLPSGVwJW4n+8jAUoKH9hkCacqOd5OphP+X1 E1tdBkVAQCncA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XlLZg06K9z9rxF; Fri, 8 Nov 2024 15:15:54 +0100 (CET) From: Philip Kaludercic In-Reply-To: <86bjyxzxht.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 02 Nov 2024 13:27:42 +0200") References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Date: Fri, 08 Nov 2024 14:15:53 +0000 Message-ID: <87iksxhkva.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Eli Zaretskii writes: >> From: Philip Kaludercic >> Date: Sat, 26 Oct 2024 07:41:49 +0000 >> >> It appears "vc-steal-lock" is not compatible with automatic signatures, >> as the "I stole the lock on ..." is inserted at the end of the message, >> which can appear behind the signature. This should fix it: >> >> >From b5539a1924bbcbb1ee68fcbb21310856fcd437a9 Mon Sep 17 00:00:00 2001 >> From: Philip Kaludercic >> Date: Sat, 26 Oct 2024 09:39:00 +0200 >> Subject: [PATCH] ; Insert "Stealing lock" at the beginning of a message >> >> * lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of >> jumping to 'point-max', to avoid inserting the message after >> signatures. >> --- >> lisp/vc/vc.el | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el >> index a30ba06aec3..0d72b169e41 100644 >> --- a/lisp/vc/vc.el >> +++ b/lisp/vc/vc.el >> @@ -1661,6 +1661,7 @@ vc-mark-resolved >> (format "%d files" (length files)) >> "this file")))) >> >> +(declare-function mail-text "sendmail" ()) >> (defun vc-steal-lock (file rev owner) >> "Steal the lock on FILE." >> (let (file-description) >> @@ -1681,7 +1682,7 @@ vc-steal-lock >> ;; goes wrong, we don't want to send any mail. >> (compose-mail owner (format "Stolen lock on %s" file-description)) >> (setq default-directory (expand-file-name "~/")) >> - (goto-char (point-max)) >> + (mail-text) > > I guess you are using sendmail.el as your mail-user-agent? But the > default is message.el, so I think we should either use > message-goto-body here, Ok, I falsely assumed that using 'mail-text' would be more compatible. > > or perhaps dispatch to either to message.el or > sendmail.el based on the value of mail-user-agent. So a `cond' expression checking mail-user-agent and then invoking the right function, or is there some more generic way to do that? -- Philip Kaludercic on siskin From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2024 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Philip Kaludercic Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.173107950214105 (code B ref 74027); Fri, 08 Nov 2024 15:26:02 +0000 Received: (at 74027) by debbugs.gnu.org; 8 Nov 2024 15:25:02 +0000 Received: from localhost ([127.0.0.1]:51716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Qr7-0003fH-MH for submit@debbugs.gnu.org; Fri, 08 Nov 2024 10:25:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Qr2-0003ep-Vz for 74027@debbugs.gnu.org; Fri, 08 Nov 2024 10:25:00 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9Qoo-0002Tt-4Q; Fri, 08 Nov 2024 10:22:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=+UC2QmK/KiXd6NXp/GEA4yRkbKbY8arrmRaRrHBn9d0=; b=hB0JgsiK7eEn AHJP484U8MxHw50vyDsK2g0jI2sMfyvybRPTjm/64+3+wSS46X/QzXSmxO+G+SZ+/R6K28uv/gqB7 /I/+KbSRe3hbhUMdA6ZnIWPnNyiXB/fkhe8hWMyLopmfWbe3Wt77HnH5o0IaSvfLG4DXb3Re8I2lZ XfaCJ6VVuL6xzIGgVb02A3os4LgO//iEDttaH+2cIEKq3qn+WJtirhisblV3UWIXSBk14JZ+vsxav LVvEfPAW+Efs3zeVP9x+g9N4FxLAfPJdhWuwGwydEQq8BLIzBQZGosFbdP+31P9PjCWTtbZQBi425 0zoB7PSia/iHA2Qi9dkJRw==; Date: Fri, 08 Nov 2024 17:22:36 +0200 Message-Id: <86ttchoimb.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <87iksxhkva.fsf@posteo.net> (message from Philip Kaludercic on Fri, 08 Nov 2024 14:15:53 +0000) References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> <87iksxhkva.fsf@posteo.net> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Philip Kaludercic > Cc: 74027@debbugs.gnu.org > Date: Fri, 08 Nov 2024 14:15:53 +0000 > > Eli Zaretskii writes: > > >> - (goto-char (point-max)) > >> + (mail-text) > > > > I guess you are using sendmail.el as your mail-user-agent? But the > > default is message.el, so I think we should either use > > message-goto-body here, > > Ok, I falsely assumed that using 'mail-text' would be more compatible. > > > > > or perhaps dispatch to either to message.el or > > sendmail.el based on the value of mail-user-agent. > > So a `cond' expression checking mail-user-agent and then invoking the > right function, or is there some more generic way to do that? The former, I think. From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2024 15:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.173107961214661 (code B ref 74027); Fri, 08 Nov 2024 15:27:03 +0000 Received: (at 74027) by debbugs.gnu.org; 8 Nov 2024 15:26:52 +0000 Received: from localhost ([127.0.0.1]:51735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Qst-0003oO-MR for submit@debbugs.gnu.org; Fri, 08 Nov 2024 10:26:52 -0500 Received: from mout01.posteo.de ([185.67.36.65]:54135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Qsr-0003ny-Ey for 74027@debbugs.gnu.org; Fri, 08 Nov 2024 10:26:50 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 089E7240027 for <74027@debbugs.gnu.org>; Fri, 8 Nov 2024 16:26:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1731079603; bh=2ujJH27REl3pi21dPh7vC1YwmYGvGrP4rfZxzze2fCM=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=o1X13dilyKFEecRHdmi6QyR6IS/nT6mOCh5YxCvpb65/JrjKFM2XfDjznWlQCPs2W MUtq238VVPiaoA5HwRMQTEds0OeDN+BGAJD/vFCLaiiBOuoQDQK4ts7FzpQA2NpVNY oYnMpEmIHl+tX8zj1gAFM2VO41aLHHdeekJcdZJwxx7c9IR9OsBuuY9Lc1VmJsMMfA uLwy5xovHU7AI+/JHulPn73d582B5ykAzXmqWzOVmQ6SaLpOwwPjxupb7YePNC3OY7 t0LpfwUG5yL/6/J08+2NqKI01Na/bB7BPfRVKMMXT1yJn7OXiPsRCiW9huJW35C0/0 VPT2s51kwkc8Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XlN8L0MDTz6tvm; Fri, 8 Nov 2024 16:26:41 +0100 (CET) From: Philip Kaludercic In-Reply-To: <86ttchoimb.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 08 Nov 2024 17:22:36 +0200") References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> <87iksxhkva.fsf@posteo.net> <86ttchoimb.fsf@gnu.org> Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Date: Fri, 08 Nov 2024 15:26:40 +0000 Message-ID: <871pzlpwzz.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: 74027@debbugs.gnu.org >> Date: Fri, 08 Nov 2024 14:15:53 +0000 >> >> Eli Zaretskii writes: >> >> >> - (goto-char (point-max)) >> >> + (mail-text) >> > >> > I guess you are using sendmail.el as your mail-user-agent? But the >> > default is message.el, so I think we should either use >> > message-goto-body here, >> >> Ok, I falsely assumed that using 'mail-text' would be more compatible. >> >> > >> > or perhaps dispatch to either to message.el or >> > sendmail.el based on the value of mail-user-agent. >> >> So a `cond' expression checking mail-user-agent and then invoking the >> right function, or is there some more generic way to do that? > > The former, I think. In that case it seems better/simpler to just use 'message-goto-body'. -- Philip Kaludercic on siskin From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2024 15:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Philip Kaludercic Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.173108101418779 (code B ref 74027); Fri, 08 Nov 2024 15:51:01 +0000 Received: (at 74027) by debbugs.gnu.org; 8 Nov 2024 15:50:14 +0000 Received: from localhost ([127.0.0.1]:51780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9RFV-0004sp-Tp for submit@debbugs.gnu.org; Fri, 08 Nov 2024 10:50:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9RFT-0004oO-Mv for 74027@debbugs.gnu.org; Fri, 08 Nov 2024 10:50:12 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9RFN-0006yb-GZ; Fri, 08 Nov 2024 10:50:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=vP1lFHt8w2sUES9xRnaplYxOmphbrUCyxdraxS4WXGI=; b=OvanNJYebybe h9SiSb7AQA2zObIQoMBCoFpaYEZURREACkTZ+80VbevA2/poFHu9LDNTEGOJ2ZVlTxsdoamlxgRLg pdCUPZYn3VUKpus35nQJdHrLT4hEv4C/wFVq7BhDXmfL1o2lg+/WiS90gJ5TDarLAtkFTwfIkKv7f QPBL7Ub3sb4f5Qr8SLxqyqN4LOk5SVRZEzff5EOKQ+sDXtHWWeMAaFeUMPUJIEw9KLrIPUHdiOtEJ MbH0bcwQWyYZWvBf5OkjygoL3HokuViqbOdmGcnj/uARb60aVore7KtjcGPqP2bUtn5mr7uRRlB6Y TNl8KkYp+KP9GvIjFjxfng==; Date: Fri, 08 Nov 2024 17:50:02 +0200 Message-Id: <86pln5ohcl.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <871pzlpwzz.fsf@posteo.net> (message from Philip Kaludercic on Fri, 08 Nov 2024 15:26:40 +0000) References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> <87iksxhkva.fsf@posteo.net> <86ttchoimb.fsf@gnu.org> <871pzlpwzz.fsf@posteo.net> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Philip Kaludercic > Cc: 74027@debbugs.gnu.org > Date: Fri, 08 Nov 2024 15:26:40 +0000 > > Eli Zaretskii writes: > > >> From: Philip Kaludercic > >> Cc: 74027@debbugs.gnu.org > >> Date: Fri, 08 Nov 2024 14:15:53 +0000 > >> > >> Eli Zaretskii writes: > >> > >> >> - (goto-char (point-max)) > >> >> + (mail-text) > >> > > >> > I guess you are using sendmail.el as your mail-user-agent? But the > >> > default is message.el, so I think we should either use > >> > message-goto-body here, > >> > >> Ok, I falsely assumed that using 'mail-text' would be more compatible. > >> > >> > > >> > or perhaps dispatch to either to message.el or > >> > sendmail.el based on the value of mail-user-agent. > >> > >> So a `cond' expression checking mail-user-agent and then invoking the > >> right function, or is there some more generic way to do that? > > > > The former, I think. > > In that case it seems better/simpler to just use 'message-goto-body'. I'm not sure. I use sendmail, and I don't really like the idea of having message.el loaded into my sessions. It shouldn't be hard to dispatch, is it? From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2024 16:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.173108223522232 (code B ref 74027); Fri, 08 Nov 2024 16:11:01 +0000 Received: (at 74027) by debbugs.gnu.org; 8 Nov 2024 16:10:35 +0000 Received: from localhost ([127.0.0.1]:51813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9RZC-0005mW-Ng for submit@debbugs.gnu.org; Fri, 08 Nov 2024 11:10:35 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9RZ9-0005mH-W2 for 74027@debbugs.gnu.org; Fri, 08 Nov 2024 11:10:33 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C05B1240101 for <74027@debbugs.gnu.org>; Fri, 8 Nov 2024 17:10:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1731082225; bh=zjzt9oUBNrcDjv21OAdeFmDpLCsiP/qnI/sKSDWNBic=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=USneoO9w0XEF9UypyrUJa1ZgvyYQT4yRpKrnrnqiUxubKge2Ck1UxLDapNzlR1RVB HsINnrqU38ahvb/x6f556dxl6N7zABFsGSBekphEoollDyQhzpeGHWNmJTIJqsVDSn aIz1oabgpUCG78wn78Qyz8pHcvLJV/H2aXbfWDyEpUUgCJp/nSCih/oRBb9tlncwVN FWSzEBf4m4+yM2Ux3THjod99bLEX47ET9eNhZwzuHJWUWLPWIWit/lyz8KW4j8wj8B LJMHoBetYIGim2Y0Ep4Kox3ZlPGn/2Nu8qUBGKZam0dxe4FQLtjYZn3a2h8z1HepGW S0J7Yg3Lpzotw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XlP6m3F4bz6txW; Fri, 8 Nov 2024 17:10:24 +0100 (CET) From: Philip Kaludercic In-Reply-To: <86pln5ohcl.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 08 Nov 2024 17:50:02 +0200") References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> <87iksxhkva.fsf@posteo.net> <86ttchoimb.fsf@gnu.org> <871pzlpwzz.fsf@posteo.net> <86pln5ohcl.fsf@gnu.org> Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Date: Fri, 08 Nov 2024 16:10:22 +0000 Message-ID: <87r07logep.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: 74027@debbugs.gnu.org >> Date: Fri, 08 Nov 2024 15:26:40 +0000 >> >> Eli Zaretskii writes: >> >> >> From: Philip Kaludercic >> >> Cc: 74027@debbugs.gnu.org >> >> Date: Fri, 08 Nov 2024 14:15:53 +0000 >> >> >> >> Eli Zaretskii writes: >> >> >> >> >> - (goto-char (point-max)) >> >> >> + (mail-text) >> >> > >> >> > I guess you are using sendmail.el as your mail-user-agent? But the >> >> > default is message.el, so I think we should either use >> >> > message-goto-body here, >> >> >> >> Ok, I falsely assumed that using 'mail-text' would be more compatible. >> >> >> >> > >> >> > or perhaps dispatch to either to message.el or >> >> > sendmail.el based on the value of mail-user-agent. >> >> >> >> So a `cond' expression checking mail-user-agent and then invoking the >> >> right function, or is there some more generic way to do that? >> > >> > The former, I think. >> >> In that case it seems better/simpler to just use 'message-goto-body'. > > I'm not sure. I use sendmail, and I don't really like the idea of > having message.el loaded into my sessions. > > It shouldn't be hard to dispatch, is it? Technically no, just if we want to be exhaustive then I don't have a good overview of all clients. Or should we just fall-back onto message: --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Insert-Stealing-lock-at-the-beginning-of-a-message.patch >From 728f6e64b4c11099a0b70c748dbae2183e28f918 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sat, 26 Oct 2024 09:39:00 +0200 Subject: [PATCH] ; Insert "Stealing lock" at the beginning of a message * lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of jumping to 'point-max', to avoid inserting the message after signatures. --- lisp/vc/vc.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 194b181f3e9..dd6079d22ab 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1738,6 +1738,8 @@ vc-mark-resolved (format "%d files" (length files)) "this file")))) +(declare-function mail-text "sendmail" ()) +(declare-function message-goto-body "message" (&optional interactive)) (defun vc-steal-lock (file rev owner) "Steal the lock on FILE." (let (file-description) @@ -1758,7 +1760,10 @@ vc-steal-lock ;; goes wrong, we don't want to send any mail. (compose-mail owner (format "Stolen lock on %s" file-description)) (setq default-directory (expand-file-name "~/")) - (goto-char (point-max)) + (cond + ((eq mail-user-agent 'sendmail-user-agent) + (mail-text)) + ((message-goto-body))) (insert (format "I stole the lock on %s, " file-description) (current-time-string) -- 2.45.2 --=-=-= Content-Type: text/plain -- Philip Kaludercic on siskin --=-=-=-- From unknown Fri Sep 05 20:55:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2024 16:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74027 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Philip Kaludercic Cc: 74027@debbugs.gnu.org Received: via spool by 74027-submit@debbugs.gnu.org id=B74027.173108316924804 (code B ref 74027); Fri, 08 Nov 2024 16:27:02 +0000 Received: (at 74027) by debbugs.gnu.org; 8 Nov 2024 16:26:09 +0000 Received: from localhost ([127.0.0.1]:51830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9RoF-0006Ry-Ev for submit@debbugs.gnu.org; Fri, 08 Nov 2024 11:26:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9RoA-0006RR-Jn for 74027@debbugs.gnu.org; Fri, 08 Nov 2024 11:26:06 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9Ro4-0003c6-Qd; Fri, 08 Nov 2024 11:25:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=SpEOSQxdCNXWLR2iC4P5UccS3BpHDFd7ctg2960F6Tk=; b=FMziiOmc2/jt zzdAX5v6niNd3FnKYJ2X2PxhSxPlgjMcwLA3xf82jrh83TiFnvTuEP5dQz3w1xVeeZBq+WslkRoWi Qim8Eaq/R0lYb+Mir6zc3OB0wF3v5j2feP1TZzvLWrnLOpx++m298KxbI8pyuip0H70ve4wQInBe1 894cveSWpn+LxH+C22GGCK2MxluPayUyLW7hNDnBSLADlEwnoJ/p7ejxiTdmvK0gzVhmSUzFWzmpB OLHA+KsPRKKFKjgHIp3Rsnna9+5X6twjV2Izo8zbbb+ZIzpR2bkHk3q3Y9YC7caNGJovPVWoVI+SF MVK9ZmcOBXihFPfsREZJsw==; Date: Fri, 08 Nov 2024 18:25:17 +0200 Message-Id: <86msi9ofpu.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <87r07logep.fsf@posteo.net> (message from Philip Kaludercic on Fri, 08 Nov 2024 16:10:22 +0000) References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> <87iksxhkva.fsf@posteo.net> <86ttchoimb.fsf@gnu.org> <871pzlpwzz.fsf@posteo.net> <86pln5ohcl.fsf@gnu.org> <87r07logep.fsf@posteo.net> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Philip Kaludercic > Cc: 74027@debbugs.gnu.org > Date: Fri, 08 Nov 2024 16:10:22 +0000 > > >> In that case it seems better/simpler to just use 'message-goto-body'. > > > > I'm not sure. I use sendmail, and I don't really like the idea of > > having message.el loaded into my sessions. > > > > It shouldn't be hard to dispatch, is it? > > Technically no, just if we want to be exhaustive then I don't have a > good overview of all clients. Or should we just fall-back onto message: Yes, falling back to message should be okay, IMO. Thanks. From unknown Fri Sep 05 20:55:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Philip Kaludercic Subject: bug#74027: closed (Re: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message) Message-ID: References: <87iksxofgv.fsf@posteo.net> <87ed43e2f6.fsf@posteo.net> X-Gnu-PR-Message: they-closed 74027 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 74027@debbugs.gnu.org Date: Fri, 08 Nov 2024 16:31:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1731083462-25659-1" This is a multi-part message in MIME format... ------------=_1731083462-25659-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74027@debbugs.gnu.org. --=20 74027: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74027 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1731083462-25659-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74027-done) by debbugs.gnu.org; 8 Nov 2024 16:30:51 +0000 Received: from localhost ([127.0.0.1]:51840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Rsp-0006fU-A7 for submit@debbugs.gnu.org; Fri, 08 Nov 2024 11:30:51 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Rsm-0006fE-8X for 74027-done@debbugs.gnu.org; Fri, 08 Nov 2024 11:30:50 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 92822240101 for <74027-done@debbugs.gnu.org>; Fri, 8 Nov 2024 17:30:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1731083442; bh=3A18+vbVMwkldJA7R8t+EA4WPZPjmVX5JYTMsPpoqwo=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=Mk+06zw/LmQZuBetF0iy0CeIuGfuFQTmIasMIiIkO4QQ7p6Bl/rVLKkHblR0EwtsA 72iY4ViVa0NPUf+zyk+bEX9J18GiSCfrInTGxfCowYOG7IE7xgDQDVaAkYd2bVk7NO Yh5eanRGUHtrym8oEoXPvbxpS0ikGou7B0rDxdoaiMz8wbhPFBAjdKw7L2aFDZVVdl jkYKavilmwUToucLijUAVQvYd/CD715OBg1XMTKBdnzQuqOBsYMp3nmB4M8K38jF1L ImQ51QRsOorJH20kN/kDPZoXcxlthe8MEuuvOVNcrp08ALAOrRf1H2qOZ/Qsurh9zq /px/CLsqfqilQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XlPZ95GpNz9rxP; Fri, 8 Nov 2024 17:30:41 +0100 (CET) From: Philip Kaludercic To: Eli Zaretskii Subject: Re: bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message In-Reply-To: <86msi9ofpu.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 08 Nov 2024 18:25:17 +0200") References: <87ed43e2f6.fsf@posteo.net> <86bjyxzxht.fsf@gnu.org> <87iksxhkva.fsf@posteo.net> <86ttchoimb.fsf@gnu.org> <871pzlpwzz.fsf@posteo.net> <86pln5ohcl.fsf@gnu.org> <87r07logep.fsf@posteo.net> <86msi9ofpu.fsf@gnu.org> Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Date: Fri, 08 Nov 2024 16:30:40 +0000 Message-ID: <87iksxofgv.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74027-done Cc: 74027-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: 74027@debbugs.gnu.org >> Date: Fri, 08 Nov 2024 16:10:22 +0000 >> >> >> In that case it seems better/simpler to just use 'message-goto-body'. >> > >> > I'm not sure. I use sendmail, and I don't really like the idea of >> > having message.el loaded into my sessions. >> > >> > It shouldn't be hard to dispatch, is it? >> >> Technically no, just if we want to be exhaustive then I don't have a >> good overview of all clients. Or should we just fall-back onto message: > > Yes, falling back to message should be okay, IMO. > > Thanks. OK, I have pushed the change to master! Closing the report. -- Philip Kaludercic on siskin ------------=_1731083462-25659-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Oct 2024 07:42:36 +0000 Received: from localhost ([127.0.0.1]:40465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4bRU-00066c-4Z for submit@debbugs.gnu.org; Sat, 26 Oct 2024 03:42:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:33496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4bRS-00066S-6V for submit@debbugs.gnu.org; Sat, 26 Oct 2024 03:42:34 -0400 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 1t4bQu-0008An-QB for bug-gnu-emacs@gnu.org; Sat, 26 Oct 2024 03:42:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4bQt-0006EW-2T for bug-gnu-emacs@gnu.org; Sat, 26 Oct 2024 03:42:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6CB57240027 for ; Sat, 26 Oct 2024 09:41:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729928515; bh=kIT7Uz1jd1b0aSa8KWIQJ+ZGrdUrwDCD8DWaOoq46fs=; h=From:To:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=f87gTju5LjZN1hDdkGZ+3YGX1JqX6OvlPaoocC7uD0dctq+uQX4UMcf1DqPeB2CG6 RQ8g63SeECiyCT/SJxQc1OwZIsdRTgFjnfp91c8rBBikwKVp0smLv9piz+NCKOEKvT F7I6SRgyPPBXVRGDwXv9rc1bJBMlpUOziGqM969els7mNkpgRensKE9EfHO+xoy8Fv 181ZtGg56YVxLSRZZQRNR6z2lfBzJ1AmlMYXf4T9tRYxlheqjUqpWsDAXMrE8phukk JgPeA5FKdvVYsO1YYRGNNs5opGiN5/Ch9EZLcCDNwCKl2nFRViDgFZYXRcRPwour1n iXn8JlPA/FTNg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XbBS23sKHz9rxL for ; Sat, 26 Oct 2024 09:41:54 +0200 (CEST) From: Philip Kaludercic To: bug-gnu-emacs@gnu.org Subject: [PATCH] ; Insert "Stealing lock" at the beginning of a message Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Date: Sat, 26 Oct 2024 07:41:49 +0000 Message-ID: <87ed43e2f6.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain It appears "vc-steal-lock" is not compatible with automatic signatures, as the "I stole the lock on ..." is inserted at the end of the message, which can appear behind the signature. This should fix it: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Insert--Stealing-lock--at-the-beginning-of-a-mes.patch Content-Description: [PATCH] ; Insert "Stealing lock" at the beginning of a message >From b5539a1924bbcbb1ee68fcbb21310856fcd437a9 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sat, 26 Oct 2024 09:39:00 +0200 Subject: [PATCH] ; Insert "Stealing lock" at the beginning of a message * lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of jumping to 'point-max', to avoid inserting the message after signatures. --- lisp/vc/vc.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index a30ba06aec3..0d72b169e41 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1661,6 +1661,7 @@ vc-mark-resolved (format "%d files" (length files)) "this file")))) +(declare-function mail-text "sendmail" ()) (defun vc-steal-lock (file rev owner) "Steal the lock on FILE." (let (file-description) @@ -1681,7 +1682,7 @@ vc-steal-lock ;; goes wrong, we don't want to send any mail. (compose-mail owner (format "Stolen lock on %s" file-description)) (setq default-directory (expand-file-name "~/")) - (goto-char (point-max)) + (mail-text) (insert (format "I stole the lock on %s, " file-description) (current-time-string) -- 2.45.2 --=-=-= Content-Type: text/plain -- Philip Kaludercic on siskin --=-=-=-- ------------=_1731083462-25659-1--