Mercurial > hg > xemacs-beta

diff lisp/modes/sendmail.el @ 48:56c54cf7c5b6 r19-16b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-16b90
author cvs
date Mon, 13 Aug 2007 08:56:04 +0200
parents 8b8b7f3559a2
children 131b0175ea99
line wrap: on
line diff
--- a/lisp/modes/sendmail.el	Mon Aug 13 08:55:32 2007 +0200
+++ b/lisp/modes/sendmail.el	Mon Aug 13 08:56:04 2007 +0200
@@ -290,7 +290,9 @@
 ;; Emacs and XEmacs less stupid about default mail addresses.
 
 ;; We trust the administrator if he has set `mail-host-address'.
-(defcustom query-user-mail-address (not mail-host-address)
+;; We trust the user if he has already customized `user-mail-address'.
+(defcustom query-user-mail-address (and (not mail-host-address)
+					(not user-mail-address))
   "If non-nil, prompt the user for his mail address."
   :group 'message
   :type 'boolean)
@@ -1003,10 +1005,8 @@
 	  t)
       (or soft
 	  (progn (goto-char end)
-		 ;; #### FSF has the next two clauses reversed.
-		 ;; which is correct?
-		 (skip-chars-backward "\n")
-		 (insert "\n" field ": ")))
+		 (insert field ": \n")
+		 (forward-char -1)))
       nil)))
 
 (defun mail-text ()