# HG changeset patch
# User Henry S. Thompson <ht@inf.ed.ac.uk>
# Date 1712308410 -3600
# Node ID 963ac2f8e386f86341dab809f267040eae457d22
# Parent  77aefd805030e68333a49a54852d8b7cbfa32ee9
old local

diff -r 77aefd805030 -r 963ac2f8e386 mail-from-inf.el
--- a/mail-from-inf.el	Fri Apr 05 09:11:09 2024 +0100
+++ b/mail-from-inf.el	Fri Apr 05 10:13:30 2024 +0100
@@ -292,9 +292,14 @@
       (let ((sco (get-buffer "*Shell Command Output*")))
 	(if sco
 	    (kill-buffer sco)))
-      (gnus-edit-and-move-to-diary '(16 . t)))
+      (gnus-edit-and-move-to-diary_1 nil t))
     (gnus-summary-exit)
     )
   )
 
+(add-hook 'gnus-after-getting-new-news-hook
+ (lambda ()
+   (if (member "_diary" ht-gnus-just-read)
+       (straight-to-diary))))
+
 (provide 'mail-from-inf)
diff -r 77aefd805030 -r 963ac2f8e386 my-news.el
--- a/my-news.el	Fri Apr 05 09:11:09 2024 +0100
+++ b/my-news.el	Fri Apr 05 10:13:30 2024 +0100
@@ -814,7 +814,7 @@
 (setq message-citation-line-function (function safe-citation))
 
 
-(defvar safelink_pat "https://[a-z0-9.]*safelinks.protection.outlook.com/\\?url=\\(https?%3A%2F%2F[^&<>\"]*\\)[^\"<> ]*")
+(defvar safelink_pat "https://[a-z0-9.]*safelinks.protection.outlook.com/\\?url=\\(\\(ftp\\|https?\\)%3A%2F%2F[^&<>\"]*\\)[^\"<> \n]*")
 
 (require 'url)