Merge from gnus--rel--5.10

[gnus] / lisp / rfc1843.el

diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index 9af2fc6..183a7c6 100644 (file)
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -1,5 +1,7 @@
 ;;; rfc1843.el --- HZ (rfc1843) decoding
-;; Copyright (c) 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news HZ HZ+ mail i18n
@@ -35,6 +37,10 @@
 (eval-when-compile (require 'cl))
 (require 'mm-util)
 
+(defvar gnus-decode-encoded-word-function)
+(defvar gnus-decode-header-function)
+(defvar gnus-newsgroup-name)
+
 (defvar rfc1843-word-regexp
   "~\\({\\([\041-\167][\041-\176]\\| \\)+\\)\\(~}\\|$\\)")
 
@@ -143,8 +149,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
          (let* ((inhibit-point-motion-hooks t)
                 (case-fold-search t)
                 (ct (message-fetch-field "Content-Type" t))
-                (ctl (and ct (ignore-errors
-                               (mail-header-parse-content-type ct)))))
+                (ctl (and ct (mail-header-parse-content-type ct))))
            (if (and ctl (not (string-match "/" (car ctl))))
                (setq ctl nil))
            (goto-char (point-max))