summaryrefslogtreecommitdiff
path: root/lisp/gnus/message.el
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2019-05-05 01:28:57 +0100
committerBasil L. Contovounesios <contovob@tcd.ie>2019-05-30 02:56:28 +0100
commitceca1740ea2c9bc98da8c11765b78c696b27c79e (patch)
tree8f878809e34325af181edac66385307345c3ef03 /lisp/gnus/message.el
parent46a176169b9050a5e6d97b11f265bd58b4b5eb05 (diff)
downloademacs-ceca1740ea2c9bc98da8c11765b78c696b27c79e.tar.gz
emacs-ceca1740ea2c9bc98da8c11765b78c696b27c79e.tar.bz2
emacs-ceca1740ea2c9bc98da8c11765b78c696b27c79e.zip
Simplify Gnus buffer liveness checking and killing
* lisp/gnus/gnus-agent.el (gnus-agent-synchronize-group-flags): Fix indentation. * lisp/gnus/gnus-util.el (gnus-buffer-exists-p): Define as obsolete alias of gnus-buffer-live-p. (gnus-buffer-live-p): If the given argument is or names a live buffer, return the corresponding buffer object instead of a boolean. * lisp/gnus/gnus-win.el (gnus-delete-windows-in-gnusey-frames) (gnus-remove-some-windows): Simplify. * lisp/gnus/gnus.el (gnus-prune-buffers): Redefine as alias of gnus-buffers. (gnus-kill-buffer, gnus-buffers, gnus-group-find-parameter): * lisp/gnus/gnus-art.el (gnus-kill-sticky-article-buffers) (gnus-request-article-this-buffer): * lisp/gnus/gnus-bcklg.el (gnus-backlog-shutdown): * lisp/gnus/gnus-cus.el (gnus-group-customize) (gnus-agent-customize-category): * lisp/gnus/gnus-draft.el (gnus-draft-edit-message): * lisp/gnus/gnus-group.el (gnus-group-set-mode-line) (gnus--abort-on-unsaved-message-buffers, gnus-group-compact-group): * lisp/gnus/gnus-msg.el (gnus-inews-add-send-actions) (gnus-summary-supersede-article, gnus-copy-article-buffer): * lisp/gnus/gnus-score.el (gnus-score-edit-current-scores) (gnus-score-edit-file): * lisp/gnus/gnus-spec.el (gnus-update-format-specifications): * lisp/gnus/gnus-srvr.el (gnus-server-compact-server): * lisp/gnus/gnus-start.el (gnus-clear-system, gnus-dribble-enter) (gnus-dribble-save, gnus-dribble-clear, gnus-save-newsrc-file): * lisp/gnus/gnus-sum.el (gnus-summary-setup-buffer) (gnus-update-summary-mark-positions, gnus-summary-exit) (gnus-deaden-summary, gnus-kill-or-deaden-summary) (gnus-summary-next-group): * lisp/gnus/gnus-win.el (gnus-configure-frame): * lisp/gnus/mail-source.el (mail-source-movemail): * lisp/gnus/message.el (message-with-reply-buffer) (message-with-reply, message-send-and-exit) (message-send-mail-with-sendmail, message-pop-to-buffer) (message-do-send-housekeeping, message-forward-make-body-plain) (message-forward-make-body-mml): * lisp/gnus/mm-decode.el (mm-display-external, mm-remove-part): * lisp/gnus/nnbabyl.el (nnbabyl-server-opened) (nnbabyl-possibly-change-newsgroup, nnbabyl-read-mbox) (nnbabyl-check-mbox): * lisp/gnus/nndiary.el (nndiary-save-nov): * lisp/gnus/nndoc.el (nndoc-close-group) (nndoc-possibly-change-buffer): * lisp/gnus/nnfolder.el (nnfolder-close-group, nnfolder-save-nov): * lisp/gnus/nnimap.el (nnimap-make-process-buffer, nnimap-keepalive) (nnimap-find-connection): * lisp/gnus/nnmail.el (nnmail-cache-open, nnmail-cache-close): * lisp/gnus/nnmbox.el (nnmbox-close-server, nnmbox-server-opened) (nnmbox-possibly-change-newsgroup, nnmbox-read-mbox): * lisp/gnus/nnml.el (nnml-save-incremental-nov, nnml-open-nov) (nnml-save-nov): * lisp/gnus/nnoo.el (nnoo-server-opened): * lisp/gnus/nntp.el (nntp-kill-buffer, nntp-make-process-buffer) (nntp-open-connection, nntp-async-trigger): * lisp/net/mairix.el (mairix-gnus-fetch-field): Simplify buffer liveness checking and killing, replacing buffer-name with buffer-live-p and gnus-buffer-exists-p with gnus-buffer-live-p or equivalent where applicable.
Diffstat (limited to 'lisp/gnus/message.el')
-rw-r--r--lisp/gnus/message.el23
1 files changed, 8 insertions, 15 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8b72ef88aba..29a8f25f31f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2034,8 +2034,7 @@ see `message-narrow-to-headers-or-head'."
(defmacro message-with-reply-buffer (&rest forms)
"Evaluate FORMS in the reply buffer, if it exists."
- `(when (and (bufferp message-reply-buffer)
- (buffer-name message-reply-buffer))
+ `(when (buffer-live-p message-reply-buffer)
(with-current-buffer message-reply-buffer
,@forms)))
@@ -3229,8 +3228,7 @@ or in the synonym headers, defined by `message-header-synonyms'."
"Widen the reply to include maximum recipients."
(interactive)
(let ((follow-to
- (and (bufferp message-reply-buffer)
- (buffer-name message-reply-buffer)
+ (and (buffer-live-p message-reply-buffer)
(with-current-buffer message-reply-buffer
(message-get-reply-headers t)))))
(save-excursion
@@ -4027,7 +4025,7 @@ It should typically alter the sending method in some way or other."
(let ((buf (current-buffer))
(actions message-exit-actions))
(when (and (message-send arg)
- (buffer-name buf))
+ (buffer-live-p buf))
(message-bury buf)
(if message-kill-buffer-on-exit
(kill-buffer buf))
@@ -4740,7 +4738,7 @@ that instead."
(if (not (zerop (buffer-size)))
(error "Sending...failed to %s"
(buffer-string))))))
- (when (bufferp errbuf)
+ (when (buffer-live-p errbuf)
(kill-buffer errbuf)))))
(defun message-send-mail-with-qmail ()
@@ -6377,8 +6375,7 @@ moved to the beginning "
(defun message-pop-to-buffer (name &optional switch-function)
"Pop to buffer NAME, and warn if it already exists and is modified."
(let ((buffer (get-buffer name)))
- (if (and buffer
- (buffer-name buffer))
+ (if (buffer-live-p buffer)
(let ((window (get-buffer-window buffer 0)))
(if window
;; Raise the frame already displaying the message buffer.
@@ -6409,7 +6406,7 @@ moved to the beginning "
(>= (length message-buffer-list) message-max-buffers))
;; Kill the oldest buffer -- unless it has been changed.
(let ((buffer (pop message-buffer-list)))
- (when (and (buffer-name buffer)
+ (when (and (buffer-live-p buffer)
(not (buffer-modified-p buffer)))
(kill-buffer buffer))))
;; Rename the buffer.
@@ -7376,9 +7373,7 @@ Optional DIGEST will use digest to forward."
(unless (multibyte-string-p contents)
(error "Attempt to insert unibyte string from the buffer \"%s\"\
to the multibyte buffer \"%s\""
- (if (bufferp forward-buffer)
- (buffer-name forward-buffer)
- forward-buffer)
+ forward-buffer
(buffer-name)))
(insert (mm-with-multibyte-buffer
(insert contents)
@@ -7440,9 +7435,7 @@ Optional DIGEST will use digest to forward."
(unless (multibyte-string-p contents)
(error "Attempt to insert unibyte string from the buffer \"%s\"\
to the multibyte buffer \"%s\""
- (if (bufferp forward-buffer)
- (buffer-name forward-buffer)
- forward-buffer)
+ forward-buffer
(buffer-name)))
(insert (mm-with-multibyte-buffer
(insert contents)