summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-agent.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-01-24 23:38:05 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-01-24 23:38:05 +0000
commitc5ecc7690d4afafb42049634d64abd781ff76642 (patch)
treed10767179c7f257ab9ae4d33844405a81a309499 /lisp/gnus/gnus-agent.el
parentab0a61d0acb81353f5636a9c42bec7762dd90c81 (diff)
downloademacs-c5ecc7690d4afafb42049634d64abd781ff76642.tar.gz
Merge changes made in Gnus trunk.
shr.el: Use defface to create shr-tag-h[1-6] faces to fontify h[1-6] tags. mml-smime.el (mml-smime-use): Make it a defcustom and default to 'epg if EPG is loaded. message.texi (IDNA): Explain what it is. gnus.texi (The Empty Backend): Document nnnil (bug #7653). gnus-agent.el (gnus-agent-prompt-send-queue): Whitespace fix. shr.el (shr-expand-newlines): Proof of concept implemantation of boxy backgrounds. (shr-expand-newlines): Switch to using overlays to enable kill'n'yank in a more sensible manner.
Diffstat (limited to 'lisp/gnus/gnus-agent.el')
-rw-r--r--lisp/gnus/gnus-agent.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 13fa94ee064..2c0b02d16a0 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -203,8 +203,7 @@ queue. Otherwise, queue if and only if unplugged."
(const :format "When unplugged" t)))
(defcustom gnus-agent-prompt-send-queue nil
- "If non-nil, `gnus-group-send-queue' will prompt if called when
-unplugged."
+ "If non-nil, `gnus-group-send-queue' will prompt if called when unplugged."
:version "22.1"
:group 'gnus-agent
:type 'boolean)