2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4d4062668d..7e5fd5be1c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-06  Ulrich Mueller  <ulm@gentoo.org>
+
+        * play/doctor.el (doctor-death): Escape "," characters.  (Bug#10370)
+
 2012-01-05  Glenn Morris  <rgm@gnu.org>
 
         * eshell/em-unix.el (diff-no-select): Autoload it.
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index ad8e4189c22..d79f9cd31bd 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -1576,9 +1576,9 @@ 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
+         (doctor-type '(If you are really suicidal\, you might
                            want to contact the Samaritans via
-                           E-mail: jo@samaritans.org or, at your option,
+                           E-mail: jo@samaritans.org or\, at your option\,
                            anonymous E-mail: samaritans@anon.twwells.com\ \.
                            or find a Befrienders crisis center at
                            http://www.befrienders.org/\ \.