/[emacs]/emacs/lisp/mail/sendmail.el
ViewVC logotype

Diff of /emacs/lisp/mail/sendmail.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.246 by eliz, Fri Dec 28 12:17:37 2001 UTC revision 1.247 by rms, Fri Dec 28 18:58:40 2001 UTC
# Line 81  is a privileged operation." Line 81  is a privileged operation."
81  If this is nil while `mail-specify-envelope-from' is non-nil, the  If this is nil while `mail-specify-envelope-from' is non-nil, the
82  content of `user-mail-address' is used."  content of `user-mail-address' is used."
83    :version "21.1"    :version "21.1"
84    :type '(choice (const :tag "Use `user-mail-address'" nil)    :type '(choice (string :tag "From-name")
85                   string)                   (const :tag "Use `user-mail-address'" nil))
86    :group 'sendmail)    :group 'sendmail)
87    
88  ;;;###autoload  ;;;###autoload
# Line 798  external program defined by `sendmail-pr Line 798  external program defined by `sendmail-pr
798          (program (if (boundp 'sendmail-program)          (program (if (boundp 'sendmail-program)
799                       sendmail-program                       sendmail-program
800                     "/usr/lib/sendmail"))                     "/usr/lib/sendmail"))
801          (mail-envelope-from mail-envelope-from))          ;; Examine these variables now, so that
802            ;; local binding in the mail buffer will take effect.
803            (envelope-from
804             (and mail-specify-envelope-from
805                  (or mail-envelope-from user-mail-address))))
806      (unwind-protect      (unwind-protect
807          (save-excursion          (save-excursion
808            (set-buffer tembuf)            (set-buffer tembuf)
# Line 964  external program defined by `sendmail-pr Line 968  external program defined by `sendmail-pr
968                        (append (list (point-min) (point-max)                        (append (list (point-min) (point-max)
969                                      program                                      program
970                                      nil errbuf nil "-oi")                                      nil errbuf nil "-oi")
971                                (and mail-specify-envelope-from                                (and envelope-from
972                                     (list "-f" (or mail-envelope-from                                     (list "-f" envelope-from))
                                                   user-mail-address)))  
973  ;;;                           ;; Don't say "from root" if running under su.  ;;;                           ;; Don't say "from root" if running under su.
974  ;;;                           (and (equal (user-real-login-name) "root")  ;;;                           (and (equal (user-real-login-name) "root")
975  ;;;                                (list "-f" (user-login-name)))  ;;;                                (list "-f" (user-login-name)))

Legend:
Removed from v.1.246  
changed lines
  Added in v.1.247

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26