Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-129

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 77-78)

   - Update from CVS

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 858523e..1874b72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,7 +16,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.
@@ -43,8 +44,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 4eb1111..ab67490 100644 (file)
--- 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))