master 3dde08e6b4: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 3dde08e6b409c03b3cc6f1c54d828e60da97458f
Merge: 2e0c76e397 6a05715552
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    6a05715552 Update the Samaritan's contact details in M-x doctor
    d19834dfda ; Fix typos
---
 ChangeLog.3           |  5 ++---
 lisp/gnus/ChangeLog.3 |  2 +-
 lisp/play/doctor.el   | 15 ++++++++-------
 lisp/play/mpuz.el     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index c48c0ab2a3..7af0205e8c 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -332,7 +332,7 @@
        This fixes bug#55684.  There, with a minibuffer-only frame at start up,
        Emacs tried to switch to this frame, whose selected window was the
        mini-window.  There is no other active window in this frame, so the
-       attempt to swith to another window failed.
+       attempt to switch to another window failed.
 
        * src/frame.c (do_switch_frame): On switching to a frame whose selected
        window is as above, before selecting the most recently used window, 
check
@@ -217680,8 +217680,7 @@
        Stick with debbugs-supported tags in triage
 
        * admin/notes/bug-triage: Stick to the tag "unreproducible", which
-       debbugs supports, rather than suggesting "doneunreproducible" or
-       "unreproducable".
+       debbugs supports.
 
 2016-09-26  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index f3324b2919..c33c76f68d 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -21361,7 +21361,7 @@
        to get all the groups a message ID is in.
 
        * spam-stat.el (spam-stat-split-fancy-spam-threshold)
-       (spam-stat-split-fancy): Change "threshhold" to "threshold".
+       (spam-stat-split-fancy): Fix typo for "threshold".
        (spam-stat-score-buffer-user-functions): Add :number custom type.
 
 2005-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index b93d768cbe..fbff0b1bbb 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -1577,13 +1577,14 @@ Hack on previous word, setting global variable 
DOCTOR-OWNER to correct result."
                       (equal doctor-found 'killing))
                   (memq 'yourself doctor-sent)))
         (setq doctor--suicide-flag t)
-        (doctor-type '(If you are really suicidal\, you might
-                          want to contact the Samaritans via
-                          E-mail: jo@samaritans.org or\, at your option\,
-                          anonymous E-mail: samaritans@anon.twwells.com\ \.
-                           or find a Befrienders crisis center at
-                           https://www.befrienders.org/\ \.
-                          (doc$ doctor--please) (doc$ doctor--continue) \.)))
+         (doctor-type '( If you are really suicidal\, you might
+                         want to contact the Samaritans via
+                         e-mail: jo@samaritans.org \.
+                         or find a Befrienders crisis center at
+                         https://www.befrienders.org/\ \.
+                         you can also find other suicide crisis lines at
+                         
https://en.wikipedia.org/wiki/List_of_suicide_crisis_lines \.
+                         (doc$ doctor--please) (doc$ doctor--continue) \.)))
        (t (doctor-type (doc$ doctor--deathlst)))))
 
 (defun doctor-foul ()
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index 1cacf01a20..177b6eecf0 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -156,7 +156,7 @@ You may abort a game by typing 
\\<mpuz-mode-map>\\[mpuz-offer-abort]."
 
 
 ;; A puzzle also uses a board displaying a multiplication.
-;; Every digit appears in the board, crypted or not.
+;; Every digit appears in the board, encrypted or not.
 ;;------------------------------------------------------
 (defvar mpuz-board (make-vector 10 nil)
   "The board associates to any digit the list of squares where it appears.")