comparison lisp/startup.el @ 90228:fa0da9b57058

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 542-553) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 116-121) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Mon, 19 Sep 2005 10:20:33 +0000
parents 2d92f5c9d6ae 4d1085b02d64
children 5e2d3828e89f
comparison
equal deleted inserted replaced
90227:10fe5fadaf89 90228:fa0da9b57058
974 ;; Load library for our terminal type. 974 ;; Load library for our terminal type.
975 ;; User init file can set term-file-prefix to nil to prevent this. 975 ;; User init file can set term-file-prefix to nil to prevent this.
976 (unless (or noninteractive 976 (unless (or noninteractive
977 window-system 977 window-system
978 (null term-file-prefix)) 978 (null term-file-prefix))
979 (let ((term (getenv "TERM")) 979 (let* ((TERM (getenv "TERM"))
980 (term TERM)
980 hyphend) 981 hyphend)
981 (while (and term 982 (while (and term
982 (not (load (concat term-file-prefix term) t t))) 983 (not (load (concat term-file-prefix term) t t)))
983 ;; Strip off last hyphen and what follows, then try again 984 ;; Strip off last hyphen and what follows, then try again
984 (setq term 985 (setq term
985 (if (setq hyphend (string-match "[-_][^-_]+$" term)) 986 (if (setq hyphend (string-match "[-_][^-_]+\\'" term))
986 (substring term 0 hyphend) 987 (substring term 0 hyphend)
987 nil))) 988 nil)))
988 (when term 989 (setq term TERM)
989 ;; The terminal file has been loaded, now call the terminal 990 ;; The terminal file has been loaded, now call the terminal specific
990 ;; specific initialization function. 991 ;; initialization function.
991 (let ((term-init-func (intern (concat "terminal-init-" term)))) 992 (while term
992 (when (fboundp term-init-func) 993 (let ((term-init-func (intern-soft (concat "terminal-init-" term))))
994 (if (not (fboundp term-init-func))
995 ;; Strip off last hyphen and what follows, then try again
996 (setq term
997 (if (setq hyphend (string-match "[-_][^-_]+\\'" term))
998 (substring term 0 hyphend)
999 nil))
1000 (setq term nil)
993 (funcall term-init-func)))))) 1001 (funcall term-init-func))))))
994 1002
995 ;; Update the out-of-memory error message based on user's key bindings 1003 ;; Update the out-of-memory error message based on user's key bindings
996 ;; for save-some-buffers. 1004 ;; for save-some-buffers.
997 (setq memory-signal-data 1005 (setq memory-signal-data
1470 \\[describe-project]."))) 1478 \\[describe-project].")))
1471 1479
1472 1480
1473 (defun display-startup-echo-area-message () 1481 (defun display-startup-echo-area-message ()
1474 (let ((resize-mini-windows t)) 1482 (let ((resize-mini-windows t))
1475 (message (startup-echo-area-message)))) 1483 (message "%s" (startup-echo-area-message))))
1476 1484
1477 1485
1478 (defun display-splash-screen () 1486 (defun display-splash-screen ()
1479 "Display splash screen according to display. 1487 "Display splash screen according to display.
1480 Fancy splash screens are used on graphic displays, 1488 Fancy splash screens are used on graphic displays,