Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 440354d..fff12cf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-27  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-msg.el (posting-charset-alist): Use
+       gnus-define-group-parameter instead of defcustom.
+       (gnus-put-message): Handle SPC in GCC.
+       (gnus-inews-insert-gcc): Ditto.
+       (gnus-inews-insert-archive-gcc): Ditto.
+
 2002-08-26  Simon Josefsson  <jas@extundo.com>
 
        * gnus-agent.el (gnus-agent-auto-agentize-methods): New variable.

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 6bf7aaf..cdac772 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -165,12 +165,19 @@ If nil, attach files as normal parts."
                 (const all :tag "Any")
                 (string :tag "Regexp")))
 
-(defcustom gnus-group-posting-charset-alist
-  '(("^\\(no\\|fr\\)\\.[^,]*\\(,[ \t\n]*\\(no\\|fr\\)\\.[^,]*\\)*$" iso-8859-1 (iso-8859-1))
-    ("^\\(fido7\\|relcom\\)\\.[^,]*\\(,[ \t\n]*\\(fido7\\|relcom\\)\\.[^,]*\\)*$" koi8-r (koi8-r))
-    (message-this-is-mail nil nil)
-    (message-this-is-news nil t))
-  "Alist of regexps and permitted unencoded charsets for posting.
+(gnus-define-group-parameter
+ posting-charset-alist
+ :type list
+ :function-document
+ "Return the permitted unencoded charsets for posting of GROUP."
+ :variable gnus-group-posting-charset-alist
+ :variable-default
+ '(("^\\(no\\|fr\\)\\.[^,]*\\(,[ \t\n]*\\(no\\|fr\\)\\.[^,]*\\)*$" iso-8859-1 (iso-8859-1))
+   ("^\\(fido7\\|relcom\\)\\.[^,]*\\(,[ \t\n]*\\(fido7\\|relcom\\)\\.[^,]*\\)*$" koi8-r (koi8-r))
+   (message-this-is-mail nil nil)
+   (message-this-is-news nil t))
+ :variable-document
+ "Alist of regexps and permitted unencoded charsets for posting.
 Each element of the alist has the form (TEST HEADER BODY-LIST), where
 TEST is either a regular expression matching the newsgroup header or a
 variable to query,
@@ -182,22 +189,26 @@ nil (always encode using quoted-printable) or t (always use 8bit).
 
 Note that any value other than nil for HEADER infringes some RFCs, so
 use this option with care."
-  :type '(repeat (list :tag "Permitted unencoded charsets"
-                      (choice :tag "Where"
-                              (regexp :tag "Group")
-                              (const :tag "Mail message"
-                                     :value message-this-is-mail)
-                              (const :tag "News article"
-                                     :value message-this-is-news))
-                      (choice :tag "Header"
-                              (const :tag "None" nil)
-                              (symbol :tag "Charset"))
-                      (choice :tag "Body"
-                              (const :tag "Any" :value t)
-                              (const :tag "None" :value nil)
-                              (repeat :tag "Charsets"
-                                      (symbol :tag "Charset")))))
-  :group 'gnus-charset)
+ :variable-group gnus-charset
+ :variable-type
+ '(repeat (list :tag "Permitted unencoded charsets"
+               (choice :tag "Where"
+                       (regexp :tag "Group")
+                       (const :tag "Mail message" :value message-this-is-mail)
+                       (const :tag "News article" :value message-this-is-news))
+               (choice :tag "Header"
+                       (const :tag "None" nil)
+                       (symbol :tag "Charset"))
+               (choice :tag "Body"
+                       (const :tag "Any" :value t)
+                       (const :tag "None" :value nil)
+                       (repeat :tag "Charsets"
+                               (symbol :tag "Charset")))))
+ :parameter-type '(choice :tag "Permitted unencoded charsets"
+                         :value nil
+                         (repeat (symbol)))
+ :parameter-document       "\
+List of charsets that are permitted to be unencoded.")
 
 (defcustom gnus-debug-files
   '("gnus.el" "gnus-sum.el" "gnus-group.el"
@@ -1498,7 +1509,9 @@ The current group name will be inserted at \"%s\".")
               message-required-news-headers
             message-required-mail-headers)))
        (goto-char (point-max))
-       (insert "Gcc: " group "\n")
+       (if (string-match " " group)
+           (insert "Gcc: \"" group "\"\n")
+         (insert "Gcc: " group "\n"))
        (widen)))
     (gnus-inews-do-gcc)
     (when (and (get-buffer gnus-group-buffer)
@@ -1765,8 +1778,15 @@ this is a reply."
                    group))))
        (when gcc
          (insert "Gcc: "
-                 (if (stringp gcc) gcc
-                   (mapconcat 'identity gcc " "))
+                 (if (stringp gcc) 
+                     (if (string-match " " gcc)
+                         (concat "\"" gcc "\"")
+                       gcc)
+                   (mapconcat (lambda (group)
+                                (if (string-match " " group)
+                                    (concat "\"" group "\"")
+                                  group))
+                              gcc " "))
                  "\n"))))))
 
 (defun gnus-inews-insert-archive-gcc (&optional group)
@@ -1827,8 +1847,12 @@ this is a reply."
              (progn
                (insert
                 (if (stringp gcc-self-val)
-                    gcc-self-val
-                  group))
+                    (if (string-match " " gcc-self-val)
+                        (concat "\"" gcc-self-val "\"")
+                      gcc-self-val)
+                  (if (string-match " " group)
+                      (concat "\"" group "\"")
+                    group)))
                (if (not (eq gcc-self-val 'none))
                    (insert "\n")
                  (progn
@@ -1836,10 +1860,13 @@ this is a reply."
                    (kill-line))))
            ;; Use the list of groups.
            (while (setq name (pop groups))
-             (insert (if (string-match ":" name)
-                         name
-                       (gnus-group-prefixed-name
-                        name gnus-message-archive-method)))
+             (let ((str (if (string-match ":" name)
+                            name
+                          (gnus-group-prefixed-name
+                           name gnus-message-archive-method))))
+               (insert (if (string-match " " str)
+                           (concat "\"" str "\"")
+                         str)))
              (when groups
                (insert " ")))
            (insert "\n")))))))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 73d3614..fcc3f33 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-27  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Mail Source Specifiers): Fix :path default.
+
 2002-08-22  Jesper harder  <harder@ifa.au.dk>
 
        * gnus.texi (Summary Mail Commands): Add

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 8144a08..66e53e8 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -11966,8 +11966,9 @@ POP \e$B%a!<%k%5!<%P!<!"\e(Bprocmail \e$B%G%#%l%/%H%j!<!"\e(Bmaildir \e$B$J$I$,Nc$H$7
 
 @table @code
 @item :path
-\e$B%U%!%$%k$N%Q%9$G$9!#=i4|CM$O\e(B @code{MAIL} \e$B4D6-JQ?t$NCM$+!"\e(B
-@file{usr-mail/spool/user-name} \e$B$G$9!#\e(B
+\e$B%U%!%$%k$N%Q%9$G$9!#=i4|CM$O\e(B @code{MAIL} \e$B4D6-JQ?t$NCM\e(B
+\e$B$+\e(B @code{rmail-spool-directory} \e$B$NCM\e(B (\e$BIaDL\e(B
+\e$B$O\e(B @file{usr-mail/spool/user-name} \e$B$N$h$&$J$b$N\e(B) \e$B$G$9!#\e(B
 @end table
 
 \e$B%U%!%$%k%a!<%k%=!<%9$NNc\e(B:

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 19ae7e2..c17a85e 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12522,7 +12522,8 @@ Keywords:
 @table @code
 @item :path
 The path of the file.  Defaults to the value of the @code{MAIL}
-environment variable or @file{/usr/mail/spool/user-name}.
+environment variable or the value of @code{rmail-spool-directory}
+(usually something like @file{/usr/mail/spool/user-name}).
 @end table
 
 An example file mail source: