Merge from emacs--rel--22

[gnu-emacs] / lisp / gnus / rfc1843.el

diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index 183a7c6d2a6fc3bd4ffa7d0ad104820b6ecd8293..4820184d21a0672feeb5f2cb654d2b8c7f181f0e 100644 (file)
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 2, or (at your
+;; by the Free Software Foundation; either version 3, or (at your
 ;; option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but
@@ -34,6 +34,10 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (eval-when-compile (require 'cl))
 (require 'mm-util)
 
@@ -139,6 +143,10 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
          (aset s (incf i) (+ v (if (< v 63) 64 98))))))
     s))
 
+(autoload 'mail-header-parse-content-type "mail-parse")
+(autoload 'message-narrow-to-head "message")
+(declare-function message-fetch-field "message" (header &optional not-all))
+
 (defun rfc1843-decode-article-body ()
   "Decode HZ encoded text in the article body."
   (if (string-match (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>")