* gnus-msg.el (gnus-msg-mail): COMPOSEFUNC should return t if

succeed.
(gnus-setup-message): Remove a hack.
* gnus-win.el (gnus-configure-windows): Make sure
nntp-server-buffer is live.
(gnus-remove-some-windows): switch-to-buffer -> set-buffer.

* gnus-msg.el (gnus-summary-mail-forward): Fix typos in description.

* gnus-msg.el (gnus-group-posting-charset-alist): No longer allow
raw 8-bit in headers in dk.* newsgroups.

3 files changed, 46 insertions, 24 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8923a3be90..16086b54ca 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,21 @@
+2000-12-04  ShengHuo ZHU  <[email protected]>
+
+	* gnus-msg.el (gnus-msg-mail): COMPOSEFUNC should return t if
+	succeed.
+	(gnus-setup-message): Remove a hack.
+	* gnus-win.el (gnus-configure-windows): Make sure
+	nntp-server-buffer is live.
+	(gnus-remove-some-windows): switch-to-buffer -> set-buffer.
+
+2000-12-04  Andreas Jaeger  <[email protected]>
+
+	* gnus-msg.el (gnus-summary-mail-forward): Fix typos in description.
+
+2000-11-17  Per Abrahamsen  <[email protected]>
+
+	* gnus-msg.el (gnus-group-posting-charset-alist): No longer allow
+	raw 8-bit in headers in dk.* newsgroups.
+
 2000-11-30  Dave Love  <[email protected]>
 
 	* message.el (message-auto-save-directory): Use
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index a8a734d8c8..55c9ecc57e 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -102,7 +102,7 @@ the second with the current group name.")
   "*Alist of styles to use when posting.")
 
 (defcustom gnus-group-posting-charset-alist
-  '(("^\\(no\\|fr\\|dk\\)\\.[^,]*\\(,[ \t\n]*\\(no\\|fr\\|dk\\)\\.[^,]*\\)*$" iso-8859-1 (iso-8859-1))
+  '(("^\\(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))
@@ -202,11 +202,6 @@ Thank you for your help in stamping out bugs.
   ;; "c" gnus-summary-send-draft
   "r" gnus-summary-resend-message)
 
-;;;###autoload
-(define-mail-user-agent 'gnus-user-agent
-      'gnus-msg-mail 'message-send-and-exit
-      'message-kill-buffer 'message-send-hook)
-
 ;;; Internal functions.
 
 (defvar gnus-article-reply nil)
@@ -237,12 +232,9 @@ Thank you for your help in stamping out bugs.
 	 (set (make-local-variable 'gnus-newsgroup-name) ,group)
 	 (gnus-run-hooks 'gnus-message-setup-hook)
 	 (if (eq major-mode 'message-mode)
-	     ;; Make mml-buffer-list local.
-	     ;; Restore global mml-buffer-list value as mbl.
-	     ;; What a hack! -- Shenghuo
-	     (let ((mml-buffer-list mml-buffer-list))
-	       (setq mml-buffer-list mbl)
-	       (make-local-variable 'mml-buffer-list)
+	     (let ((mbl1 mml-buffer-list))
+	       (setq mml-buffer-list mbl)  ;; Global value
+	       (set (make-local-variable 'mml-buffer-list) mbl1);; Local value
 	       (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t))
 	   (mml-destroy-buffers)
 	   (setq mml-buffer-list mbl)))
@@ -250,6 +242,22 @@ Thank you for your help in stamping out bugs.
        (gnus-configure-windows ,config t)
        (set-buffer-modified-p nil))))
 
+;;;###autoload
+(defun gnus-msg-mail (&rest args)
+  "Start editing a mail message to be sent.
+Like `message-mail', but with Gnus paraphernalia, particularly the
+Gcc: header for archiving purposes."
+  (interactive)
+  (gnus-setup-message 'message
+    (apply 'message-mail args))
+  ;; COMPOSEFUNC should return t if succeed.  Undocumented ???
+  t)
+
+;;;###autoload
+(define-mail-user-agent 'gnus-user-agent
+      'gnus-msg-mail 'message-send-and-exit
+      'message-kill-buffer 'message-send-hook)
+
 (defun gnus-setup-posting-charset (group)
   (let ((alist gnus-group-posting-charset-alist)
 	(group (or group ""))
@@ -425,15 +433,7 @@ header line with the old Message-ID."
 	       (gnus-cache-possibly-remove-article ,article nil nil nil t)
 	       (gnus-summary-mark-as-read ,article gnus-canceled-mark)))))
        message-send-actions))))
-
-;;;###autoload
-(defun gnus-msg-mail (&rest args)
-  "Start editing a mail message to be sent.
-Like `message-mail', but with Gnus paraphernalia, particularly the
-the Gcc: header for archiving purposes."
-  (interactive)
-  (gnus-setup-message 'message
-    (apply 'message-mail args)))
+
 
 
 (defun gnus-copy-article-buffer (&optional article-buffer)
@@ -701,9 +701,9 @@ The original article will be yanked."
   "Forward the current message to another user.  
 If ARG is nil, see `message-forward-as-mime' and `message-forward-show-mml';
 if ARG is 1, decode the message and forward directly inline;
-if ARG is 2, foward message as an rfc822 MIME section;
+if ARG is 2, forward message as an rfc822 MIME section;
 if ARG is 3, decode message and forward as an rfc822 MIME section;
-if ARG is 4, foward message directly inline;
+if ARG is 4, forward message directly inline;
 otherwise, use flipped `message-forward-as-mime'.
 If POST, post instead of mail."
   (interactive "P")
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 512cdd4c19..3abf46f5f3 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -432,6 +432,10 @@ See the Gnus manual for an explanation of the syntax used.")
 	  ;; put point in the assigned buffer, and do not touch the
 	  ;; winconf.
 	  (select-window all-visible)
+	
+	;; Make sure "the other" buffer, nntp-server-buffer, is live.
+	(unless (gnus-buffer-live-p nntp-server-buffer)
+	  (nnheader-init-server-buffer))
 
 	;; Either remove all windows or just remove all Gnus windows.
 	(let ((frame (selected-frame)))
@@ -536,7 +540,7 @@ should have point."
 		  lowest-buf buf))))
       (when lowest-buf
 	(pop-to-buffer lowest-buf)
-	(switch-to-buffer nntp-server-buffer))
+	(set-buffer nntp-server-buffer))
       (mapcar (lambda (b) (delete-windows-on b t)) bufs))))
 
 (provide 'gnus-win)