mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 14:02:07 -08:00
Code Issues Projects Releases Wiki Activity

[ Merge from Gnus v5-10 ]

Browse source 
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.
This commit is contained in:
Reiner Steib 2008-03-19 21:01:37 +00:00
parent d44387517b
commit 9b655dbfd7
5 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/gnus/ChangeLog
View file

@ -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

3
lisp/gnus/mail-source.el
View file

@ -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

2
lisp/gnus/message.el
View file

@ -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."

7
lisp/gnus/nnmh.el
View file

@ -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)

16
lisp/gnus/nntp.el
View file

@ -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 " ")