From 6084501f6aa2b05b1b718865e9b2fa097c5ee863 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 1 Jun 2005 05:08:12 +0000 Subject: [PATCH] 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 --- lisp/ChangeLog | 7 ++++--- lisp/gnus-group.el | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 858523e8a..1874b726e 100644 --- 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 4eb11111d..ab674907e 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)) -- 2.34.1