Mercurial > emacs
diff lisp/startup.el @ 90208:890cc78a5a24
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 493-503)
- Update from CVS
- Update from CVS: lisp/startup.el (command-line): Fix typo.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 95-98)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 29 Jul 2005 01:54:54 +0000 |
parents | 187d6a1f84f7 af1c58687bdd |
children | 2d92f5c9d6ae |
line wrap: on
line diff
--- a/lisp/startup.el Tue Jul 26 12:03:19 2005 +0000 +++ b/lisp/startup.el Fri Jul 29 01:54:54 2005 +0000 @@ -575,7 +575,7 @@ ;; Choose a reasonable location for temporary files. (custom-reevaluate-setting 'temporary-file-directory) - (custom-reevaluate-setting 'small-emporary-file-directory) + (custom-reevaluate-setting 'small-temporary-file-directory) (custom-reevaluate-setting 'auto-save-file-name-transforms) ;; See if we should import version-control from the environment variable. @@ -984,7 +984,13 @@ (setq term (if (setq hyphend (string-match "[-_][^-_]+$" term)) (substring term 0 hyphend) - nil))))) + nil))) + (when term + ;; The terminal file has been loaded, now call the terminal + ;; specific initialization function. + (let ((term-init-func (intern (concat "terminal-init-" term)))) + (when (fboundp term-init-func) + (funcall term-init-func)))))) ;; Update the out-of-memory error message based on user's key bindings ;; for save-some-buffers. @@ -1346,7 +1352,7 @@ Useful File menu items: Exit Emacs (or type Control-x followed by Control-c) -Recover Session Recover files you were editing before a crash +Recover Crashed Session Recover files you were editing before a crash Important Help menu items: Emacs Tutorial Learn how to use Emacs efficiently