Merge from emacs-23

[gnu-emacs] / lisp / mail / mailheader.el

diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index e7b7a34fe6e1e33d74eb97bfd7b2bde63295f0fb..56fa0c5979191fbc56d5d63c89ddce316be93c3c 100644 (file)
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -5,6 +5,7 @@
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Keywords: tools, mail, news
+;; Package: mail-utils
 
 ;; This file is part of GNU Emacs.
 
@@ -48,9 +49,6 @@
 (eval-when-compile
   (require 'cl))
 
-;; Make the byte-compiler shut up.
-(defvar headers)
-
 (defun mail-header-extract ()
   "Extract headers from current buffer after point.
 Returns a header alist, where each element is a cons cell (name . value),
@@ -104,6 +102,9 @@ value."
                (cons (cdr header) (funcall (cdr rule) (cdr header))))))))
   headers)
 
+;; Advertized part of the interface; see mail-header, mail-header-set.
+(defvar headers)
+
 (defsubst mail-header (header &optional header-alist)
   "Return the value associated with header HEADER in HEADER-ALIST.
 If the value is a string, it is the original value of the header.  If the
@@ -190,5 +191,4 @@ A key of nil has as its value a list of defaulted headers to ignore."
 
 (provide 'mailheader)
 
-;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0
 ;;; mailheader.el ends here