2001-03-19 05:28:00 Katsumi Yamaoka <yamaoka@jpl.org>

	* gnus-kill.el (gnus-execute): Work with the extra headers.
	* gnus-sum.el (gnus-summary-execute-command): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04ffe27..568fbe0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-19 05:28:00  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * gnus-kill.el (gnus-execute): Work with the extra headers.
+       * gnus-sum.el (gnus-summary-execute-command): Ditto.
+       
 2001-07-09 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
@@ -116,7 +121,6 @@
        * nntp.el (nntp-send-command-nodelete): ditto.
        * nntp.el (nntp-send-command-and-decode): ditto.
 
->>>>>>> 6.485
 2001-06-30  YAGI Tatsuya  <yagi@is.titech.ac.jp>
 
        * gnus-start.el (gnus-check-first-time-used): Use `if' instead of

diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index dfed289..4372825 100644 (file)
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -641,18 +641,30 @@ If optional 2nd argument UNREAD is non-nil, articles which are
 marked as read or ticked are ignored."
   (save-excursion
     (let ((killed-no 0)
-         function article header)
+         function article header extras)
       (cond
        ;; Search body.
        ((or (null field)
            (string-equal field ""))
        (setq function nil))
        ;; Get access function of header field.
-       ((fboundp
-        (setq function
-              (intern-soft
-               (concat "mail-header-" (downcase field)))))
-       (setq function `(lambda (h) (,function h))))
+       ((cond ((fboundp
+               (setq function
+                     (intern-soft
+                      (concat "mail-header-" (downcase field)))))
+              (setq function `(lambda (h) (,function h))))
+             ((when (setq extras
+                          (member (downcase field)
+                                  (mapcar (lambda (header)
+                                            (downcase (symbol-name header)))
+                                          gnus-extra-headers)))
+                (setq function
+                      `(lambda (h)
+                         (gnus-extra-header
+                          (quote ,(nth (- (length gnus-extra-headers)
+                                          (length extras))
+                                       gnus-extra-headers))
+                          h)))))))
        ;; Signal error.
        (t
        (error "Unknown header field: \"%s\"" field)))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index f1e4406..b206c53 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7496,9 +7496,11 @@ article.  If BACKWARD (the prefix) is non-nil, search backward instead."
    (list (let ((completion-ignore-case t))
           (completing-read
            "Header name: "
-           (mapcar (lambda (string) (list string))
-                   '("Number" "Subject" "From" "Lines" "Date"
-                     "Message-ID" "Xref" "References" "Body"))
+           (mapcar (lambda (header) (list (format "%s" header)))
+                   (append
+                    '("Number" "Subject" "From" "Lines" "Date"
+                      "Message-ID" "Xref" "References" "Body")
+                    gnus-extra-headers))
            nil 'require-match))
         (read-string "Regexp: ")
         (read-key-sequence "Command: ")