X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/09e8c98b0b5a725897b25ff235608391fde2a0a3..aea4c6ae3a0b470ca16b2b209f8ee344c7b21a94:/packages/debbugs/debbugs.el

diff --git a/packages/debbugs/debbugs.el b/packages/debbugs/debbugs.el
index 422a775e5..ad5147444 100644
--- a/packages/debbugs/debbugs.el
+++ b/packages/debbugs/debbugs.el
@@ -5,7 +5,7 @@
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hypermedia
 ;; Package: debbugs
-;; Version: 0.9.5
+;; Version: 0.9.6
 ;; Package-Requires: ((soap-client "3.1.1") (cl-lib "0.5"))
 
 ;; This file is not part of GNU Emacs.
@@ -181,8 +181,8 @@ Valid keywords are:
   the value of field `affects' in bug's status.  The returned bugs
   do not necessary belong to this package.
 
-  :status -- Status of bug.  Valid values are \"done\",
-  \"forwarded\" and \"open\".
+  :status -- Status of bug.  Valid values are \"pending\",
+  \"forwarded\", \"fixed\" and \"done\".
 
   :archive -- A keyword to filter for bugs which are already
   archived, or not.  Valid values are \"0\" (not archived),
@@ -225,8 +225,8 @@ patch:
 	       (setq vec (vconcat vec (list key val))))
 	   (error "Wrong %s: %s" key val)))
 	(:status
-	 ;; Possible values: "done", "forwarded" and "open"
-	 (if (string-match "\\`\\(done\\|forwarded\\|open\\)\\'" val)
+	 ;; Possible values: "pending", "forwarded", "fixed" and "done".
+	 (if (string-match "\\`\\(pending\\|forwarded\\|fixed\\|done\\)\\'" val)
 	     (setq vec (vconcat vec (list key val)))
 	   (error "Wrong %s: %s" key val)))
 	(:archive
@@ -282,7 +282,7 @@ Every returned entry is an association list with the following attributes:
   can be \"fixed\", \"notabug\", \"wontfix\", \"unreproducible\",
   \"moreinfo\" or \"patch\".
 
-  `pending': The string \"pending\", \"forwarded\" or \"done\".
+  `pending': The string \"pending\", \"forwarded\", \"fixed\" or \"done\".
 
   `subject': Subject/Title of the bugreport.
 
@@ -565,17 +565,15 @@ The following conditions are possible:
 
   ATTRIBUTE is one of the following keywords:
 
-  :status --  Status of bug.  Valid values are \"done\",
-  \"forwarded\" and \"open\".
-
   :subject, :@title -- The subject of a message or the title of
   the bug, a string.
 
   :date, :@cdate -- The submission or modification dates of a
   message, a number.
 
-  :submitter, :@author -- The email address of the submitter of a
-  bug or the author of a message belonging to this bug, a string.
+  :@author -- The email address of the author of a message
+  belonging to this bug, a string.  It may be different than
+  the email of the person submitting the bug.
   The special email address \"me\" is used as pattern, replaced
   with `user-mail-address'.
 
@@ -724,8 +722,9 @@ Examples:
 
 	      ;; Attribute condition.
 	      ((:submitter :@author)
-	       ;; It shouldn't happen in a phrase condition.
-	       (if phrase-cond
+	       ;; It shouldn't happen.
+	       (if (or (and (eq kw :submitter) phrase-cond)
+		       (and (eq kw :@author) attr-cond))
 		   (error "Wrong keyword: %s" kw))
 	       (if (not (stringp (car elt)))
 		   (setq vec (vconcat vec (list key "")))
@@ -740,7 +739,8 @@ Examples:
 		     (unless (member x val)
 		       (setq val (append val (list x))))))
 		 (setq vec
-		       (vconcat vec (list key (mapconcat #'identity val " "))))))
+		       (vconcat
+			vec (list key (mapconcat #'identity val " "))))))
 
 	      (:status
 	       ;; It shouldn't happen in a phrase condition.
@@ -749,15 +749,17 @@ Examples:
 	       (setq attr-cond t)
 	       (if (not (stringp (car elt)))
 		   (setq vec (vconcat vec (list key "")))
-		 ;; Possible values: "done", "forwarded" and "open"
+		 ;; Possible values: "pending", "forwarded", "fixed" and "done".
 		 (while  (and (stringp (car elt))
 			      (string-match
-			       "\\`\\(done\\|forwarded\\|open\\)\\'" (car elt)))
+			       "\\`\\(pending\\|forwarded\\|fixed\\|done\\)\\'"
+			       (car elt)))
 		   (let ((x (pop elt)))
 		     (unless (member x val)
 		       (setq val (append val (list x))))))
 		 (setq vec
-		       (vconcat vec (list key (mapconcat #'identity val " "))))))
+		       (vconcat
+			vec (list key (mapconcat #'identity val " "))))))
 
 	      ((:subject :package :tags :severity :@title)
 	       ;; It shouldn't happen in a phrase condition.
@@ -772,7 +774,8 @@ Examples:
 		     (unless (member x val)
 		       (setq val (append val (list x))))))
 		 (setq vec
-		       (vconcat vec (list key (mapconcat #'identity val " "))))))
+		       (vconcat
+			vec (list key (mapconcat #'identity val " "))))))
 
 	      ((:date :@cdate)
 	       ;; It shouldn't happen in a phrase condition.
@@ -788,7 +791,8 @@ Examples:
 		       (setq val (append val (list x))))))
 		 (setq vec
 		       (vconcat
-			vec (list key (mapconcat #'number-to-string val " "))))))
+			vec
+			(list key (mapconcat #'number-to-string val " "))))))
 
 	      ((:operator :order)
 	       ;; It shouldn't happen in a phrase condition.