procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update gnus-draft-check-draft-articles to use find-buffer-visiting

Browse source 
* lisp/gnus/gnus-draft.el (gnus-draft-check-draft-articles): Don't loop
through all the buffers; this removes the need for the `file-remote-p'
check. Also give the user some nicer feedback about what's going on.
This commit is contained in:
Eric Abrahamsen 2024-05-10 12:38:57 -07:00
parent b1e94b7bd3
commit 41bfca0005
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lisp/gnus/gnus-draft.el
View file

@ -289,30 +289,25 @@ If DONT-POP is nil, display the buffer after setting it up."
(defun gnus-draft-check-draft-articles (articles)
"Check whether the draft articles ARTICLES are under edit."
(when (equal gnus-newsgroup-name "nndraft:drafts")
(let ((buffers (buffer-list))
file buffs buff)
(save-current-buffer
(while (and articles
(not buff))
(setq file (nndraft-article-filename (pop articles))
buffs buffers)
(while buffs
(set-buffer (setq buff (pop buffs)))
(if (and buffer-file-name
(equal (file-remote-p file)
(file-remote-p buffer-file-name))
(string-equal (file-truename buffer-file-name)
(file-truename file))
(buffer-modified-p))
(setq buffs nil)
(setq buff nil)))))
(when buff
(let* ((window (get-buffer-window buff t))
(frame (and window (window-frame window))))
(if frame
(select-frame-set-input-focus frame)
(pop-to-buffer buff t)))
(error "The draft %s is under edit" file)))))
(let* ((files (mapcar #'nndraft-article-filename articles))
(buffs (delq nil (mapcar (lambda (f)
(find-buffer-visiting
f (lambda (b) (buffer-modified-p b))))
files))))
(when buffs
(if (= 1 (length buffs))
;; We might have arrived here via `gnus-draft-edit-message';
;; either way show the user the draft with unsaved changes.
(let* ((window (get-buffer-window (car buffs) t))
(frame (and window (window-frame window))))
(if frame
(select-frame-set-input-focus frame)
(pop-to-buffer (car buffs) t))
(error "Draft is already under edit"))
;; Otherwise we got here from `gnus-draft-send-message', and
;; the main thing is to interrupt the sending.
(display-buffer (list-buffers-noselect t buffs))
(error "Some drafts have unsaved changes: %S" buffs))))))
(defun gnus-draft-clear-marks ()
(setq gnus-newsgroup-reads nil