From: yamaoka <yamaoka>
Date: Mon, 14 May 2001 23:05:58 +0000 (+0000)
Subject: * gnus.el: Require `base64' if `base64-encode-string' is not a built-in
X-Git-Tag: t-gnus-6_15_4-02-quimby~57
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45d26e0c41dfc30b19a3efde7f4fc8e483a31d2f;p=elisp%2Fgnus.git-

* gnus.el: Require `base64' if `base64-encode-string' is not a built-in
 function.
* dgnushack.el (dgnushack-bind-colon-keywords): Ignore `defgroup'.
---

diff --git a/ChangeLog b/ChangeLog
index 4d3963a..ca575cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2001-05-14  Katsumi Yamaoka <yamaoka@jpl.org>
 
+	* lisp/gnus.el: Require `base64' if `base64-encode-string' is not a
+	built-in function.
+
+	* lisp/dgnushack.el (dgnushack-bind-colon-keywords): Ignore
+	`defgroup'.
+
+2001-05-14  Katsumi Yamaoka <yamaoka@jpl.org>
+
 	* lisp/gnus-vers.el (gnus-revision-number): Increment to 01.
 
 	* lisp/nnmail.el: Don't bind the colon keywords here.
@@ -10,6 +18,7 @@
 	(dgnushack-colon-keywords): New constant which will have the colon
 	keywords shuld be bound at run-time for old Emacsen; cache them in
 	the file dgnuskwds.el and bind them.
+	(dgnushack-bind-colon-keywords): New function.
 	(locate-library): Make the function to be silent for Mule.
 	* lisp/Makefile.in (clean): Remove dgnuskwds.el.
 
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 676ad2d..b7c55fa 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -295,8 +295,9 @@ to the specified name LIBRARY (a la calling `load' instead of `load-library')."
 		   (while form
 		     (setq elem (pop form))
 		     (unless (memq (car-safe elem)
-				   '(\` backquote defcustom define-widget
-				     quote widget-convert-button
+				   '(\` backquote defcustom defgroup
+				     define-widget quote
+				     widget-convert-button
 				     widget-create widget-put))
 		       (while (consp elem)
 			 (push (car elem) form)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 72b9a5b..7e2ed03 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2119,6 +2119,10 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
       (autoload 'smiley-toggle-buffer "gnus-bitmap")
       (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule"))))
 
+(unless (and (fboundp 'base64-encode-string)
+	     (subrp (symbol-function 'base64-encode-string)))
+  (require 'base64))
+
 ;;; gnus-sum.el thingies