summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2023-02-19 11:38:09 +0100
committerStefan Kangas <stefankangas@gmail.com>2023-02-19 11:38:09 +0100
commit34f44ae07e0a3ba7ae43d79ab71b03795cb4acf5 (patch)
tree4e0cb51e380efd9c6e91e2f6557604e1a554ea79 /lisp/gnus
parent750bc57cbb8d081566e671e8fc3e27a82588c197 (diff)
parent871cf33a450a34fcace7fe7c5448fe3043697005 (diff)
downloademacs-34f44ae07e0a3ba7ae43d79ab71b03795cb4acf5.tar.gz
Merge from origin/emacs-29
871cf33a450 ; * admin/make-tarball.txt: Minor copyedit. 4faebba2fed Fix invocation of File->Close from the menu bar cd05fca5f78 ; Improve documentation of 'native-comp-enable-subr-tramp... c61a30e1601 Update thumbnail buffer's header more 4c49452cdef (treesit-query-validate): Fix reusing the output buffer d560dc5044a (rust-ts-mode--font-lock-settings): Highlight closure par... c15bc91e1bf * Fix `native-comp-enable-subr-trampolines' semantic 774051873d5 Fix documentation of 'just-one-space' and 'delete-horizon... 7337f072500 ; Remove NEWS entry about deleted variable. fb5299ba099 ; Fix wording of last change. 9f508cef85d Fix 'display-buffer-use-least-recent-window' 5190ea6259a Fix point moving when calling python-shell-send-region 6c0d8210175 (project-try-vc): Remove unused defvar/require 4f9862e4356 ; Fix typo a638c79bc5c Delete redundant question from Gnus FAQ 4a90d67eb68 Slightly improve hashcash documentation 6ea3c105ab1 Fix cursor motion when there's line-prefix and display st... e985466556c Fix comment in treesit_record_change (bug#61369) 1e5cebc88bb Spell out RPN abbreviation in Calc manual intro # Conflicts: # etc/NEWS # lisp/window.el
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/message.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c697b8d7a7f..f4cfffa2e8a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1926,9 +1926,10 @@ no, only reply back to the author."
"Whether to generate X-Hashcash: headers.
If t, always generate hashcash headers. If `opportunistic',
only generate hashcash headers if it can be done without the user
-waiting (i.e., only asynchronously).
+waiting (i.e., only asynchronously). If nil, don't generate
+hashcash headers.
-You must have the \"hashcash\" binary installed, see `hashcash-path'."
+You must have the \"hashcash\" binary installed, see `hashcash-program'."
:version "24.1"
:group 'message-headers
:link '(custom-manual "(message)Mail Headers")