# HG changeset patch
# User Henry S. Thompson <ht@inf.ed.ac.uk>
# Date 1782983491 -3600
# Node ID 72f455f3cec1d64e0a7969b9b7ff44d04fc2b719
# Parent  8e82ac8512d220aea3cc9197d50f04c61b985675# Parent  6dc30991613b3dad541dbd254a04b22c941ee9b1
merge

diff -r 6dc30991613b -r 72f455f3cec1 diary.el
--- a/diary.el	Wed Dec 10 19:11:28 2025 +0000
+++ b/diary.el	Thu Jul 02 10:11:31 2026 +0100
@@ -227,9 +227,10 @@
 		 (/= (length articles) 1))
 	(error "Editting multiple articles for diary not implemented yet"))
       (while (setq article (pop articles))
-	(gnus-edit-and-move-to-diary_1 no-delete no-edit)
 	(when (memq article gnus-newsgroup-processable)
-	  (gnus-summary-remove-process-mark article)))
+	  ;; do this first, because otherwise a digest is created
+	  (gnus-summary-remove-process-mark article))
+	(gnus-edit-and-move-to-diary_1 no-delete no-edit))
       (if (and no-edit (not (gnus-summary-next-unread-article)))
 	  (gnus-summary-exit)))
     ))
@@ -248,7 +249,9 @@
       (gnus-summary-select-article t))
     (gnus-article-date-original)
     (message "About to forward. . .")
-    (gnus-summary-mail-forward 1)
+    (let ((gnus-newsgroup-processable nil) ; prevent digest if 
+	  )
+      (gnus-summary-mail-forward 1))
     (message "Begin forward. . .")
     (goto-char (point-min))
     (re-search-forward "^To: " nil t)
@@ -278,8 +281,8 @@
 	(setq sublp (search-forward "Subject: " nil t))
 	(delete-region (point)(progn (search-forward "] " nil t)))
 	(if (not
-	     (looking-at "[123]?[0-9] [JFMASOND][a-z][a-z] (20)?[2-9][0-9] "))
-	    (save-excursion
+	     (looking-at "[123]?[0-9] [JFMASOND][a-z][a-z] \\(20\\)?[2-9][0-9] "))
+	    (save-excursion		; this is broken!
 	      (let ((try-date
 		     (and
 		      (or (re-search-forward "^\r?$" nil 1) t)
@@ -614,9 +617,9 @@
       (insert "Z\n")
       (insert "DTSTART:")(insert start)(insert "Z\n")
       (insert "DTEND:")(insert end)(insert "Z\n")
-      (insert "SUMMARY:")(insert-encoded-maybe summary)(insert "\n")
+      (insert "SUMMARY")(insert-encoded-maybe summary)(insert "\n")
       (insert "DESCRIPTION")(insert-folded description)
-;      (insert "LOCATION")(insert-encoded-maybe location)(insert "\n")
+      (insert "LOCATION")(insert-encoded-maybe location)(insert "\n")
       ;(insert "ORGANIZER")(insert-encoded-maybe org)
 ;      (insert org)
 ;      (insert "\n")
@@ -639,8 +642,8 @@
 	   t
 	   "^\000-\007\n\013\015-\037\200-\377="))
 	(goto-char (point-max)))
-	(insert "\n :")
-	(insert string)))
+    (insert ":")
+    (insert string)))
 
 (defun insert-folded (string)
   (insert "\n :")
diff -r 6dc30991613b -r 72f455f3cec1 mail-from-inf.el
--- a/mail-from-inf.el	Wed Dec 10 19:11:28 2025 +0000
+++ b/mail-from-inf.el	Thu Jul 02 10:11:31 2026 +0100
@@ -145,7 +145,8 @@
       '(;(from "s1513009@.*" "ug4_18");\\|s1536017\\(s1443062\\|s1679328
 	;(from "Y.Chen-258@.*" "msc_19")
 	;(from "\\(s1795066\\|s1825415\\|A.M.Magalhaes\\|T.Makino\\|S.Li-93\\|M.Maggiolo\\|ashe\\|Y.Li-242\\|E.J.Martin\\|K.Lohse\\|D.Li-28\\|S.D.Martin-1\\|K.Chen-35\\|J.Norris-3\\|S.Li-80\\|Y.Liu-236\\|J.Chen-114\\|Q.Zeng-3\\|Y.Liu-244\\|P.Guo-1\\|s1582739\\|B.Lun\\|X.Li-143\\|F.Li-17\\|K.R.Lu\\|Z.Li-86\\)@.*" "tutees18")
-	(from "\\(s1895309\\|s1765180\\|s1764494\\|s1645474\\|s1953043\\|s1651774\\|s1732316\\|s1742667\\)@.*" "tutees20")
+	;(from "\\(s1895309\\|s1765180\\|s1764494\\|s1645474\\|s1953043\\|s1651774\\|s1732316\\|s1742667\\)@.*" "tutees20")
+	(from "T\\.Suwanpimolkul\\|Narmin\\|Gahramanova\\|N\.Gahramanova-1\\|\\|Bin\\|Hu\\|B\\.Hu-21" "msc_26")
 	))
 
 (defalias 'tut20 (read-kbd-macro
@@ -261,12 +262,9 @@
 			  (to "ht\\|henry\\|\\(h\\.?\\)?thompson?" ,now-pers)
 			  ,@xml-lists2))
 	  ,@misc-list1
+	  ,@sms-list
 	  (to "ht\\|henry\\|\\(h\\.?\\)?thompson?"
-	      (| (from ".*@sms.ed.ac.uk" (|
-					  ,@sms-list
-					  ,now-pers))
-	  
-		 ,now-pers))
+		 ,now-pers)
 	  (to "quaker.*" (|
 			  ,@quaker-list
 			  ,now-group))
diff -r 6dc30991613b -r 72f455f3cec1 my-news.el
--- a/my-news.el	Wed Dec 10 19:11:28 2025 +0000
+++ b/my-news.el	Thu Jul 02 10:11:31 2026 +0100
@@ -810,7 +810,7 @@
 
 (defun use-text-not-html (&optional clear)
   (when (and (if clear (looking-at "<html")
-	       (looking-at "> <\\(html\\|div\\)"))
+	       (looking-at "> <\\(!doctype\\|html\\|div\\)"))
 	     (bufferp (get-buffer "*Shell Command Output*")))
     ;; replace HTML only with result of my HTML filter
     (delete-region (point)(mark t))