Synch to Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b4e7dc..b9439d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-12  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.el (gnus-kill-buffer): Move to gnus.el because it's
+       logically the complement of gnus-get-buffer-create and
+       gnus-add-buffer.
+
+       * gnus-util.el (gnus-kill-buffer): do.
+
+       * nnmail.el: Autoload gnus-kill-buffer.
+
 2002-02-11  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-summary-set-agent-mark): Added call to

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 71cc93e..551f264 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -131,13 +131,6 @@
        (funcall (if (stringp buffer) 'get-buffer 'buffer-name)
                buffer))))
 
-(defmacro gnus-kill-buffer (buffer)
-  `(let ((buf ,buffer))
-     (when (gnus-buffer-exists-p buf)
-       (when (boundp 'gnus-buffers)
-        (setq gnus-buffers (delete (get-buffer buf) gnus-buffers)))
-       (kill-buffer buf))))
-
 (static-cond
  ((fboundp 'point-at-bol)
   (defalias 'gnus-point-at-bol 'point-at-bol))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index fec355f..b7ac069 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -771,6 +771,13 @@ be set in `.emacs' instead."
   "Add the current buffer to the list of Gnus buffers."
   (push (current-buffer) gnus-buffers))
 
+(defmacro gnus-kill-buffer (buffer)
+  "Kill BUFFER and remove from the list of Gnus buffers."
+  `(let ((buf ,buffer))
+     (when (gnus-buffer-exists-p buf)
+       (setq gnus-buffers (delete (get-buffer buf) gnus-buffers))
+       (kill-buffer buf))))
+
 (defun gnus-buffers ()
   "Return a list of live Gnus buffers."
   (while (and gnus-buffers

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index e377b86..19de868 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -35,7 +35,8 @@
 (require 'mail-source)
 
 (eval-and-compile
-  (autoload 'gnus-add-buffer "gnus"))
+  (autoload 'gnus-add-buffer "gnus")
+  (autoload 'gnus-kill-buffer "gnus"))
 
 (defgroup nnmail nil
   "Reading mail with Gnus."