Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 601, 604)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 193-196)

   - Update from CVS
   - Merge from emacs--devo--0

2007-01-23  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix
   custom choice.

   * lisp/gnus-art.el (gnus-signature-limit): Fix custom choice.

2007-01-12  Kenichi Handa  <handa@m17n.org>

   * lisp/uudecode.el (uudecode-decode-region-internal): Make it work in a
   multibyte buffer.

2007-01-19  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/nnsoup.el (nnsoup-directory, nnsoup-packer, nnsoup-packet-directory):
   Use gnus-home-directory instead of "~/" or "$HOME".

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-282

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67b8807..b7fc686 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix
+       custom choice.
+
+       * gnus-art.el (gnus-signature-limit): Fix custom choice.
+
 2007-01-22  Daiki Ueno  <ueno@unixuser.org>
 
        * mm-util.el (mm-inhibit-file-name-handlers): Add epa-file-handler.
@@ -19,6 +26,16 @@
        * spam.el (spam-bsfilter-ham-switch): Fix typo.
        Thanks to Yoshihiko Yamada for kind notification of this typo.
 
+2007-01-12  Kenichi Handa  <handa@m17n.org>
+
+       * uudecode.el (uudecode-decode-region-internal): Make it work in a
+       multibyte buffer.
+
+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-14  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-score.el (gnus-score-fast-scoring): New variable.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 07a5dd3..eb080ef 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -252,7 +252,7 @@ This can also be a list of the above values."
   :type '(choice (const nil)
                 (integer :value 200)
                 (number :value 4.0)
-                (function :value fun)
+                function
                 (regexp :value ".*"))
   :group 'gnus-article-signature)
 

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 6dcb6bd..4ca28b8 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -208,10 +208,10 @@ It can be:
   :type '(choice string
                 (repeat (choice string
                                 (cons regexp (repeat file))
-                                (function :value fun)))
+                                function))
                 (function-item gnus-hierarchial-home-score-file)
                 (function-item gnus-current-home-score-file)
-                (function :value fun)))
+                function))
 
 (defcustom gnus-home-adapt-file nil
   "Variable to control where new adaptive score entries are to go.
@@ -221,8 +221,8 @@ This variable allows the same syntax as `gnus-home-score-file'."
   :type '(choice string
                 (repeat (choice string
                                 (cons regexp (repeat file))
-                                (function :value fun)))
-                (function :value fun)))
+                                function))
+                function))
 
 (defcustom gnus-default-adaptive-score-alist
   `((gnus-kill-file-mark)

diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el
index 76b7c42..227de9a 100644 (file)
--- a/lisp/nnsoup.el
+++ b/lisp/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"

diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index 58de12a..374ee26 100644 (file)
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -203,7 +203,10 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
                (insert (apply 'concat (nreverse result)))))
          (or (markerp end) (setq end (set-marker (make-marker) end)))
          (goto-char start)
-         (insert (apply 'concat (nreverse result)))
+         (if enable-multibyte-characters
+             (mapc #'(lambda (x) (insert (string-to-multibyte x)))
+                   (nreverse result))
+           (insert (apply 'concat (nreverse result))))
          (delete-region (point) end))))))
 
 ;;;###autoload

diff --git a/texi/pgg.texi b/texi/pgg.texi
index 891f44d..a578e49 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -8,8 +8,8 @@
 @copying
 This file describes PGG, an Emacs interface to various PGP implementations.
 
-Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-Copyright @copyright{} 2001 Daiki Ueno.
+Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007  Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document