diff options
| -rw-r--r-- | doc/lispref/os.texi | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 553bb4a0068..178822b311e 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -940,9 +940,7 @@ string. If this variable is non-@code{nil}, it is used instead of @code{system-name} for purposes of generating email addresses. For example, it is used when constructing the default value of -@code{user-mail-address}. @xref{User Identification}. (Since this is -done when Emacs starts up, the value actually used is the one saved when -Emacs was dumped. @xref{Building Emacs}.) +@code{user-mail-address}. @xref{User Identification}. @c FIXME sounds like should probably give this a :set-after and some @c custom-initialize-delay voodoo. @end defopt diff --git a/lisp/startup.el b/lisp/startup.el index 91e7e36dd65..4272708ce9a 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -376,9 +376,8 @@ this variable usefully is to set it while building and dumping Emacs." (make-obsolete-variable 'system-name "use (system-name) instead" "25.1") (defcustom mail-host-address nil - "Name of this machine, for purposes of naming users. -If non-nil, Emacs uses this instead of `system-name' when constructing -email addresses." + "The name of this machine, for use in constructing email addresses. +If this is nil, Emacs uses `system-name'." :type '(choice (const nil) string) :group 'mail) |