[ Merge from Gnus v5-10 ]

2008-03-19  Nils Ackermann  <nils@ackermath.info>  (tiny change)

	* nnmh.el (nnmh-request-expire-articles): Prefer expiry-target group
	parameter.

	* message.el (message-disassociate-draft): Specify drafts group name
	fully.

2008-03-19  Katsumi Yamaoka  <yamaoka@jpl.org>

	* mail-source.el (mail-source-delete-old-incoming) Fix regexp to find
	Incoming* files.

2008-03-19  Katsumi Yamaoka  <yamaoka@jpl.org>

	* nntp.el (nntp-open-telnet-stream, nntp-open-via-rlogin-and-telnet)
	(nntp-open-via-telnet-and-telnet): Make sure the nntp port to specify
	is a string.

5 files changed, 39 insertions, 8 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 960e1a835f7..2c81b3c764a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,22 @@
+2008-03-19  Nils Ackermann  <nils@ackermath.info>  (tiny change)
+
+	* nnmh.el (nnmh-request-expire-articles): Prefer expiry-target group
+	parameter.
+
+	* message.el (message-disassociate-draft): Specify drafts group name
+	fully.
+
+2008-03-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mail-source.el (mail-source-delete-old-incoming) Fix regexp to find
+	Incoming* files.
+
+2008-03-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nntp.el (nntp-open-telnet-stream, nntp-open-via-rlogin-and-telnet)
+	(nntp-open-via-telnet-and-telnet): Make sure the nntp port to specify
+	is a string.
+
 2008-03-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* mail-source.el (mail-source-delete-old-incoming-confirm): Change
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index e0fbaff66e2..8b59e183b25 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -536,7 +536,8 @@ If CONFIRM is non-nil, ask for confirmation before removing a file."
 	 currday files)
     (setq files (directory-files
 		 mail-source-directory t
-		 (concat mail-source-incoming-file-prefix "*"))
+		 (concat "\\`"
+			 (regexp-quote mail-source-incoming-file-prefix)))
 	  currday (* (car (current-time)) high2days)
 	  currday (+ currday (* low2days (nth 1 (current-time)))))
     (while files
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 515ad215f89..6b0e62d95cd 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5797,7 +5797,7 @@ are not included."
   "Disassociate the message buffer from the drafts directory."
   (when message-draft-article
     (nndraft-request-expire-articles
-     (list message-draft-article) "drafts" nil t)))
+     (list message-draft-article) "nndraft:drafts" nil t)))
 
 (defun message-insert-headers ()
   "Generate the headers for the article."
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 705a6713388..0331b5a4d08 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -255,8 +255,11 @@ as unread by Gnus.")
 (deffoo nnmh-request-expire-articles (articles newsgroup
 					       &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
-  (let* ((is-old t)
-	 article rest mod-time)
+  (let ((is-old t)
+	(nnmail-expiry-target
+	 (or (gnus-group-find-parameter newsgroup 'expiry-target t)
+	     nnmail-expiry-target))
+	article rest mod-time)
     (nnheader-init-server-buffer)
 
     (while (and articles is-old)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index adb2531de78..cea2921da91 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1789,7 +1789,10 @@ Please refer to the following variables to customize the connection:
 - `nntp-end-of-line'."
   (let ((command `(,nntp-telnet-command
 		   ,@nntp-telnet-switches
-		   ,nntp-address ,nntp-port-number))
+		   ,nntp-address
+		   ,(if (integerp nntp-port-number)
+			(number-to-string nntp-port-number)
+		      nntp-port-number)))
 	proc)
     (and nntp-pre-command
 	 (push nntp-pre-command command))
@@ -1832,8 +1835,11 @@ Please refer to the following variables to customize the connection:
     (save-excursion
       (set-buffer buffer)
       (nntp-wait-for-string "^r?telnet")
-      (process-send-string proc (concat "open " nntp-address
-					" " nntp-port-number "\n"))
+      (process-send-string proc (concat "open " nntp-address " "
+					(if (integerp nntp-port-number)
+					    (number-to-string nntp-port-number)
+					  nntp-port-number)
+					"\n"))
       (nntp-wait-for-string "^\r*20[01]")
       (beginning-of-line)
       (delete-region (point-min) (point))
@@ -1904,7 +1910,9 @@ Please refer to the following variables to customize the connection:
 				     ,nntp-telnet-command
 				     ,@nntp-telnet-switches
 				     ,nntp-address
-				     ,nntp-port-number)))
+				     ,(if (integerp nntp-port-number)
+					  (number-to-string nntp-port-number)
+					nntp-port-number))))
 	  (process-send-string proc
 			       (concat (mapconcat 'identity
 						  real-telnet-command " ")