(pmail-last-label, pmail-last-multi-labels):

Move back here from pmailkwd.el.
(pmail-message-labels-p): Move back here from pmailsum.el.

2 files changed, 19 insertions, 0 deletions

diff --git a/lisp/mail/ChangeLog.pmail b/lisp/mail/ChangeLog.pmail
index af957c1c8a6..e725986d915 100644
--- a/lisp/mail/ChangeLog.pmail
+++ b/lisp/mail/ChangeLog.pmail
@@ -1,3 +1,13 @@
+2009-01-20  Glenn Morris  <rgm@gnu.org>
+
+        * pmailkwd.el (pmail-last-label, pmail-last-multi-labels):
+        Move back to pmail.el.
+        * pmail.el (pmail-last-label, pmail-last-multi-labels):
+        Move back here from pmailkwd.el.
+
+        * pmailsum.el (pmail-message-labels-p): Move back to pmail.el.
+        * pmail.el (pmail-message-labels-p): Move back here from pmailsum.el.
+
 2009-01-16  Glenn Morris  <rgm@gnu.org>
 
         * pmailout.el (pmail-update-summary): Declare.
diff --git a/lisp/mail/pmail.el b/lisp/mail/pmail.el
index 75e0aff1927..dff53d0abee 100644
--- a/lisp/mail/pmail.el
+++ b/lisp/mail/pmail.el
@@ -621,6 +621,12 @@ by substituting the new message number into the existing list.")
 
 ;; `Sticky' default variables.
 
+;; Last individual label specified to a or k.
+(defvar pmail-last-label nil)
+
+;; Last set of values specified to C-M-n, C-M-p, C-M-s or C-M-l.
+(defvar pmail-last-multi-labels nil)
+
 (defvar pmail-last-regexp nil)
 (put 'pmail-last-regexp 'permanent-local t)
 
@@ -2205,6 +2211,9 @@ This function assumes the Pmail buffer is unswapped."
   "Test the unseen attribute for message MSGNUM.
 Return non-nil if the unseen attribute is set, nil otherwise."
   (pmail-message-attr-p msgnum "......U"))
+
+(defun pmail-message-labels-p (msg labels)
+  (string-match labels (pmail-get-labels msg)))
 
 ;;;; *** Pmail Message Selection And Support ***