Mercurial > emacs
comparison lisp/startup.el @ 13153:c9694633f7ca
(command-line): Init user-mail-address here, after reading init file.
(normal-top-level): Not here.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 08 Oct 1995 19:30:41 +0000 |
| parents | 3753d2ea3ab1 |
| children | 68cd0fc88a56 |
comparison
equal
deleted
inserted
replaced
| 13152:a7e0445bd152 | 13153:c9694633f7ca |
|---|---|
| 273 "."))) | 273 "."))) |
| 274 (setq process-environment | 274 (setq process-environment |
| 275 (delete (concat "PWD=" pwd) | 275 (delete (concat "PWD=" pwd) |
| 276 process-environment))))))) | 276 process-environment))))))) |
| 277 (setq default-directory (abbreviate-file-name default-directory)) | 277 (setq default-directory (abbreviate-file-name default-directory)) |
| 278 (setq user-mail-address (concat (user-login-name) "@" | |
| 279 (or mail-host-address | |
| 280 (system-name)))) | |
| 281 ;; Specify the file for recording all the auto save files of this session. | 278 ;; Specify the file for recording all the auto save files of this session. |
| 282 ;; This is used by recover-session. | 279 ;; This is used by recover-session. |
| 283 (setq auto-save-list-file-name | 280 (setq auto-save-list-file-name |
| 284 (expand-file-name | 281 (expand-file-name |
| 285 (format "%s%d-%s" | 282 (format "%s%d-%s" |
| 522 (or (eq debug-on-error debug-on-error-initial) | 519 (or (eq debug-on-error debug-on-error-initial) |
| 523 (setq debug-on-error-should-be-set t | 520 (setq debug-on-error-should-be-set t |
| 524 debug-on-error-from-init-file debug-on-error))) | 521 debug-on-error-from-init-file debug-on-error))) |
| 525 (if debug-on-error-should-be-set | 522 (if debug-on-error-should-be-set |
| 526 (setq debug-on-error debug-on-error-from-init-file))) | 523 (setq debug-on-error debug-on-error-from-init-file))) |
| 524 | |
| 525 ;; Do this here in case the init file sets mail-host-address. | |
| 526 (or user-mail-address | |
| 527 (setq user-mail-address (concat (user-login-name) "@" | |
| 528 (or mail-host-address | |
| 529 (system-name))))) | |
| 527 | 530 |
| 528 (run-hooks 'after-init-hook) | 531 (run-hooks 'after-init-hook) |
| 529 | 532 |
| 530 ;; If *scratch* exists and init file didn't change its mode, initialize it. | 533 ;; If *scratch* exists and init file didn't change its mode, initialize it. |
| 531 (if (get-buffer "*scratch*") | 534 (if (get-buffer "*scratch*") |