# HG changeset patch
# User Henry S. Thompson <ht@inf.ed.ac.uk>
# Date 1758819425 -3600
# Node ID 0abfe9bf83a077dee0dcabcc821f944a184b702c
# Parent  62fb1a21629a5191f55a0272b220d1d1436c34e2# Parent  0508101db40fc6dfe2db02b26506f807d14e8a6d
merge

diff -r 0508101db40f -r 0abfe9bf83a0 shared/common-init.el
Binary file shared/common-init.el has changed
diff -r 0508101db40f -r 0abfe9bf83a0 shared/gnus-init.el
--- a/shared/gnus-init.el	Mon Jun 09 13:40:01 2025 +0100
+++ b/shared/gnus-init.el	Thu Sep 25 17:57:05 2025 +0100
@@ -184,7 +184,7 @@
 ;;; groups only, comes _after_ split to pers-... for to: ht...
 (setq misc-list2
       '(;(to "cogsci.general" "junk")
-	(from "anrdaemon@yandex.ru\\|gsenopu@gmail.com\\|pradeepan88@hotmail.com" "anr-doom")
+	(from "Andrey Repin\\|anrdaemon@yandex.ru\\|gsenopu@gmail.com\\|pradeepan88@hotmail.com" "anr-doom")
 	;(to "bp-people" "bp-people")
 	;(to "ppelders" "ppelders")
 	;(to "7vtw" "7vtw")
diff -r 0508101db40f -r 0abfe9bf83a0 shared/prompt-for-word.el
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shared/prompt-for-word.el	Thu Sep 25 17:57:05 2025 +0100
@@ -0,0 +1,47 @@
+;; Last edited: Wed Nov 14 14:20:08 1990
+;;; define an interlisp-style prompt-for-word
+(provide 'prompt-for-word)
+
+(defun prompt-for-word (prompt candidate completion-table keymap)
+  "prompt for a word using PROMPT, and CANDIDATE as first choice.
+If any inserting characters are typed, they replace the candidate.
+Uses KEYMAP if non-nil, otherwise
+if completion-table is non-nil,
+  uses minibuffer-local-must-match-map plus ^N to exit as is,
+  thereby allowing New answers,
+otherwise uses minibuffer-local-map."
+  (let ((current-window (selected-window))
+	(echo-keystrokes 0)
+	char)
+    (select-window (minibuffer-window))
+    (erase-buffer)
+    (insert prompt candidate)
+    (setq char (read-char))
+    (let ((str (make-string 1 char)))
+      (if (eq (or (local-key-binding str)
+		  (global-key-binding str))
+	      'self-insert-command)
+	  (setq candidate nil)))
+    (select-window current-window)
+    (if (boundp 'unread-command-event)
+	;; lemacs
+	(setq unread-command-event
+	      (character-to-event char))
+      (setq unread-command-char char))
+    (let ((minibuffer-completion-table completion-table)
+	  (minibuffer-completion-confirm nil))
+      ;; not quite the same as completing-read, because you can't
+      ;; get m-c-c nil and m-m-map simultaneously
+      (read-from-minibuffer prompt candidate
+			    (or keymap
+				(if completion-table
+				    ;; allow ^N to exit with non-match for
+				    ;; new names
+				    pfw-map
+				  minibuffer-local-map))))))
+
+(defvar pfw-map (let ((new (copy-keymap minibuffer-local-must-match-map)))
+		  (define-key new "\C-n" 'exit-minibuffer)
+		  new)
+  "special completion map for prompt-for-word (q.v.)")
+