X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/220d91b834f7f7252b9953460422151b86b3520c..df1e4ea210c081c969e092628aa999b1a4d59dfd:/lisp/gnus/rfc2231.el

diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 0b028a08b8..ef7187cbd9 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -1,7 +1,6 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -59,7 +58,7 @@ must never cause a Lisp error."
 	 ;; The most likely cause of an error is unbalanced parentheses
 	 ;; or double-quotes.  If all parentheses and double-quotes are
 	 ;; quoted meaninglessly with backslashes, removing them might
-	 ;; make it parseable.  Let's try...
+	 ;; make it parsable.  Let's try...
 	 (error
 	  (let (mod)
 	    (when (and (string-match "\\\\\"" string)
@@ -216,7 +215,8 @@ These look like:
  \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
  \"This is ***fun***\"."
   (string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
-  (let ((coding-system (mm-charset-to-coding-system (match-string 1 string)))
+  (let ((coding-system (mm-charset-to-coding-system
+			(match-string 1 string) nil t))
 	;;(language (match-string 2 string))
 	(value (match-string 3 string)))
     (mm-with-unibyte-buffer