From: Miles Bader <miles@gnu.org>
Date: Fri, 19 Jan 2007 11:35:16 +0000 (+0000)
Subject: Merge from gnus--rel--5.10
X-Git-Tag: emacs-pretest-22.0.93~89
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b66f54c140ca6bb1c5dc4357c5ef3bdc984b80de;p=emacs.git

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a4860b1e21f..935fdd13a45 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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
diff --git a/lisp/gnus/nnsoup.el b/lisp/gnus/nnsoup.el
index e520121a266..739cb6ee1f3 100644
--- a/lisp/gnus/nnsoup.el
+++ b/lisp/gnus/nnsoup.el
@@ -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 @@ inserted where %d appears.")
   "*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"