diff lisp/mail/sendmail.el @ 90260:0ca0d9181b5e

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-95 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 598-615) - Update from CVS - Remove lisp/toolbar directory - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 142-146) - Update from CVS

--- a/lisp/mail/sendmail.el	Wed Dec 28 07:22:57 2005 +0000
+++ b/lisp/mail/sendmail.el	Mon Jan 16 06:59:21 2006 +0000
@@ -120,7 +120,10 @@
 
 ;; Useful to set in site-init.el
 ;;;###autoload
-(defcustom send-mail-function 'sendmail-send-it
+(defcustom send-mail-function 
+  (if (and window-system (memq system-type '(darwin windows-nt)))
+      'mailclient-send-it
+    'sendmail-send-it)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
 not a valid RFC822 header or continuation line,
@@ -182,6 +185,7 @@
   :type '(choice (const nil) file)
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-setup-hook nil
   "Normal hook, run each time a new outgoing mail message is initialized.
 The function `mail-setup' runs this hook."
@@ -189,6 +193,7 @@
   :options '(fortune-to-signature spook mail-abbrevs-setup)
   :group 'sendmail)
 
+;;;###autoload
 (defvar mail-aliases t
   "Alist of mail address aliases,
 or t meaning should be initialized from your mail aliases file.
@@ -200,17 +205,20 @@
 (defvar mail-alias-modtime nil
   "The modification time of your mail alias file when it was last examined.")
 
+;;;###autoload
 (defcustom mail-yank-prefix nil
   "*Prefix insert on lines of yanked message being replied to.
 nil means use indentation."
   :type '(choice (const nil) string)
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-indentation-spaces 3
   "*Number of spaces to insert at the beginning of each cited line.
 Used by `mail-yank-original' via `mail-indent-citation'."
   :type 'integer
   :group 'sendmail)
+
 (defvar mail-yank-hooks nil
   "Obsolete hook for modifying a citation just inserted in the mail buffer.
 Each hook function can find the citation between (point) and (mark t).
@@ -239,6 +247,7 @@
 This enables the hook functions to see the whole message header
 regardless of what part of it (if any) is included in the cited text.")
 
+;;;###autoload
 (defcustom mail-citation-prefix-regexp "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|[ \t]*"
   "*Regular expression to match a citation prefix plus whitespace.
 It should match whatever sort of citation prefixes you want to handle,
@@ -278,6 +287,7 @@
   :group 'sendmail)
 (put 'mail-signature 'risky-local-variable t)
 
+;;;###autoload
 (defcustom mail-signature-file "~/.signature"
   "*File containing the text inserted at end of mail buffer."
   :type 'file
@@ -298,6 +308,7 @@
 (put 'mail-reply-action 'permanent-local t)
 (put 'mail-send-actions 'permanent-local t)
 
+;;;###autoload
 (defcustom mail-default-headers nil
   "*A string containing header lines, to be inserted in outgoing messages.
 It is inserted before you edit the message,
@@ -305,6 +316,7 @@
   :type '(choice (const nil) string)
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-bury-selects-summary t
   "*If non-nil, try to show RMAIL summary buffer after returning from mail.
 The functions \\[mail-send-on-exit] or \\[mail-dont-send] select
@@ -313,6 +325,7 @@
   :type 'boolean
   :group 'sendmail)
 
+;;;###autoload
 (defcustom mail-send-nonascii 'mime
   "*Specify whether to allow sending non-ASCII characters in mail.
 If t, that means do allow it.  nil means don't allow it.