procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
6a05715552 Update the Samaritan's contact details in M-x doctor
d19834dfda ; Fix typos
This commit is contained in:
Stefan Kangas 2022-07-15 06:30:42 +02:00
commit 3dde08e6b4
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog.3
View file

@ -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>

2
lisp/gnus/ChangeLog.3
View file

@ -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>

15
lisp/play/doctor.el
View file

@ -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 ()

2
lisp/play/mpuz.el
View file

@ -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.")