Make sure that all gnus buffers are killed on exit

* lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags-server):
Use `gnus-get-buffer-create' instead of `get-buffer-create'
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-write-file): Likewise.
(gnus-bookmark-bmenu-list): Likewise.
(gnus-bookmark-show-details): Likewise.
* lisp/gnus/gnus-draft.el (gnus-draft-setup): Likewise.
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-reply): Likewise.
* lisp/gnus/gnus-int.el (gnus-backend-trace): Likewise.
* lisp/gnus/gnus-srvr.el (gnus-enter-server-buffer): Likewise.
* lisp/gnus/gnus-sum.el (gnus-summary-pipe-output): Likewise.
* lisp/gnus/gnus-util.el (gnus-output-to-rmail): Likewise.
(gnus-output-to-mail): Likewise.
(gnus-multiple-choice): Likewise.
* lisp/gnus/mail-source.el (mail-source-call-script): Likewise.
* lisp/gnus/message.el (message-cancel-news): Likewise.
(message-resend): Likewise.
* lisp/gnus/mm-archive.el (mm-dissect-archive): Likewise.
* lisp/gnus/mml1991.el (mml1991-mailcrypt-sign): Likewise.
(mml1991-mailcrypt-encrypt): Likewise.
* lisp/gnus/mml2015.el (mml2015-mailcrypt-verify): Likewise.
(mml2015-mailcrypt-clear-verify): Likewise.
* lisp/gnus/nnbabyl.el (nnbabyl-request-move-article): Likewise.
* lisp/gnus/nndiary.el (nndiary-request-move-article): Likewise.
(nndiary-find-group-number): Likewise.
(nndiary-open-nov): Likewise.
(nndiary-generate-nov-file): Likewise.
* lisp/gnus/nndoc.el (nndoc-possibly-change-buffer): Likewise.
* lisp/gnus/nndraft.el (nndraft-request-move-article): Likewise.
(nndraft-auto-save-file-name): Likewise.
* lisp/gnus/nneething.el (nneething-get-head): Likewise.
* lisp/gnus/nnfolder.el (nnfolder-request-move-article): Likewise.
(nnfolder-open-nov): Likewise.
* lisp/gnus/nnheader.el (nnheader-init-server-buffer): Likewise.
(nnheader-set-temp-buffer): Likewise.
* lisp/gnus/nnimap.el (nnimap-log-buffer): Likewise.
* lisp/gnus/nnir.el (nnir-run-swish++): Likewise.
(nnir-run-swish-e): Likewise.
(nnir-run-hyrex): Likewise.
(nnir-run-namazu): Likewise.
(nnir-run-notmuch): Likewise.
(nnir-run-find-grep): Likewise.
* lisp/gnus/nnmail.el (nnmail-split-incoming): Likewise.
(nnmail-cache-open): Likewise.
(nnmail-log-split): Likewise.
* lisp/gnus/nnmaildir.el (nnmaildir--with-work-buffer): Likewise.
(nnmaildir--with-nov-buffer): Likewise.
(nnmaildir--with-move-buffer): Likewise.
* lisp/gnus/nnmairix.el (nnmairix-call-mairix-binary): Likewise.
(nnmairix-call-mairix-binary-raw): Likewise.
(nnmairix-replace-group-and-numbers): Likewise.
* lisp/gnus/nnmbox.el (nnmbox-request-move-article): Likewise.
* lisp/gnus/nnmh.el (nnmh-request-move-article): Likewise.
* lisp/gnus/nnml.el (nnml-request-move-article): Likewise.
(nnml-find-group-number): Likewise.
(nnml-get-nov-buffer): Likewise.
(nnml-generate-nov-file): Likewise.
* lisp/gnus/nnrss.el (nnrss-opml-export): Likewise.
* lisp/gnus/nntp.el (nntp-record-command): Likewise.
* lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers): Likewise.
* lisp/gnus/smime.el (smime-new-details-buffer): Likewise.
(smime-certificate-info): Likewise.
(smime): Likewise.
* lisp/gnus/spam-stat.el (spam-stat-store-current-buffer): Likewise.

33 files changed, 67 insertions, 68 deletions

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 9f22b7df0ff..80bf21bb443 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -799,7 +799,7 @@ be a select method."
   (let ((gnus-command-method method)
         (gnus-agent nil))
     (when (file-exists-p (gnus-agent-lib-file "flags"))
-      (set-buffer (get-buffer-create " *Gnus Agent flag synchronize*"))
+      (set-buffer (gnus-get-buffer-create " *Gnus Agent flag synchronize*"))
       (erase-buffer)
       (nnheader-insert-file-contents (gnus-agent-lib-file "flags"))
       (cond ((null gnus-plugged)
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index ea4af2df0c4..1b00bbbc69c 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -242,7 +242,7 @@ So the cdr of each bookmark is an alist too.")
     (save-window-excursion
       ;; Avoid warnings?
       ;; (message "Saving Gnus bookmarks to file %s..." gnus-bookmark-default-file)
-      (set-buffer (get-buffer-create  " *Gnus bookmarks*"))
+      (set-buffer (gnus-get-buffer-create  " *Gnus bookmarks*"))
       (erase-buffer)
       (gnus-bookmark-insert-file-format-version-stamp)
       (pp gnus-bookmark-alist (current-buffer))
@@ -357,8 +357,8 @@ deletion, or > if it is flagged for displaying."
   (interactive)
   (gnus-bookmark-maybe-load-default-file)
   (if (called-interactively-p 'any)
-      (switch-to-buffer (get-buffer-create "*Gnus Bookmark List*"))
-    (set-buffer (get-buffer-create "*Gnus Bookmark List*")))
+      (switch-to-buffer (gnus-get-buffer-create "*Gnus Bookmark List*"))
+    (set-buffer (gnus-get-buffer-create "*Gnus Bookmark List*")))
   (let ((inhibit-read-only t)
         alist name start end)
     (erase-buffer)
@@ -648,7 +648,7 @@ reposition and try again, else return nil."
         (details gnus-bookmark-bookmark-details)
         detail)
     (save-excursion
-      (pop-to-buffer (get-buffer-create "*Gnus Bookmark Annotation*") t)
+      (pop-to-buffer (gnus-get-buffer-create "*Gnus Bookmark Annotation*") t)
       (erase-buffer)
       (while details
         (setq detail (pop details))
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 1b25d247389..3a9bf2a7e8f 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -248,7 +248,7 @@ If DONT-POP is nil, display the buffer after setting it up."
       (let ((article narticle))
         (message-mail nil nil nil nil
                       (if dont-pop
-                          (lambda (buf) (set-buffer (get-buffer-create buf)))))
+                          (lambda (buf) (set-buffer (gnus-get-buffer-create buf)))))
         (let ((inhibit-read-only t))
           (erase-buffer))
         (if (not (gnus-request-restore-buffer article group))
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index ee556a32080..305e17fd8fc 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -814,7 +814,7 @@ These will be used to retrieve the RSVP information from ical events."
         (let ((subject (concat (capitalize (symbol-name status))
                                ": " (gnus-icalendar-event:summary event))))
 
-          (with-current-buffer (get-buffer-create gnus-icalendar-reply-bufname)
+          (with-current-buffer (gnus-get-buffer-create gnus-icalendar-reply-bufname)
             (delete-region (point-min) (point-max))
             (insert reply)
             (fold-icalendar-buffer)
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index c304f575d92..60ebc07c343 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -253,7 +253,7 @@ If it is down, start it up (again)."
 
 (defun gnus-backend-trace (type form)
   (when gnus-backend-trace
-    (with-current-buffer (get-buffer-create "*gnus trace*")
+    (with-current-buffer (gnus-get-buffer-create "*gnus trace*")
       (buffer-disable-undo)
       (goto-char (point-max))
       (insert (format-time-string "%H:%M:%S")
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index d58bd7a73b5..095e05408d6 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -309,7 +309,7 @@ The following commands are available:
   ;; `gnus-server-buffer' selected as the current buffer, but not always (I
   ;; bumped into it when starting from a dedicated *Group* frame, and
   ;; gnus-configure-windows opened *Server* into its own dedicated frame).
-  (with-current-buffer (get-buffer-create gnus-server-buffer)
+  (with-current-buffer (gnus-get-buffer-create gnus-server-buffer)
     (gnus-server-mode)
     (gnus-server-prepare)))
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index a40e563e755..65a02638906 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -12310,7 +12310,7 @@ no matter what the properties `:decode' and `:headers' are."
                                           (buffer-string))))))
       (put 'gnus-summary-save-in-pipe :headers headers))
     (unless (zerop (length result))
-      (if (with-current-buffer (get-buffer-create result-buffer)
+      (if (with-current-buffer (gnus-get-buffer-create result-buffer)
             (erase-buffer)
             (insert result)
             (prog1
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 23c62b4f939..eb0fd2522d3 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -950,7 +950,7 @@ FILENAME exists and is Babyl format."
       (setq rmail-default-rmail-file filename) ; 22
     (setq rmail-default-file filename))        ; 23
   (let ((artbuf (current-buffer))
-        (tmpbuf (get-buffer-create " *Gnus-output*"))
+        (tmpbuf (gnus-get-buffer-create " *Gnus-output*"))
         ;; Babyl rmail.el defines this, mbox does not.
         (babyl (fboundp 'rmail-insert-rmail-file-header)))
     (save-excursion
@@ -1036,7 +1036,7 @@ FILENAME exists and is Babyl format."
   (require 'nnmail)
   (setq filename (expand-file-name filename))
   (let ((artbuf (current-buffer))
-        (tmpbuf (get-buffer-create " *Gnus-output*")))
+        (tmpbuf (gnus-get-buffer-create " *Gnus-output*")))
     (save-excursion
       ;; Create the file, if it doesn't exist.
       (when (and (not (get-file-buffer filename))
@@ -1457,7 +1457,7 @@ CHOICE is a list of the choice char and help message at IDX."
           (setq tchar (read-char))
           (when (not (assq tchar choice))
             (setq tchar nil)
-            (setq buf (get-buffer-create "*Gnus Help*"))
+            (setq buf (gnus-get-buffer-create "*Gnus Help*"))
             (pop-to-buffer buf)
             (fundamental-mode)
             (buffer-disable-undo)
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 52343d4fa37..bda321fcc48 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -742,7 +742,7 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
 
 (defun mail-source-call-script (script)
   (let ((background nil)
-        (stderr (get-buffer-create " *mail-source-stderr*"))
+        (stderr (gnus-get-buffer-create " *mail-source-stderr*"))
         result)
     (when (string-match "& *$" script)
       (setq script (substring script 0 (match-beginning 0))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index adefa0efd65..c61fb5ae588 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7310,7 +7310,7 @@ If ARG, allow editing of the cancellation message."
         ;; Make control message.
         (if arg
             (message-news)
-          (setq buf (set-buffer (get-buffer-create " *message cancel*"))))
+          (setq buf (set-buffer (gnus-get-buffer-create " *message cancel*"))))
         (erase-buffer)
         (insert "Newsgroups: " newsgroups "\n"
                 "From: " from "\n"
@@ -7731,7 +7731,7 @@ is for the internal use."
           gcc beg)
       ;; We first set up a normal mail buffer.
       (unless (message-mail-user-agent)
-        (set-buffer (get-buffer-create " *message resend*"))
+        (set-buffer (gnus-get-buffer-create " *message resend*"))
         (let ((inhibit-read-only t))
           (erase-buffer)))
       (let ((message-this-is-mail t)
diff --git a/lisp/gnus/mm-archive.el b/lisp/gnus/mm-archive.el
index 6b4308e9790..61eec859791 100644
--- a/lisp/gnus/mm-archive.el
+++ b/lisp/gnus/mm-archive.el
@@ -56,7 +56,7 @@
                          (append (cdr decoder) (list dir)))
                   (delete-file file))
               (apply 'call-process-region (point-min) (point-max) (car decoder)
-                     nil (get-buffer-create "*tnef*")
+                     nil (gnus-get-buffer-create "*tnef*")
                      nil (append (cdr decoder) (list dir)))))
           `("multipart/mixed"
             ,handle
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 8be1b84e52f..c777053dcd5 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -85,7 +85,7 @@ Whether the passphrase is cached at all is controlled by
 (defun mml1991-mailcrypt-sign (cont)
   (let ((text (current-buffer))
         headers signature
-        (result-buffer (get-buffer-create "*GPG Result*")))
+        (result-buffer (gnus-get-buffer-create "*GPG Result*")))
     ;; Save MIME Content[^ ]+: headers from signing
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
@@ -130,7 +130,7 @@ Whether the passphrase is cached at all is controlled by
                             'not))))
              'never))
         cipher
-        (result-buffer (get-buffer-create "*GPG Result*")))
+        (result-buffer (gnus-get-buffer-create "*GPG Result*")))
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 1e72f681797..1c4213d888e 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -330,7 +330,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
               (replace-match "-----BEGIN PGP SIGNATURE-----" t t))
           (if (re-search-forward "^-----END PGP [^-]+-----\r?$" nil t)
               (replace-match "-----END PGP SIGNATURE-----" t t)))
-        (let ((mc-gpg-debug-buffer (get-buffer-create " *gnus gpg debug*")))
+        (let ((mc-gpg-debug-buffer (gnus-get-buffer-create " *gnus gpg debug*")))
           (unless (condition-case err
                       (prog1
                           (funcall mml2015-verify-function)
@@ -359,7 +359,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
       handle)))
 
 (defun mml2015-mailcrypt-clear-verify ()
-  (let ((mc-gpg-debug-buffer (get-buffer-create " *gnus gpg debug*")))
+  (let ((mc-gpg-debug-buffer (gnus-get-buffer-create " *gnus gpg debug*")))
     (if (condition-case err
             (prog1
                 (funcall mml2015-verify-function)
diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index 6890f1dceeb..cb22933b529 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -293,7 +293,7 @@
 
 (deffoo nnbabyl-request-move-article
     (article group server accept-form &optional last move-is-internal)
-  (let ((buf (get-buffer-create " *nnbabyl move*"))
+  (let ((buf (gnus-get-buffer-create " *nnbabyl move*"))
         result)
     (and
      (nnbabyl-request-article article group server)
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 24a3df1e27a..ac394ae53d7 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -597,7 +597,7 @@ all.  This may very well take some time.")
 
 (deffoo nndiary-request-move-article
     (article group server accept-form &optional last move-is-internal)
-  (let ((buf (get-buffer-create " *nndiary move*"))
+  (let ((buf (gnus-get-buffer-create " *nndiary move*"))
         result)
     (nndiary-possibly-change-directory group server)
     (nndiary-update-file-alist)
@@ -831,7 +831,7 @@ all.  This may very well take some time.")
 
 ;; Find an article number in the current group given the Message-ID.
 (defun nndiary-find-group-number (id)
-  (with-current-buffer (get-buffer-create " *nndiary id*")
+  (with-current-buffer (gnus-get-buffer-create " *nndiary id*")
     (let ((alist nndiary-group-alist)
           number)
       ;; We want to look through all .overview files, but we want to
@@ -999,8 +999,8 @@ all.  This may very well take some time.")
 
 (defun nndiary-open-nov (group)
   (or (cdr (assoc group nndiary-nov-buffer-alist))
-      (let ((buffer (get-buffer-create (format " *nndiary overview %s*"
-                                               group))))
+      (let ((buffer (gnus-get-buffer-create
+                     (format " *nndiary overview %s*" group))))
         (with-current-buffer buffer
           (set (make-local-variable 'nndiary-nov-buffer-file-name)
                (expand-file-name
@@ -1086,7 +1086,7 @@ all.  This may very well take some time.")
 (defun nndiary-generate-nov-file (dir files)
   (let* ((dir (file-name-as-directory dir))
          (nov (concat dir nndiary-nov-file-name))
-         (nov-buffer (get-buffer-create " *nov*"))
+         (nov-buffer (gnus-get-buffer-create " *nov*"))
          chars file headers)
     ;; Init the nov buffer.
     (with-current-buffer nov-buffer
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el
index 0ba63915c94..36b67a8fd13 100644
--- a/lisp/gnus/nndoc.el
+++ b/lisp/gnus/nndoc.el
@@ -347,7 +347,7 @@ from the document.")
                (file-exists-p nndoc-address)
                (not (file-directory-p nndoc-address))))
       (push (cons group (setq nndoc-current-buffer
-                              (get-buffer-create
+                              (gnus-get-buffer-create
                                (concat " *nndoc " group "*"))))
             nndoc-group-alist)
       (setq nndoc-dissection-alist nil)
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 3ee86a696cb..e5dda990d6b 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -231,7 +231,7 @@ are generated if and only if they are also in `message-draft-headers'."
 (deffoo nndraft-request-move-article (article group server accept-form
                                       &optional last move-is-internal)
   (nndraft-possibly-change-group group)
-  (let ((buf (get-buffer-create " *nndraft move*"))
+  (let ((buf (gnus-get-buffer-create " *nndraft move*"))
         result)
     (and
      (nndraft-request-article article group server)
@@ -325,7 +325,7 @@ are generated if and only if they are also in `message-draft-headers'."
   (save-excursion
     (prog1
         (progn
-          (set-buffer (get-buffer-create " *draft tmp*"))
+          (set-buffer (gnus-get-buffer-create " *draft tmp*"))
           (setq buffer-file-name file)
           (make-auto-save-file-name))
       (kill-buffer (current-buffer)))))
diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el
index 9e190515f18..9f1fdbae5ae 100644
--- a/lisp/gnus/nneething.el
+++ b/lisp/gnus/nneething.el
@@ -381,7 +381,7 @@ included.")
 
 (defun nneething-get-head (file)
   "Either find the head in FILE or make a head for FILE."
-  (with-current-buffer (get-buffer-create nneething-work-buffer)
+  (with-current-buffer (gnus-get-buffer-create nneething-work-buffer)
     (setq case-fold-search nil)
     (buffer-disable-undo)
     (erase-buffer)
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 342ac48ba85..d1eeb04697e 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -465,7 +465,7 @@ all.  This may very well take some time.")
 (deffoo nnfolder-request-move-article (article group server accept-form
                                                &optional last move-is-internal)
   (save-excursion
-    (let ((buf (get-buffer-create " *nnfolder move*"))
+    (let ((buf (gnus-get-buffer-create " *nnfolder move*"))
           result)
       (and
        (nnfolder-request-article article group server)
@@ -1096,7 +1096,7 @@ This command does not work if you use short group names."
 
 (defun nnfolder-open-nov (group)
   (or (cdr (assoc group nnfolder-nov-buffer-alist))
-      (let ((buffer (get-buffer-create (format " *nnfolder overview %s*" group))))
+      (let ((buffer (gnus-get-buffer-create (format " *nnfolder overview %s*" group))))
         (with-current-buffer buffer
           (set (make-local-variable 'nnfolder-nov-buffer-file-name)
                (nnfolder-group-nov-pathname group))
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index bf3a5c1372a..e124bf1f6a9 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -505,7 +505,7 @@ the line could be found."
 (defun nnheader-init-server-buffer ()
   "Initialize the Gnus-backend communication buffer."
   (unless (gnus-buffer-live-p nntp-server-buffer)
-    (setq nntp-server-buffer (get-buffer-create " *nntpd*")))
+    (setq nntp-server-buffer (gnus-get-buffer-create " *nntpd*")))
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (mm-enable-multibyte)
@@ -630,7 +630,7 @@ the line could be found."
 
 (defun nnheader-set-temp-buffer (name &optional noerase)
   "Set-buffer to an empty (possibly new) buffer called NAME with undo disabled."
-  (set-buffer (get-buffer-create name))
+  (set-buffer (gnus-get-buffer-create name))
   (buffer-disable-undo)
   (unless noerase
     (erase-buffer))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c383e0146f3..3c4e75ede82 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1937,7 +1937,7 @@ Return the server's response to the SELECT or EXAMINE command."
 (defun nnimap-log-buffer ()
   (let ((name "*imap log*"))
     (or (get-buffer name)
-        (with-current-buffer (get-buffer-create name)
+        (with-current-buffer (gnus-get-buffer-create name)
           (setq-local window-point-insertion-type t)
           (current-buffer)))))
 
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 823bc2b423e..0f364d66e1a 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1234,7 +1234,7 @@ Windows NT 4.0."
       (when (equal "" qstring)
         (error "swish++: You didn't enter anything"))
 
-      (set-buffer (get-buffer-create nnir-tmp-buffer))
+      (set-buffer (gnus-get-buffer-create nnir-tmp-buffer))
       (erase-buffer)
 
       (if groupspec
@@ -1316,7 +1316,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
       (when (equal "" qstring)
         (error "swish-e: You didn't enter anything"))
 
-      (set-buffer (get-buffer-create nnir-tmp-buffer))
+      (set-buffer (gnus-get-buffer-create nnir-tmp-buffer))
       (erase-buffer)
 
       (message "Doing swish-e query %s..." query)
@@ -1401,7 +1401,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
         (setq groupspec
               (regexp-opt
                (mapcar (lambda (x) (gnus-group-real-name x)) group))))
-      (set-buffer (get-buffer-create nnir-tmp-buffer))
+      (set-buffer (gnus-get-buffer-create nnir-tmp-buffer))
       (erase-buffer)
       (message "Doing hyrex-search query %s..." query)
       (let* ((cp-list
@@ -1480,7 +1480,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
           score group article
           (process-environment (copy-sequence process-environment)))
       (setenv "LC_MESSAGES" "C")
-      (set-buffer (get-buffer-create nnir-tmp-buffer))
+      (set-buffer (gnus-get-buffer-create nnir-tmp-buffer))
       (erase-buffer)
       (let* ((cp-list
               `( ,nnir-namazu-program
@@ -1561,7 +1561,7 @@ construct path: search terms (see the variable
       (when (equal "" qstring)
         (error "notmuch: You didn't enter anything"))
 
-      (set-buffer (get-buffer-create nnir-tmp-buffer))
+      (set-buffer (gnus-get-buffer-create nnir-tmp-buffer))
       (erase-buffer)
 
       (if groups
@@ -1635,7 +1635,7 @@ construct path: search terms (see the variable
                  (message "Searching %s using find-grep..."
                           (or group server))
                  (save-window-excursion
-                   (set-buffer (get-buffer-create nnir-tmp-buffer))
+                   (set-buffer (gnus-get-buffer-create nnir-tmp-buffer))
                    (if (> gnus-verbose 6)
                        (pop-to-buffer (current-buffer)))
                    (cd directory) ; Using relative paths simplifies
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index d64d0ed0006..6e01b5c4d0b 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1047,7 +1047,7 @@ will be copied over from that buffer."
                                   (list (list group ""))
                                 nnmail-split-methods)))
     ;; Insert the incoming file.
-    (with-current-buffer (get-buffer-create nnmail-article-buffer)
+    (with-current-buffer (gnus-get-buffer-create nnmail-article-buffer)
       (erase-buffer)
       (if (bufferp incoming)
           (insert-buffer-substring incoming)
@@ -1574,7 +1574,7 @@ See the documentation for the variable `nnmail-split-fancy' for details."
       ()                                ; The buffer is open.
     (with-current-buffer
        (setq nnmail-cache-buffer
-             (get-buffer-create " *nnmail message-id cache*"))
+             (gnus-get-buffer-create " *nnmail message-id cache*"))
       (gnus-add-buffer)
       (when (file-exists-p nnmail-message-id-cache-file)
         (nnheader-insert-file-contents nnmail-message-id-cache-file))
@@ -2065,7 +2065,7 @@ Doesn't change point."
   (when nnmail-split-tracing
     (push split nnmail-split-trace))
   (when nnmail-debug-splitting
-    (with-current-buffer (get-buffer-create "*nnmail split*")
+    (with-current-buffer (gnus-get-buffer-create "*nnmail split*")
       (goto-char (point-max))
       (insert (format-time-string "%FT%T")
               " "
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index b0e79d4f238..bf1ac31bb3c 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -269,15 +269,15 @@ This variable is set by `nnmaildir-request-article'.")
      ,@body))
 (defmacro nnmaildir--with-work-buffer (&rest body)
   (declare (debug (body)))
-  `(with-current-buffer (get-buffer-create " *nnmaildir work*")
+  `(with-current-buffer (gnus-get-buffer-create " *nnmaildir work*")
      ,@body))
 (defmacro nnmaildir--with-nov-buffer (&rest body)
   (declare (debug (body)))
-  `(with-current-buffer (get-buffer-create " *nnmaildir nov*")
+  `(with-current-buffer (gnus-get-buffer-create " *nnmaildir nov*")
      ,@body))
 (defmacro nnmaildir--with-move-buffer (&rest body)
   (declare (debug (body)))
-  `(with-current-buffer (get-buffer-create " *nnmaildir move*")
+  `(with-current-buffer (gnus-get-buffer-create " *nnmaildir move*")
      ,@body))
 
 (defsubst nnmaildir--subdir (dir subdir)
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index b3329212f84..dcecfcf6519 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -1249,7 +1249,7 @@ Marks propagation has to be enabled for this to work."
 If THREADS is non-nil, enable full threads."
   (let ((args (cons (car command) '(nil t nil))))
     (with-current-buffer
-       (get-buffer-create nnmairix-mairix-output-buffer)
+       (gnus-get-buffer-create nnmairix-mairix-output-buffer)
       (erase-buffer)
       (when (> (length command) 1)
         (setq args (append args (cdr command))))
@@ -1267,7 +1267,7 @@ If THREADS is non-nil, enable full threads."
   "Call mairix binary with COMMAND and QUERY in raw mode."
   (let ((args (cons (car command) '(nil t nil))))
     (with-current-buffer
-       (get-buffer-create nnmairix-mairix-output-buffer)
+       (gnus-get-buffer-create nnmairix-mairix-output-buffer)
       (erase-buffer)
       (when (> (length command) 1)
         (setq args (append args (cdr command))))
@@ -1404,7 +1404,7 @@ TYPE is either `nov' or `headers'."
   (nnheader-message 7 "nnmairix: Rewriting headers...")
   (cond
    ((eq type 'nov)
-    (let ((buf (get-buffer-create " *nnmairix buffer*"))
+    (let ((buf (gnus-get-buffer-create " *nnmairix buffer*"))
           (corr (not (zerop numc)))
           (name (buffer-name nntp-server-buffer))
           header cur xref)
diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el
index eb8fcf37a25..a191f887c78 100644
--- a/lisp/gnus/nnmbox.el
+++ b/lisp/gnus/nnmbox.el
@@ -280,7 +280,7 @@
 
 (deffoo nnmbox-request-move-article
     (article group server accept-form &optional last move-is-internal)
-  (let ((buf (get-buffer-create " *nnmbox move*"))
+  (let ((buf (gnus-get-buffer-create " *nnmbox move*"))
         result)
     (and
      (nnmbox-request-article article group server)
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index c075f298986..d2f63bd3db1 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -296,7 +296,7 @@ as unread by Gnus.")
 
 (deffoo nnmh-request-move-article (article group server accept-form
                                            &optional last move-is-internal)
-  (let ((buf (get-buffer-create " *nnmh move*"))
+  (let ((buf (gnus-get-buffer-create " *nnmh move*"))
         result)
     (and
      (nnmh-deletable-article-p group article)
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 6c7b25b5e76..2c39ab8e36a 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -361,7 +361,7 @@ non-nil.")
 
 (deffoo nnml-request-move-article
     (article group server accept-form &optional last move-is-internal)
-  (let ((buf (get-buffer-create " *nnml move*"))
+  (let ((buf (gnus-get-buffer-create " *nnml move*"))
         (file-name-coding-system nnmail-pathname-coding-system)
         result)
     (nnml-possibly-change-directory group server)
@@ -572,7 +572,7 @@ non-nil.")
 
 ;; Find an article number in the current group given the Message-ID.
 (defun nnml-find-group-number (id server)
-  (with-current-buffer (get-buffer-create " *nnml id*")
+  (with-current-buffer (gnus-get-buffer-create " *nnml id*")
     (let ((alist nnml-group-alist)
           number)
       ;; We want to look through all .overview files, but we want to
@@ -772,11 +772,10 @@ article number.  This function is called narrowed to an article."
         headers))))
 
 (defun nnml-get-nov-buffer (group &optional incrementalp)
-  (let ((buffer (get-buffer-create (format " *nnml %soverview %s*"
-                                            (if incrementalp
-                                                "incremental "
-                                              "")
-                                            group)))
+  (let ((buffer (gnus-get-buffer-create
+                 (format " *nnml %soverview %s*"
+                         (if incrementalp "incremental " "")
+                         group)))
          (file-name-coding-system nnmail-pathname-coding-system))
     (with-current-buffer buffer
       (set (make-local-variable 'nnml-nov-buffer-file-name)
@@ -873,7 +872,7 @@ Unless no-active is non-nil, update the active file too."
 (defun nnml-generate-nov-file (dir files)
   (let* ((dir (file-name-as-directory dir))
          (nov (concat dir nnml-nov-file-name))
-         (nov-buffer (get-buffer-create " *nov*"))
+         (nov-buffer (gnus-get-buffer-create " *nov*"))
          chars file headers)
     (with-current-buffer nov-buffer
       ;; Init the nov buffer.
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index fa4d22fb1cc..116d7ee9fb2 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -739,7 +739,7 @@ Read the file and attempt to subscribe to each Feed in the file."
   "OPML subscription export.
 Export subscriptions to a buffer in OPML Format."
   (interactive)
-  (with-current-buffer (get-buffer-create "*OPML Export*")
+  (with-current-buffer (gnus-get-buffer-create "*OPML Export*")
     (set-buffer-file-coding-system 'utf-8)
     (insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
             "<!-- OPML generated by Emacs Gnus' nnrss.el -->\n"
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 6ce8724cbbb..6be6d11a48d 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -309,7 +309,7 @@ backend doesn't catch this error.")
 
 (defun nntp-record-command (string)
   "Record the command STRING."
-  (with-current-buffer (get-buffer-create "*nntp-log*")
+  (with-current-buffer (gnus-get-buffer-create "*nntp-log*")
     (goto-char (point-max))
     (insert (format-time-string "%Y%m%dT%H%M%S.%3N")
             " " nntp-address " " string "\n")))
diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el
index e1290a9c774..54c2f7be820 100644
--- a/lisp/gnus/nnvirtual.el
+++ b/lisp/gnus/nnvirtual.el
@@ -97,7 +97,7 @@ component group will show up when you enter the virtual group.")
       (if (stringp (car articles))
           'headers
         (let ((vbuf (nnheader-set-temp-buffer
-                     (get-buffer-create " *virtual headers*")))
+                     (gnus-get-buffer-create " *virtual headers*")))
               (carticles (nnvirtual-partition-sequence articles))
               (sysname (system-name))
               cgroup carticle article result prefix)
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index fe6daf6b037..2ae96782712 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -477,7 +477,7 @@ in the buffer specified by `smime-details-buffer'."
 ;; Various operations
 
 (defun smime-new-details-buffer ()
-  (with-current-buffer (get-buffer-create smime-details-buffer)
+  (with-current-buffer (gnus-get-buffer-create smime-details-buffer)
     (erase-buffer)))
 
 (defun smime-pkcs7-region (b e)
@@ -645,7 +645,7 @@ The following commands are available:
 
 (defun smime-certificate-info (certfile)
   (interactive "fCertificate file: ")
-  (let ((buffer (get-buffer-create (format "*certificate %s*" certfile))))
+  (let ((buffer (gnus-get-buffer-create (format "*certificate %s*" certfile))))
     (switch-to-buffer buffer)
     (erase-buffer)
     (call-process smime-openssl-program nil buffer 'display
@@ -670,7 +670,7 @@ The following commands are available:
   "Go to the SMIME buffer."
   (interactive)
   (unless (get-buffer smime-buffer)
-    (with-current-buffer (get-buffer-create smime-buffer)
+    (with-current-buffer (gnus-get-buffer-create smime-buffer)
       (smime-mode)))
   (smime-draw-buffer)
   (switch-to-buffer smime-buffer))
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index 8a4161e7acd..2681185000c 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -234,7 +234,7 @@ This is set by hooking into Gnus.")
 (defun spam-stat-store-current-buffer ()
   "Store a copy of the current buffer in `spam-stat-buffer'."
   (let ((buf (current-buffer)))
-    (with-current-buffer (get-buffer-create spam-stat-buffer-name)
+    (with-current-buffer (gnus-get-buffer-create spam-stat-buffer-name)
       (erase-buffer)
       (insert-buffer-substring buf)
       (setq spam-stat-buffer (current-buffer)))))