Mercurial > emacs
changeset 80349:07ebd0fc42b8
[ 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.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Wed, 19 Mar 2008 21:01:37 +0000 |
| parents | fc86789787e6 |
| children | af4d6ac258a1 |
| files | lisp/gnus/ChangeLog lisp/gnus/mail-source.el lisp/gnus/message.el lisp/gnus/nnmh.el lisp/gnus/nntp.el |
| diffstat | 5 files changed, 39 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Mar 19 07:08:48 2008 +0000 +++ b/lisp/gnus/ChangeLog Wed Mar 19 21:01:37 2008 +0000 @@ -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
--- a/lisp/gnus/mail-source.el Wed Mar 19 07:08:48 2008 +0000 +++ b/lisp/gnus/mail-source.el Wed Mar 19 21:01:37 2008 +0000 @@ -536,7 +536,8 @@ 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
--- a/lisp/gnus/message.el Wed Mar 19 07:08:48 2008 +0000 +++ b/lisp/gnus/message.el Wed Mar 19 21:01:37 2008 +0000 @@ -5797,7 +5797,7 @@ "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."
--- a/lisp/gnus/nnmh.el Wed Mar 19 07:08:48 2008 +0000 +++ b/lisp/gnus/nnmh.el Wed Mar 19 21:01:37 2008 +0000 @@ -255,8 +255,11 @@ (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)
--- a/lisp/gnus/nntp.el Wed Mar 19 07:08:48 2008 +0000 +++ b/lisp/gnus/nntp.el Wed Mar 19 21:01:37 2008 +0000 @@ -1789,7 +1789,10 @@ - `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 @@ (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 @@ ,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 " ")