This version doesn’t add any framework for defaulting stuff based on packages’ presence. etc/ChangeLog addition: 2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * NEWS: Mention that the compatible, MIME-capable vm-user-agent will be used as the default value for mail-user-agent if it's available. lisp/ChangeLog addition: 2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * menubar-items.el (default-menubar): Make VM available as a mail composition package, better describe sendmail.el * simple.el (mail-user-agent): Update its docstring to mention VM, default it to xemacs-default-user-agent. * simple.el (vm-user-agent): Add it--taken from the VM package. * simple.el (xemacs-default-composefunc): New. * simple.el (xemacs-default-sendfunc): New. * simple.el ('xemacs-default-user-agent): New. User agent that chooses between sendmail-user-agent and vm-user-agent depending on availability, and re-initialises mail-user-agent with that information. man/ChangeLog addition: 2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * xemacs/sending.texi (Sending Mail): Note that we default to VM for the sake of its MIME support when available. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: man/xemacs/sending.texi lisp/simple.el lisp/menubar-items.el etc/NEWS Index: etc/NEWS =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/NEWS,v retrieving revision 1.73 diff -u -u -r1.73 NEWS --- etc/NEWS 2004/09/21 09:24:11 1.73 +++ etc/NEWS 2005/03/24 01:38:00 ＠＠ -35,6 +35,8 ＠＠ -- Bignums have been implemented. -- Windows users have benefit of the full Win32 Unicode API. -- (in process) Xft provides antialiased fonts on X11. + -- If you don't set it, and VM is available, mail-user-agent defaults to + the compatible vm-user-agent, for the sake of its MIME support. ** Bignum implementation. Index: lisp/menubar-items.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/menubar-items.el,v retrieving revision 1.46 diff -u -u -r1.46 menubar-items.el --- lisp/menubar-items.el 2005/02/03 05:03:38 1.46 +++ lisp/menubar-items.el 2005/03/24 01:38:16 ＠＠ -886,7 +886,12 ＠＠ :active (boundp 'ps-print-color-p)]) ("%_Internet" ("%_Compose Mail With" - ["Default Emacs Mailer" + ["VM mail package" + (customize-set-variable 'mail-user-agent 'vm-user-agent) + :style radio + :selected (eq mail-user-agent 'vm-user-agent) + :active (get 'vm-user-agent 'composefunc)] + ["Bare-bones Emacs Mailer" (customize-set-variable 'mail-user-agent 'sendmail-user-agent) :style radio :selected (eq mail-user-agent 'sendmail-user-agent)] Index: lisp/simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.50 diff -u -u -r1.50 simple.el --- lisp/simple.el 2005/02/23 22:25:16 1.50 +++ lisp/simple.el 2005/03/24 01:38:19 ＠＠ -3306,16 +3306,20 ＠＠ ;; BEGIN SYNCHED WITH FSF 21.2. -(defcustom mail-user-agent 'sendmail-user-agent +(defcustom mail-user-agent 'xemacs-default-user-agent "*Your preference for a mail composition package. Various Emacs Lisp packages (e.g. Reporter) require you to compose an outgoing email message. This variable lets you specify which mail-sending package you prefer. -Valid values include: - - `sendmail-user-agent' -- use the default Emacs Mail package. - See Info node `(emacs)Sending Mail'. +Valid values may include: + + `vm-user-agent' -- use Kyle Jones' VM, as documented in the `(vm)' + Info node. Compatible with `sendmail-user-agent' + and can handle attachments and non-ASCII content, + which the former can't. + `sendmail-user-agent' -- use the former preferred, bare-bones, Emacs Mail + package. See Info node `(xemacs)Sending Mail'. `mh-e-user-agent' -- use the Emacs interface to the MH mail system. See Info node `(mh-e)'. `message-user-agent' -- use the Gnus Message package. ＠＠ -3324,12 +3328,22 ＠＠ paraphernalia, particularly the Gcc: header for archiving. +If you examine the value of this variable before setting it or composing a +mail, it will have another value, `xemacs-default-user-agent'--this is to +allow XEmacs to choose the more capable and compatible `vm-user-agent' if +available, in preference to `sendmail-user-agent'. The latter, while part +of the base XEmacs Lisp code, and very lightweight, doesn't support MIME, a +considerable disadvantage today. + Additional valid symbols may be available; check with the author of your package for details. The function should return non-nil if it succeeds. See also `read-mail-command' concerning reading mail." -:type '(radio (function-item :tag "Default Emacs mail" +:type '(radio (function-item :tag "VM mail package" + :format "%t\n" + vm-user-agent) + (function-item :tag "Bare-bones Emacs mail" :format "%t\n" sendmail-user-agent) (function-item :tag "Emacs interface to MH" ＠＠ -3379,8 +3393,49 ＠＠ (put symbol 'abortfunc (or abortfunc 'kill-buffer)) (put symbol 'hookvar (or hookvar 'mail-send-hook))) +(define-mail-user-agent 'vm-user-agent + 'vm-compose-mail + 'vm-mail-send-and-exit) + (define-mail-user-agent 'sendmail-user-agent 'sendmail-user-agent-compose 'mail-send-and-exit) + +(defun xemacs-default-composefunc (&rest args) + "Check if VM is available; if so, set `mail-user-agent' to +`vm-user-agent', pass `args' to the corresponding mail composition function, +and return its result. Otherwise, set `mail-user-agent' to +`sendmail-user-agent', pass `args' to its composition function, and return +its result. " + (cond + ((featurep 'vm-autoloads) + (if (eq mail-user-agent 'xemacs-default-user-agent) + (setq mail-user-agent 'vm-user-agent)) + (apply (get 'vm-user-agent 'composefunc) args)) + (t + (if (eq mail-user-agent 'xemacs-default-user-agent) + (setq mail-user-agent 'sendmail-user-agent))) + (apply (get 'sendmail-user-agent 'composefunc) args))) + +;; Shouldn't be necessary, as xemacs-default-composefunc should always have +;; been called first, but is here for completeness. +(defun xemacs-default-sendfunc (&rest args) + "Check if VM is available; if so, set `mail-user-agent' to +`vm-user-agent', pass `args' to the corresponding mail send function, and +return its result. Otherwise, set `mail-user-agent' to +`sendmail-user-agent', pass `args' to its send function, and return its +result. " + (cond + ((featurep 'vm-autoloads) + (if (eq mail-user-agent 'xemacs-default-user-agent) + (setq mail-user-agent 'vm-user-agent)) + (apply (get 'vm-user-agent 'sendfunc) args)) + (t + (if (eq mail-user-agent 'xemacs-default-user-agent) + (setq mail-user-agent 'vm-user-agent))) + (apply (get 'sendmail-user-agent 'sendfunc) args))) + +(define-mail-user-agent 'xemacs-default-user-agent + 'xemacs-default-composefunc 'xemacs-default-sendfunc) (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit Index: man/xemacs/sending.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/sending.texi,v retrieving revision 1.4 diff -u -u -r1.4 sending.texi --- man/xemacs/sending.texi 2001/04/12 18:22:30 1.4 +++ man/xemacs/sending.texi 2005/03/24 01:38:23 ＠＠ -40,6 +40,16 ＠＠ ＠kbd{C-u C-x m} is another way to switch back to a message in progress: it will search for an existing, unsent mail message buffer and select it. +Starting with version 21.5, the default mail composition package in +XEmacs is VM, which is compatible with `sendmail.el' (the old default, +as described in this document) and has thorough support for attachments +and non-ASCII messages. ＠xref{(vm)}, for the full VM documentation, +should you want information on these features. XEmacs' package system +can mean that VM isn't installed---in that case, `sendmail.el' will +be the fallback. If your mail buffer is called ``*mail*'', then +you probably don't have VM installed; ＠pxref{Packages} for information +on how to install the package. + ＠menu * Format: Mail Format. Format of the mail being composed. * Headers: Mail Headers. Details of allowed mail header fields. cvs server: cannot find modules/ldap/configure -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien