diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-03-26 23:45:12 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-03-26 23:45:12 -0700 |
| commit | 7cf97172588ca5ce68f483f882ec399235786089 (patch) | |
| tree | 4c15f2fa5787b93a4d4ebae5ea85c164c05ec07c | |
| parent | cbaec0c9e639bf9d72713505977b47b0533d3139 (diff) | |
| download | emacs-7cf97172588ca5ce68f483f882ec399235786089.tar.gz | |
* lisp/startup.el (mail-host-address): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6cd307e5375..732085d27b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-03-27 Glenn Morris <rgm@gnu.org> + + * startup.el (mail-host-address): Doc fix. + 2012-03-26 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more diff --git a/lisp/startup.el b/lisp/startup.el index 57d7a74e5ec..37e4f550dcd 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -339,7 +339,9 @@ this variable usefully is to set it while building and dumping Emacs." (error "Customizing `site-run-file' does not work"))) (defcustom mail-host-address nil - "Name of this machine, for purposes of naming users." + "Name of this machine, for purposes of naming users. +If non-nil, Emacs uses this instead of `system-name' when constructing +email addresses." :type '(choice (const nil) string) :group 'mail) |