Mercurial > emacs
comparison lisp/gnus/nnsoup.el @ 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 | f58700566a56 |
children | e3694f1cb928 |
comparison
equal
deleted
inserted
replaced
75285:20dea730746f | 75286:2eb7060c5458 |
---|---|
35 (require 'nnoo) | 35 (require 'nnoo) |
36 (eval-when-compile (require 'cl)) | 36 (eval-when-compile (require 'cl)) |
37 | 37 |
38 (nnoo-declare nnsoup) | 38 (nnoo-declare nnsoup) |
39 | 39 |
40 (defvoo nnsoup-directory "~/SOUP/" | 40 (defvoo nnsoup-directory (nnheader-concat gnus-home-directory "SOUP/") |
41 "*SOUP packet directory.") | 41 "*SOUP packet directory.") |
42 | 42 |
43 (defvoo nnsoup-tmp-directory | 43 (defvoo nnsoup-tmp-directory |
44 (cond ((fboundp 'temp-directory) (temp-directory)) | 44 (cond ((fboundp 'temp-directory) (temp-directory)) |
45 ((boundp 'temporary-file-directory) temporary-file-directory) | 45 ((boundp 'temporary-file-directory) temporary-file-directory) |
56 "*Index type of the replies packages.") | 56 "*Index type of the replies packages.") |
57 | 57 |
58 (defvoo nnsoup-active-file (expand-file-name "active" nnsoup-directory) | 58 (defvoo nnsoup-active-file (expand-file-name "active" nnsoup-directory) |
59 "Active file.") | 59 "Active file.") |
60 | 60 |
61 (defvoo nnsoup-packer "tar cf - %s | gzip > $HOME/Soupin%d.tgz" | 61 (defvoo nnsoup-packer (concat "tar cf - %s | gzip > " |
62 (expand-file-name gnus-home-directory) | |
63 "Soupin%d.tgz") | |
62 "Format string command for packing a SOUP packet. | 64 "Format string command for packing a SOUP packet. |
63 The SOUP files will be inserted where the %s is in the string. | 65 The SOUP files will be inserted where the %s is in the string. |
64 This string MUST contain both %s and %d. The file number will be | 66 This string MUST contain both %s and %d. The file number will be |
65 inserted where %d appears.") | 67 inserted where %d appears.") |
66 | 68 |
67 (defvoo nnsoup-unpacker "gunzip -c %s | tar xvf -" | 69 (defvoo nnsoup-unpacker "gunzip -c %s | tar xvf -" |
68 "*Format string command for unpacking a SOUP packet. | 70 "*Format string command for unpacking a SOUP packet. |
69 The SOUP packet file name will be inserted at the %s.") | 71 The SOUP packet file name will be inserted at the %s.") |
70 | 72 |
71 (defvoo nnsoup-packet-directory "~/" | 73 (defvoo nnsoup-packet-directory gnus-home-directory |
72 "*Where nnsoup will look for incoming packets.") | 74 "*Where nnsoup will look for incoming packets.") |
73 | 75 |
74 (defvoo nnsoup-packet-regexp "Soupout" | 76 (defvoo nnsoup-packet-regexp "Soupout" |
75 "*Regular expression matching SOUP packets in `nnsoup-packet-directory'.") | 77 "*Regular expression matching SOUP packets in `nnsoup-packet-directory'.") |
76 | 78 |