Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90207:43ea22612328 | 90208:890cc78a5a24 |
---|---|
573 (defun command-line () | 573 (defun command-line () |
574 (setq command-line-default-directory default-directory) | 574 (setq command-line-default-directory default-directory) |
575 | 575 |
576 ;; Choose a reasonable location for temporary files. | 576 ;; Choose a reasonable location for temporary files. |
577 (custom-reevaluate-setting 'temporary-file-directory) | 577 (custom-reevaluate-setting 'temporary-file-directory) |
578 (custom-reevaluate-setting 'small-emporary-file-directory) | 578 (custom-reevaluate-setting 'small-temporary-file-directory) |
579 (custom-reevaluate-setting 'auto-save-file-name-transforms) | 579 (custom-reevaluate-setting 'auto-save-file-name-transforms) |
580 | 580 |
581 ;; See if we should import version-control from the environment variable. | 581 ;; See if we should import version-control from the environment variable. |
582 (let ((vc (getenv "VERSION_CONTROL"))) | 582 (let ((vc (getenv "VERSION_CONTROL"))) |
583 (cond ((eq vc nil)) ;don't do anything if not set | 583 (cond ((eq vc nil)) ;don't do anything if not set |
982 (not (load (concat term-file-prefix term) t t))) | 982 (not (load (concat term-file-prefix term) t t))) |
983 ;; Strip off last hyphen and what follows, then try again | 983 ;; Strip off last hyphen and what follows, then try again |
984 (setq term | 984 (setq term |
985 (if (setq hyphend (string-match "[-_][^-_]+$" term)) | 985 (if (setq hyphend (string-match "[-_][^-_]+$" term)) |
986 (substring term 0 hyphend) | 986 (substring term 0 hyphend) |
987 nil))))) | 987 nil))) |
988 (when term | |
989 ;; The terminal file has been loaded, now call the terminal | |
990 ;; specific initialization function. | |
991 (let ((term-init-func (intern (concat "terminal-init-" term)))) | |
992 (when (fboundp term-init-func) | |
993 (funcall term-init-func)))))) | |
988 | 994 |
989 ;; Update the out-of-memory error message based on user's key bindings | 995 ;; Update the out-of-memory error message based on user's key bindings |
990 ;; for save-some-buffers. | 996 ;; for save-some-buffers. |
991 (setq memory-signal-data | 997 (setq memory-signal-data |
992 (list 'error | 998 (list 'error |
1344 (insert "\ | 1350 (insert "\ |
1345 You can do basic editing with the menu bar and scroll bar using the mouse. | 1351 You can do basic editing with the menu bar and scroll bar using the mouse. |
1346 | 1352 |
1347 Useful File menu items: | 1353 Useful File menu items: |
1348 Exit Emacs (or type Control-x followed by Control-c) | 1354 Exit Emacs (or type Control-x followed by Control-c) |
1349 Recover Session Recover files you were editing before a crash | 1355 Recover Crashed Session Recover files you were editing before a crash |
1350 | 1356 |
1351 Important Help menu items: | 1357 Important Help menu items: |
1352 Emacs Tutorial Learn how to use Emacs efficiently | 1358 Emacs Tutorial Learn how to use Emacs efficiently |
1353 Emacs FAQ Frequently asked questions and answers | 1359 Emacs FAQ Frequently asked questions and answers |
1354 Read the Emacs Manual View the Emacs manual using Info | 1360 Read the Emacs Manual View the Emacs manual using Info |