diff options
Diffstat (limited to 'lisp/mail/feedmail.el')
| -rw-r--r-- | lisp/mail/feedmail.el | 96 |
1 files changed, 49 insertions, 47 deletions
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 7f27599edf2..aec93db3fa6 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -399,10 +399,10 @@ "If non-nil, give a y-or-n confirmation prompt before sending mail. This is done after the message is completely prepped, and you'll be looking at the top of the message in a buffer when you get the prompt. -If set to the symbol 'queued, give the confirmation prompt only while +If set to the symbol `queued', give the confirmation prompt only while running the queue (however, the prompt is always suppressed if you are processing the queue via `feedmail-run-the-queue-no-prompts'). If set -to the symbol 'immediate, give the confirmation prompt only when +to the symbol `immediate', give the confirmation prompt only when sending immediately. For any other non-nil value, prompt in both cases. You can give a timeout for the prompt; see variable `feedmail-confirm-outgoing-timeout'." @@ -418,9 +418,9 @@ cases. You can give a timeout for the prompt; see variable If nil, the prepped message will be shown, for confirmation or otherwise, in some window in the current frame without resizing anything. That may or may not display enough of the message to -distinguish it from others. If set to the symbol 'queued, take +distinguish it from others. If set to the symbol `queued', take this action only when running the queue. If set to the symbol -'immediate, take this action only when sending immediately. For +`immediate', take this action only when sending immediately. For any other non-nil value, take the action in both cases. Even if you're not confirming the sending of immediate or queued messages, it can still be interesting to see a lot about them as they are @@ -438,7 +438,7 @@ shuttled robotically onward." If a positive number, it's a timeout before sending. If a negative number, it's a timeout before not sending. This will not work if your version of Emacs doesn't include the function `y-or-n-p-with-timeout' -\(e.g., some versions of XEmacs\)." +\(e.g., some versions of XEmacs)." :version "24.1" :group 'feedmail-misc :type '(choice (const nil) integer) @@ -449,7 +449,7 @@ version of Emacs doesn't include the function `y-or-n-p-with-timeout' "If non-nil remove Bcc: lines from the message headers. In any case, the Bcc: lines do participate in the composed address list. You may want to leave them in if you're using sendmail -\(see `feedmail-buffer-eating-function'\)." +\(see `feedmail-buffer-eating-function')." :group 'feedmail-headers :type 'boolean ) @@ -459,7 +459,7 @@ list. You may want to leave them in if you're using sendmail "If non-nil remove Resent-Bcc: lines from the message headers. In any case, the Resent-Bcc: lines do participate in the composed address list. You may want to leave them in if you're using sendmail -\(see `feedmail-buffer-eating-function'\)." +\(see `feedmail-buffer-eating-function')." :group 'feedmail-headers :type 'boolean ) @@ -471,9 +471,9 @@ Addresses for the message envelope are deduced by examining appropriate address headers in the message. Generally, they will show up in the list of deduced addresses in the order that the headers happen to appear (duplicate addresses are eliminated in any case). -This variable can be set to the symbol 'first, in which case the +This variable can be set to the symbol `first', in which case the Bcc:/Resent-Bcc: addresses will appear at the beginning in the list; -or, it can be set to the symbol 'last, in which case they will appear +or, it can be set to the symbol `last', in which case they will appear at the end of the list. Why should you care? Well, maybe you don't, and certainly the same @@ -484,7 +484,7 @@ addresses are not handled first, there can be substantial delays in seeing the message again. Some configurations of sendmail, for example, seem to try to deliver to each addressee at least once, immediately and serially, so slow SMTP conversations can add up to a delay. There -is an option for either 'first or 'last because you might have a +is an option for either `first' or `last' because you might have a delivery agent that processes the addresses backwards." :group 'feedmail-headers :type '(choice (const nil) @@ -566,7 +566,7 @@ but common in some proprietary systems." "If non-nil and the email has no Sender: header, use this value. May be nil, in which case nothing in particular is done with respect to Sender: lines. By design, will not replace an existing Sender: -line, but you can achieve that with a fiddle-plex 'replace action. +line, but you can achieve that with a fiddle-plex replace action. NB: it makes no sense to use the value t since there is no sensible default for Sender:. @@ -645,7 +645,7 @@ is not an option for many users. As this is the default behavior of most sendmail installations, one can mostly only wish it were otherwise. If feedmail believes the sendmail program will sell you out this way, it won't use the \"-f\" option when calling sendmail. If it doesn't think sendmail will sell you out, -it will use the \"-f\" \(since it is a handy feature\). You control what +it will use the \"-f\" \(since it is a handy feature). You control what feedmail thinks with this variable. The default is nil, meaning that feedmail will believe that sendmail will sell you out." :version "24.1" @@ -861,7 +861,7 @@ as well." "User-supplied specification for a crude form of mailmerge capability. When spraying is enabled, feedmail composes a list of envelope addresses. In turn, `feedmail-spray-this-address' is temporarily set to each address -\(stripped of any comments and angle brackets\) and a function is called which +\(stripped of any comments and angle brackets) and a function is called which fiddles message headers according to this variable. See the documentation for `feedmail-fiddle-plex-blurb', for an overview of fiddle-plex data structures. @@ -1231,7 +1231,7 @@ If a string, it is used directly. If a function, it is called with no arguments from the buffer containing the raw text of the message. It must return a string (which may be empty). -If the symbol 'ask, you will be prompted for a string in the mini-buffer. +If the symbol `ask', you will be prompted for a string in the mini-buffer. Filename completion is available so that you can inspect what's already been used, but feedmail will do further manipulation on the string you return, so it's not expected to be a complete filename." @@ -1301,27 +1301,27 @@ the fact in the messages buffer." (defvar feedmail-queue-buffer-file-name nil - "If non-nil, has the value normally expected of 'buffer-file-name'. + "If non-nil, has the value normally expected of `buffer-file-name'. You are not intended to set this to something in your configuration. Rather, you might programmatically set it to something via a hook or function advice or whatever. You might like to do this if you are using a mail -composition program that eventually uses sendmail.el's 'mail-send' +composition program that eventually uses sendmail.el's `mail-send' function to process the message. If there is a filename associated -with the message buffer, 'mail-send' will ask you for confirmation. +with the message buffer, `mail-send' will ask you for confirmation. There's no trivial way to avoid it. It's unwise to just set the value -of 'buffer-file-name' to nil because that will defeat feedmail's file +of `buffer-file-name' to nil because that will defeat feedmail's file management features. Instead, arrange for this variable to be set to -the value of 'buffer-file-name' before setting that to nil. An easy way -to do that would be with defadvice on 'mail-send' \(undoing the -assignments in a later advice\). +the value of `buffer-file-name' before setting that to nil. An easy way +to do that would be with defadvice on `mail-send' \(undoing the +assignments in a later advice). -feedmail will pretend that 'buffer-file-name', if nil, has the value -assigned of 'feedmail-queue-buffer-file-name' and carry out its normal +feedmail will pretend that `buffer-file-name', if nil, has the value +assigned of `feedmail-queue-buffer-file-name' and carry out its normal activities. feedmail does not restore the non-nil value of -'buffer-file-name'. For safe bookkeeping, the user should insure that +`buffer-file-name'. For safe bookkeeping, the user should insure that feedmail-queue-buffer-file-name is restored to nil. -Example 'defadvice' for mail-send: +Example `defadvice' for mail-send: (defadvice mail-send (before feedmail-mail-send-before-advice activate) (setq feedmail-queue-buffer-file-name buffer-file-name) @@ -1354,7 +1354,7 @@ If you have `mail-send-hook' functions that should only be called for sending/ queueing messages or only be called for the sending of queued messages, this is for you. Add this function to `mail-send-hook' with something like this: - (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter) + (add-hook \\='mail-send-hook \\='feedmail-mail-send-hook-splitter) Then add the functions you want called to either `feedmail-mail-send-hook-queued' or `feedmail-mail-send-hook', as appropriate. The distinction is that @@ -1507,7 +1507,7 @@ The default action is an anonymous function which gets rid of the file from the queue directory. With a non-nil second argument, a brief message is give for each file deleted. You could replace this function, for example, to archive all of your sent messages someplace -\(though there are better ways to get that particular result\)." +\(though there are better ways to get that particular result)." :group 'feedmail-queue :type 'function ) @@ -1551,7 +1551,7 @@ See feedmail-binmail-template documentation." "/bin/rmail %s" "/bin/mail %s")) "Command template for the subprocess which will get rid of the mail. It can result in any command understandable by /bin/sh. Might not -work at all in non-UNIX environments. The single '%s', if present, +work at all in non-UNIX environments. The single `%s', if present, gets replaced by the space-separated, simplified list of addressees. Used in `feedmail-buffer-to-binmail' to form the shell command which will receive the contents of the prepped buffer as stdin. The default @@ -1715,7 +1715,7 @@ for ACTION (default is `supplement'): VAL-LIKE is not used. Else, if VAL-LIKE is a function, it is called with two arguments: NAME and the aggregate like values. Else, if VAL-LIKE is a string, it is - used as a format string where a single \%s will be + used as a format string where a single %s will be replaced by the aggregate values of like fields. VAL-PRE, the results of using VAL-LIKE, and VAL-POST @@ -1745,7 +1745,8 @@ applied to a file after you've just read it from disk: for example, a feedmail FQM message file from a queue. You could use something like this: -\(setq auto-mode-alist \(cons \'\(\"\\\\.fqm$\" . feedmail-vm-mail-mode\) auto-mode-alist\)\) +\(setq auto-mode-alist + (cons \\='(\"\\\\.fqm$\" . feedmail-vm-mail-mode) auto-mode-alist)) " (feedmail-say-debug ">in-> feedmail-vm-mail-mode") (let ((the-buf (current-buffer))) @@ -1889,32 +1890,33 @@ with various lower-level mechanisms to provide features such as queueing." (defun feedmail-message-action-help-blat (d-string) (feedmail-say-debug ">in-> feedmail-message-action-help-blat") (with-output-to-temp-buffer feedmail-p-h-b-n - (princ "You're dispatching a message and feedmail queuing is enabled. + (princ (substitute-command-keys "\ +You're dispatching a message and feedmail queuing is enabled. Typing ? again will normally scroll this help buffer. Choices: - q QUEUE for later sending \(via feedmail-run-the-queue\) + q QUEUE for later sending (via feedmail-run-the-queue) Q QUEUE! like \"q\", but always make a new file - i IMMEDIATELY send this \(but not the other queued messages\) + i IMMEDIATELY send this (but not the other queued messages) I IMMEDIATELY! like \"i\", but skip following confirmation prompt d DRAFT queue in the draft directory D DRAFT! like \"d\", but always make a new file - e EDIT return to the message edit buffer \(don't send or queue\) - * SPRAY toggle spray mode \(individual message transmissions\) - > SCROLL UP scroll message up \(toward end of message\) - < SCROLL DOWN scroll message down \(toward beginning of message\) + e EDIT return to the message edit buffer (don't send or queue) + * SPRAY toggle spray mode (individual message transmissions) + > SCROLL UP scroll message up (toward end of message) + < SCROLL DOWN scroll message down (toward beginning of message) ? HELP show or scroll this help buffer Synonyms: - s SEND immediately \(same as \"i\"\) - S SEND! immediately \(same as \"I\"\) - r ROUGH draft \(same as \"d\"\) - R ROUGH! draft \(same as \"D\"\) - n NOPE didn't mean it \(same as \"e\"\) - y YUP do the default behavior \(same as \"C-m\"\) - SPC SCROLL UP \(same as \">\"\) - -The user-configurable default is currently \"") + s SEND immediately (same as \"i\") + S SEND! immediately (same as \"I\") + r ROUGH draft (same as \"d\") + R ROUGH! draft (same as \"D\") + n NOPE didn't mean it (same as \"e\") + y YUP do the default behavior (same as \"C-m\") + SPC SCROLL UP (same as \">\") + +The user-configurable default is currently \"")) (princ d-string) (princ "\". For other possibilities, see the variable feedmail-prompt-before-queue-user-alist. @@ -2053,7 +2055,7 @@ backup file names and the like)." ;; the handler for the condition-case (error (setq messages-skipped (1+ messages-skipped)) (ding t) - (message "FQM: Trapped '%s', message left in queue." (car signal-stuff)) + (message "FQM: Trapped `%s', message left in queue." (car signal-stuff)) (sit-for 3) (message "FQM: Trap details: \"%s\"" (mapconcat 'identity (cdr signal-stuff) "\" \"")) |