From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 10 May 2002 01:02:26 +0000 (+0000)
Subject: (rmail-show-message): Catch error in check-coding-system.
X-Git-Tag: ttn-vms-21-2-B4~15119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de971ad1a174f22c75b3b01276c86d03b3793215;p=emacs.git

(rmail-show-message): Catch error in check-coding-system.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 81da56a6f82..e6dd92671e1 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2391,8 +2391,12 @@ If summary buffer is currently displayed, update current message there also."
 	      (goto-char (point-min))
 	      (if (re-search-forward "^X-Coding-System: *\\(.*\\)$" nil t)
 		  (let ((coding-system (intern (match-string 1))))
-		    (check-coding-system coding-system)
-		    (setq buffer-file-coding-system coding-system))
+		    (condition-case nil
+			(progn
+			  (check-coding-system coding-system)
+			  (setq buffer-file-coding-system coding-system))
+		      (error 
+		       (setq buffer-file-coding-system nil))))
 		(setq buffer-file-coding-system nil)))))
 	;; Clear the "unseen" attribute when we show a message.
 	(rmail-set-attribute "unseen" nil)