diff options
| author | Glenn Morris | 2012-03-26 23:45:12 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-03-26 23:45:12 -0700 |
| commit | b4fa35fa9c8468dc1a26c54f5e84e64301f7e1d8 (patch) | |
| tree | 3b4bf32f1e2bb262a90bc7c6f216385677da9dc9 | |
| parent | 9364727b1923ce22e34b591435b679daa7519877 (diff) | |
| download | emacs-b4fa35fa9c8468dc1a26c54f5e84e64301f7e1d8.tar.gz emacs-b4fa35fa9c8468dc1a26c54f5e84e64301f7e1d8.zip | |
* 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 93ae0f12862..ca07cc36062 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-03-27 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * startup.el (mail-host-address): Doc fix. | ||
| 4 | |||
| 1 | 2012-03-26 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-03-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more | 7 | * 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." | |||
| 339 | (error "Customizing `site-run-file' does not work"))) | 339 | (error "Customizing `site-run-file' does not work"))) |
| 340 | 340 | ||
| 341 | (defcustom mail-host-address nil | 341 | (defcustom mail-host-address nil |
| 342 | "Name of this machine, for purposes of naming users." | 342 | "Name of this machine, for purposes of naming users. |
| 343 | If non-nil, Emacs uses this instead of `system-name' when constructing | ||
| 344 | email addresses." | ||
| 343 | :type '(choice (const nil) string) | 345 | :type '(choice (const nil) string) |
| 344 | :group 'mail) | 346 | :group 'mail) |
| 345 | 347 | ||