* lisp/message.el (message-make-forward-subject): Use

[elisp/gnus.git-] / lisp / nnheader.el

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index a300d0c..7ae3fff 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -102,15 +102,36 @@ on your system, you could say something like:
 (defalias 'mail-header-xref 'mime-entity-xref-internal)
 (defalias 'mail-header-set-xref 'mime-entity-set-xref-internal)
 
-(defmacro make-full-mail-header (&optional number subject from date id
-                                       references chars lines xref)
+(defsubst make-full-mail-header (&optional number subject from date id
+                                          references chars lines xref)
   "Create a new mail header structure initialized with the parameters given."
-  `(make-mime-entity-internal 'gnus ,number
-                             nil
-                             nil nil nil
-                             ,subject ,from
-                             ,date ,id ,references
-                             ,chars ,lines ,xref))
+  (make-mime-entity-internal
+   'gnus number
+   nil
+   nil nil nil
+   (if subject
+       (eword-decode-field 'Subject subject t)
+     )
+   (if from
+       (eword-decode-field 'From from t)
+     )
+   date id references
+   chars lines xref
+   (list (cons 'Subject subject)
+        (cons 'From from))
+   ))
+
+(defsubst make-full-mail-header-from-decoded-header
+  (&optional number subject from date id references chars lines xref)
+  "Create a new mail header structure initialized with the parameters given."
+  (make-mime-entity-internal
+   'gnus number
+   nil
+   nil nil nil
+   subject
+   from
+   date id references
+   chars lines xref))
 
 (defun make-mail-header (&optional init)
   "Create a new mail header structure initialized with INIT."