bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message

bug#74027: [PATCH] ; Insert "Stealing lock" at the beginning of a message

[Philip Kaludercic]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] ; Insert "Stealing lock" at the beginning of a message --]
[-- Type: text/x-patch, Size: 1171 bytes --]

From b5539a1924bbcbb1ee68fcbb21310856fcd437a9 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
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


[-- Attachment #3: Type: text/plain, Size: 34 bytes --]


-- 
	Philip Kaludercic on siskin