Update

diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el
index b45b119..24142e5 100644 (file)
--- a/lisp/gnus-i18n.el
+++ b/lisp/gnus-i18n.el
@@ -62,6 +62,7 @@ newsgroup name.  SYMBOL is MIME charset or coding-system.")
   "Set up `default-mime-charset' of summary buffer.
 It is specified by variable `gnus-newsgroup-default-charset-alist'
 \(cf. function `gnus-set-newsgroup-default-charset')."
+  ;; We are in `nntp-server-buffer' now.
   (if (buffer-live-p gnus-summary-buffer)
       (let* ((qgroup (save-excursion
                       (set-buffer gnus-summary-buffer)
@@ -84,13 +85,23 @@ It is specified by variable `gnus-newsgroup-default-charset-alist'
        (if charset
            (progn
              (save-excursion
+               ;; Set `default-mime-charset' in summary buffer.
                (set-buffer gnus-summary-buffer)
                (make-local-variable 'default-mime-charset)
                (setq default-mime-charset charset))
+             ;; Also set `default-mime-charset' in current buffer.
              (make-local-variable 'default-mime-charset)
              (setq default-mime-charset charset))
+         ;; Reset `default-mime-charset' in current buffer.
          (kill-local-variable 'default-mime-charset)))))
 
+(defun gnus-get-summary-default-charset ()
+  "Get the value of `default-mime-charset' from summary buffer."
+  (and (buffer-live-p gnus-summary-buffer)
+       (save-excursion
+        (set-buffer gnus-summary-buffer)
+        default-mime-charset)))
+
 
 ;;; @ end
 ;;;

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 0e52f33..1294f6a 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -282,6 +282,11 @@
        (if (equal val ,ignore-value)
           "" val))))
 
+;;; dummy function. XEmacs will redefine this.
+(defun gnus-tilde-pad-form (el pad-width)
+  "Return a form that pads EL to PAD-WIDTH."
+  )
+
 (defun gnus-parse-format (format spec-alist &optional insert)
   ;; This function parses the FORMAT string with the help of the
   ;; SPEC-ALIST and returns a list that can be eval'ed to return the

diff --git a/lisp/message.el b/lisp/message.el
index af1c78d..b1720fd 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3164,7 +3164,7 @@ give as trustworthy answer as possible."
            "")                         ; not Meadow
          )))
     (if message-user-agent
-       (concat message-user-agent " " user-agent)
+       (concat message-user-agent "\n " user-agent)
       user-agent)))
 
 (defun message-generate-headers (headers)