From fd016b3478402cef7dcd12b519825db5e402b33c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 31 Jan 2003 05:00:35 +0000 Subject: [PATCH] Synch to Oort Gnus. --- lisp/ChangeLog | 8 ++++++++ lisp/gnus-util.el | 3 ++- lisp/nnmail.el | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4bf44de..4068bcb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2003-01-31 Jesper Harder + + * gnus-util.el (gnus-kill-buffer): Functions in gnus-util + shouldn't depend on the rest of Gnus, so test if gnus-buffers is + bound. + + * nnmail.el (nnmail-cache-close): Use gnus-kill-buffer. + 2003-01-30 Jesper Harder * gnus-cite.el (gnus-cite-reply-regexp, gnus-cite-always-check): diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 41eec12..c99afca 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -134,7 +134,8 @@ (defmacro gnus-kill-buffer (buffer) `(let ((buf ,buffer)) (when (gnus-buffer-exists-p buf) - (setq gnus-buffers (delete buf gnus-buffers)) + (when (boundp 'gnus-buffers) + (setq gnus-buffers (delete buf gnus-buffers))) (kill-buffer buf)))) (static-cond diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 3607014..46a6076 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1,5 +1,5 @@ ;;; nnmail.el --- mail support functions for the Gnus mail backends -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -1474,7 +1474,7 @@ See the documentation for the variable `nnmail-split-fancy' for details." nnmail-message-id-cache-file nil 'silent) (set-buffer-modified-p nil) (setq nnmail-cache-buffer nil) - (kill-buffer (current-buffer))))) + (gnus-kill-buffer (current-buffer))))) ;; Compiler directives. (defvar group) -- 1.7.10.4