Mercurial > emacs
changeset 75286:2eb7060c5458
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 194-195)
- Merge from emacs--devo--0
- Update from CVS
2007-01-19 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/nnsoup.el (nnsoup-directory, nnsoup-packer, nnsoup-packet-directory):
Use gnus-home-directory instead of "~/" or "$HOME".
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-606
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 19 Jan 2007 11:35:16 +0000 |
| parents | 20dea730746f |
| children | a884e6b92a3e |
| files | lisp/gnus/ChangeLog lisp/gnus/nnsoup.el |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Jan 19 10:35:34 2007 +0000 +++ b/lisp/gnus/ChangeLog Fri Jan 19 11:35:16 2007 +0000 @@ -1,3 +1,8 @@ +2007-01-19 Reiner Steib <Reiner.Steib@gmx.de> + + * nnsoup.el (nnsoup-directory, nnsoup-packer, nnsoup-packet-directory): + Use gnus-home-directory instead of "~/" or "$HOME". + 2007-01-12 Kenichi Handa <handa@m17n.org> * uudecode.el (uudecode-decode-region-internal): Make it work in a
--- a/lisp/gnus/nnsoup.el Fri Jan 19 10:35:34 2007 +0000 +++ b/lisp/gnus/nnsoup.el Fri Jan 19 11:35:16 2007 +0000 @@ -37,7 +37,7 @@ (nnoo-declare nnsoup) -(defvoo nnsoup-directory "~/SOUP/" +(defvoo nnsoup-directory (nnheader-concat gnus-home-directory "SOUP/") "*SOUP packet directory.") (defvoo nnsoup-tmp-directory @@ -58,7 +58,9 @@ (defvoo nnsoup-active-file (expand-file-name "active" nnsoup-directory) "Active file.") -(defvoo nnsoup-packer "tar cf - %s | gzip > $HOME/Soupin%d.tgz" +(defvoo nnsoup-packer (concat "tar cf - %s | gzip > " + (expand-file-name gnus-home-directory) + "Soupin%d.tgz") "Format string command for packing a SOUP packet. The SOUP files will be inserted where the %s is in the string. This string MUST contain both %s and %d. The file number will be @@ -68,7 +70,7 @@ "*Format string command for unpacking a SOUP packet. The SOUP packet file name will be inserted at the %s.") -(defvoo nnsoup-packet-directory "~/" +(defvoo nnsoup-packet-directory gnus-home-directory "*Where nnsoup will look for incoming packets.") (defvoo nnsoup-packet-regexp "Soupout"