Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Gnus: Prefer passing functions to message-add-action

Browse source 
Building code with code is tricky.  E.g. the code in gnus-draft-setup
suffered from a security issue because it forgot to quote
some arguments (see commit 142b1e0d4c).

* lisp/gnus/gnus-salt.el (gnus-pick-setup-message):
* lisp/gnus/gnus-msg.el (gnus-inews-add-send-actions):
* lisp/gnus/gnus-draft.el (gnus-draft-setup): Prefer passing functions
to message-add-action over passing it ELisp expressions.

* lisp/gnus/message.el (message-do-actions): Drop errors but not silently.
This commit is contained in:
Stefan Monnier 2026-05-26 15:54:34 -04:00
parent 25fb3f9b46
commit 02fb01166e
5 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,13 +273,13 @@ If DONT-POP is nil, display the buffer after setting it up."
(setq message-post-method
(lambda (arg) (gnus-post-method arg (car ga))))
(unless (equal (cadr ga) "")
(dolist (article (cdr ga))
(message-add-action
`(progn
(gnus-add-mark ,(car ga) 'replied ,article)
(gnus-request-set-mark ,(car ga) (list (list (list ,article)
'add '(reply)))))
'send))))
(let ((group (car ga)))
(dolist (article (cdr ga))
(message-add-action
(lambda ()
(gnus-add-mark group 'replied article)
(gnus-request-set-mark group `(((,article) add (reply)))))
'send)))))
(run-hooks 'gnus-draft-setup-hook)))
(defun gnus-draft-article-sendable-p (article)

19
lisp/gnus/gnus-msg.el
View file

@ -544,10 +544,10 @@ instead."
(let ((gn gnus-newsgroup-name))
(lambda (&optional arg) (gnus-post-method arg gn))))
(message-add-action
`(progn
(setq gnus-current-window-configuration ',winconf-name)
(when (gnus-buffer-live-p ,buffer)
(set-window-configuration ,winconf)))
(lambda ()
(setq gnus-current-window-configuration winconf-name)
(when (gnus-buffer-live-p buffer)
(set-window-configuration winconf)))
'exit 'postpone 'kill)
(let ((to-be-marked (cond
(yanked
@ -556,12 +556,13 @@ instead."
(article (if (listp article) article (list article)))
(t nil))))
(message-add-action
`(when (gnus-buffer-live-p ,buffer)
(with-current-buffer ,buffer
,(when to-be-marked
(lambda ()
(when (gnus-buffer-live-p buffer)
(with-current-buffer buffer
(when to-be-marked
(if (eq config 'forward)
`(gnus-summary-mark-article-as-forwarded ',to-be-marked)
`(gnus-summary-mark-article-as-replied ',to-be-marked)))))
(gnus-summary-mark-article-as-forwarded to-be-marked)
(gnus-summary-mark-article-as-replied to-be-marked))))))
'send)))
;;; Post news commands of Gnus group mode and summary mode

7
lisp/gnus/gnus-salt.el
View file

@ -119,9 +119,10 @@ It accepts the same format specs that `gnus-summary-line-format' does."
(when (and (gnus-buffer-live-p gnus-summary-buffer)
(with-current-buffer gnus-summary-buffer
gnus-pick-mode))
(message-add-action
`(gnus-configure-windows ,gnus-current-window-configuration t)
'send 'exit 'postpone 'kill)))
(let ((gcwc gnus-current-window-configuration))
(message-add-action
(lambda () (gnus-configure-windows gcwc t))
'send 'exit 'postpone 'kill))))
(defvar gnus-pick-line-number 1)
(defun gnus-pick-line-number ()

3
lisp/gnus/message.el
View file

@ -4762,10 +4762,11 @@ Valid types are `send', `return', `exit', `kill' and `postpone'."
(delq action (symbol-value var))))))
(defun message-do-actions (actions)
;; FIXME: Replace it with `run-hooks'?
"Perform all actions in ACTIONS."
;; Now perform actions on successful sending.
(dolist (action actions)
(ignore-errors
(with-demoted-errors "message-do-actions: %S"
(cond
;; A simple function.
((functionp action)

2
lisp/gnus/nndraft.el
View file

@ -207,7 +207,7 @@ are generated if and only if they are also in `message-draft-headers'."
(clear-visited-file-modtime)
(add-hook 'write-contents-functions #'nndraft-generate-headers nil t)
(add-hook 'after-save-hook #'nndraft-update-unread-articles nil t)
(message-add-action '(nndraft-update-unread-articles)
(message-add-action #'nndraft-update-unread-articles
'exit 'postpone 'kill)
article))