Mercurial > hg > xemacs-beta
comparison lisp/modes/sendmail.el @ 114:8619ce7e4c50 r20-1b9
Import from CVS: tag r20-1b9
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:21:54 +0200 |
parents | fe104dbd9147 |
children | 9f59509498e1 |
comparison
equal
deleted
inserted
replaced
113:2ec2fe4a4c89 | 114:8619ce7e4c50 |
---|---|
293 (defcustom query-user-mail-address (not mail-host-address) | 293 (defcustom query-user-mail-address (not mail-host-address) |
294 "If non-nil, prompt the user for his mail address." | 294 "If non-nil, prompt the user for his mail address." |
295 :group 'message | 295 :group 'message |
296 :type 'boolean) | 296 :type 'boolean) |
297 | 297 |
298 ;;;###autoload | |
298 (defun user-mail-address () | 299 (defun user-mail-address () |
299 "Query the user for his mail address, unless it is already known." | 300 "Query the user for his mail address, unless it is already known." |
300 (interactive) | 301 (interactive) |
301 (when query-user-mail-address | 302 (when (and (not noninteractive) query-user-mail-address) |
302 (setq user-mail-address | 303 (let ((addr (or user-mail-address |
303 (read-string "Your mail address? " (cons user-mail-address 0))) | 304 (concat (user-login-name) "@" |
304 (setq query-user-mail-address nil) | 305 (or mail-host-address |
305 ;; TODO: Run sanity check from Gnus here. | 306 (system-name)))))) |
306 (when (y-or-n-p "Save address for future sessions? ") | 307 (setq user-mail-address |
307 (put 'user-mail-address 'saved-value | 308 (read-string "Your mail address? " (cons addr 0))) |
308 (list user-mail-address)) | 309 (setq query-user-mail-address nil) |
309 (put 'query-user-mail-address 'saved-value '(nil)) | 310 ;; TODO: Run sanity check from Gnus here. |
310 (custom-save-all))) | 311 (when (y-or-n-p "Save address for future sessions? ") |
311 user-mail-address) | 312 (put 'user-mail-address 'saved-value |
313 (list user-mail-address)) | |
314 (put 'query-user-mail-address 'saved-value '(nil)) | |
315 (custom-save-all))) | |
316 (if user-mail-address | |
317 user-mail-address | |
318 (setq user-mail-address (concat (user-login-name) "@" | |
319 (or mail-host-address | |
320 (system-name))))))) | |
312 | 321 |
313 (defun mail-setup (to subject in-reply-to cc replybuffer actions) | 322 (defun mail-setup (to subject in-reply-to cc replybuffer actions) |
314 (or mail-default-reply-to | 323 (or mail-default-reply-to |
315 (setq mail-default-reply-to (getenv "REPLYTO"))) | 324 (setq mail-default-reply-to (getenv "REPLYTO"))) |
316 ;Removed. See `mail-abbrevs.el'. | 325 ;Removed. See `mail-abbrevs.el'. |
628 (replace-match "")) | 637 (replace-match "")) |
629 ;; Put the "From:" field in unless for some odd reason | 638 ;; Put the "From:" field in unless for some odd reason |
630 ;; they put one in themselves. | 639 ;; they put one in themselves. |
631 (goto-char (point-min)) | 640 (goto-char (point-min)) |
632 (if (not (re-search-forward "^From:" delimline t)) | 641 (if (not (re-search-forward "^From:" delimline t)) |
633 (let* ((login user-mail-address) | 642 (let* ((login (user-mail-address)) |
634 (fullname (user-full-name))) | 643 (fullname (user-full-name))) |
635 (cond ((eq mail-from-style 'angles) | 644 (cond ((eq mail-from-style 'angles) |
636 (insert "From: " fullname) | 645 (insert "From: " fullname) |
637 (let ((fullname-start (+ (point-min) 6)) | 646 (let ((fullname-start (+ (point-min) 6)) |
638 (fullname-end (point-marker))) | 647 (fullname-end (point-marker))) |