From 236cf46ceb416be77bb7126adbf7188203ee0f65 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 21 Nov 2000 01:52:40 +0000
Subject: [PATCH] Synch with Gnus. * lisp/message.el
 (message-send-mail-with-smtp): Use `smtp-send-buffer' if it
 exists instead of `smtp-via-smtp'. * lisp/dgnushack.el
 (describe-key-briefly): New compiler macro for old Emacsen.

---
 ChangeLog         |    8 ++++++++
 lisp/ChangeLog    |    4 ++++
 lisp/dgnushack.el |   15 +++++++++++++++
 lisp/gnus-ml.el   |    5 +++--
 lisp/message.el   |    9 ++++++---
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d51e1a6..4c1b39d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-21  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/message.el (message-send-mail-with-smtp): Use
+	`smtp-send-buffer' if it exists instead of `smtp-via-smtp'.
+
+	* lisp/dgnushack.el (describe-key-briefly): New compiler macro for
+	old Emacsen.
+
 2000-11-17  Akihiro Arisawa  <ari@atesoft.advantest.co.jp>
 
 	* lisp/nnheader.el (nnheader-header-value): Save point.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69e6d8f..8f08bc0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-20 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-ml.el (gnus-mailing-list-archive): Use browse-url.
+
 2000-11-20 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-art.el (gnus-article-make-menu-bar): Use easy-menu-add.
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 1fc7f53..5072a5d 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -473,4 +473,19 @@ Modify to suit your needs."))
 	(while (setq file (pop files))
 	  (insert "info/" file "\n"))))))
 
+
+(define-compiler-macro describe-key-briefly (&whole form key &optional insert)
+  (if (condition-case nil
+	  (progn
+	    (describe-key-briefly '((())) nil)
+	    t)
+	(wrong-number-of-arguments nil);; Old Emacsen.
+	(error t))
+      form
+    (if insert
+	`(if ,insert
+	     (insert (funcall 'describe-key-briefly ,key))
+	   (funcall 'describe-key-briefly ,key))
+      `(funcall 'describe-key-briefly ,key))))
+
 ;;; dgnushack.el ends here
diff --git a/lisp/gnus-ml.el b/lisp/gnus-ml.el
index 6dbcfa2..52c4442 100644
--- a/lisp/gnus-ml.el
+++ b/lisp/gnus-ml.el
@@ -137,11 +137,12 @@
 (defun gnus-mailing-list-archive ()
   "Browse archive"
   (interactive)
+  (require 'browse-url)
   (let ((list-archive 
 	 (with-current-buffer gnus-original-article-buffer
 	   (gnus-fetch-field "list-archive"))))
-    (cond (list-archive (gnus-mailing-list-message list-archive))
-	  (t (gnus-message 1 "no list-owner in this group")))))
+    (cond (list-archive (browse-url list-archive))
+	  (t (gnus-message 1 "no list-archive in this group")))))
 
 ;;; Utility functions
 
diff --git a/lisp/message.el b/lisp/message.el
index 903c429..ace7718 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3177,9 +3177,12 @@ to find out how to use this."
     (backward-char 1)
     (run-hooks 'message-send-mail-hook)
     (if recipients
-	(let ((result (smtp-via-smtp user-mail-address
-				     recipients
-				     (current-buffer))))
+	(let ((result (static-if (fboundp 'smtp-send-buffer)
+			  (smtp-send-buffer user-mail-address recipients
+					    (current-buffer))
+			(smtp-via-smtp user-mail-address
+				       recipients
+				       (current-buffer)))))
 	  (unless (eq result t)
 	    (error "Sending failed; " result)))
       (error "Sending failed; no recipients"))))
-- 
1.7.10.4