From: yamaoka <yamaoka>
Date: Wed, 1 Jun 2005 05:51:17 +0000 (+0000)
Subject: Synch to No Gnus 200506010548.
X-Git-Tag: t-gnus-6_17_4-quimby-~479
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bb4be177ea7af2fc460eb1d259182f3e721501b;p=elisp%2Fgnus.git-

Synch to No Gnus 200506010548.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8e8968..06ce7b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,3 @@
-2005-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-	* lpath.el: Fbind ldap-search-entries.
-
-	* gnus-util.el (gnus-set-process-query-on-exit-flag): Use defalias.
-
-	* starttls.el (starttls-set-process-query-on-exit-flag): Ditto.
-
 2005-05-31  Simon Josefsson  <jas@extundo.com>
 
 	* smime.el (smime-replace-in-string): Define.
@@ -16,7 +8,8 @@
 	* gnus-art.el (article-display-x-face): Replace
 	process-kill-without-query by gnus-set-process-query-on-exit-flag.
 
-	* gnus-util.el (gnus-set-process-query-on-exit-flag): New function.
+	* gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
+	set-process-query-on-exit-flag or process-kill-without-query.
 
 	* html2text.el (html2text-fix-paragraphs): Use `while - re-search'
 	loop instead of replace-regexp.
@@ -24,6 +17,8 @@
 	* imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
 	instead of process-kill-without-query if it is available.
 
+	* lpath.el: Fbind ldap-search-entries.
+
 	* mm-util.el (mm-insert-file-contents): Bind find-file-hook
 	instead of find-file-hooks if it is available.
 
@@ -43,8 +38,8 @@
 	(nntp-open-ssl-stream): Ditto.
 	(nntp-open-tls-stream): Ditto.
 
-	* starttls.el (starttls-set-process-query-on-exit-flag): New
-	function.
+	* starttls.el (starttls-set-process-query-on-exit-flag): Alias to
+	set-process-query-on-exit-flag or process-kill-without-query.
 	(starttls-open-stream-gnutls): Use it instead of
 	process-kill-without-query.
 	(starttls-open-stream): Ditto.
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index fea6f38..403728a 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -41,7 +41,7 @@
 (require 'time-date)
 (require 'gnus-ems)
 
-(eval-when-compile 
+(eval-when-compile
   (require 'mm-url)
   (let ((features (cons 'gnus-group features)))
     (require 'gnus-sum))