comparison lisp/startup.el @ 90147:e1fbb019c538

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 258-271) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 66) - Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 21 Apr 2005 05:59:53 +0000
parents 146c086df160 a473e4d3af75
children 08185296b491
comparison
equal deleted inserted replaced
90146:a4445dd2a017 90147:e1fbb019c538
717 ;; Under X Window, this creates the X frame and deletes the terminal frame. 717 ;; Under X Window, this creates the X frame and deletes the terminal frame.
718 (when (fboundp 'frame-initialize) 718 (when (fboundp 'frame-initialize)
719 (frame-initialize)) 719 (frame-initialize))
720 720
721 ;; Turn off blinking cursor if so specified in X resources. This is here 721 ;; Turn off blinking cursor if so specified in X resources. This is here
722 ;; only because all other settings of no-blinking-cursor is here. 722 ;; only because all other settings of no-blinking-cursor are here.
723 (unless (or noninteractive 723 (unless (or noninteractive
724 emacs-basic-display 724 emacs-basic-display
725 (and (memq window-system '(x w32 mac)) 725 (and (memq window-system '(x w32 mac))
726 (not (member (x-get-resource "cursorBlink" "CursorBlink") 726 (not (member (x-get-resource "cursorBlink" "CursorBlink")
727 '("off" "false"))))) 727 '("off" "false")))))
744 ;; Can't do this init in defcustom because the relevant variables 744 ;; Can't do this init in defcustom because the relevant variables
745 ;; are not set. 745 ;; are not set.
746 (custom-reevaluate-setting 'blink-cursor-mode) 746 (custom-reevaluate-setting 'blink-cursor-mode)
747 (custom-reevaluate-setting 'normal-erase-is-backspace) 747 (custom-reevaluate-setting 'normal-erase-is-backspace)
748 748
749 ;; If you change the code below, you need to also change the
750 ;; corresponding code in the tooltip-mode defcustom. The two need
751 ;; to be equivalent under all conditions, or Custom will get confused.
749 (unless (or noninteractive 752 (unless (or noninteractive
750 emacs-basic-display 753 emacs-basic-display
751 (not (display-graphic-p)) 754 (not (display-graphic-p))
752 (not (fboundp 'x-show-tip))) 755 (not (fboundp 'x-show-tip)))
753 (tooltip-mode 1)) 756 (tooltip-mode 1))
754
755 ;; If you change the code below, you need to also change the
756 ;; corresponding code in the xterm-mouse-mode defcustom. The two need
757 ;; to be equivalent under all conditions, or Custom will get confused.
758 (unless (or noninteractive
759 window-system)
760 (let ((term (getenv "TERM")))
761 (and term
762 (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" term)
763 (xterm-mouse-mode 1))))
764 757
765 ;; Register default TTY colors for the case the terminal hasn't a 758 ;; Register default TTY colors for the case the terminal hasn't a
766 ;; terminal init file. 759 ;; terminal init file.
767 (unless (memq window-system '(x w32)) 760 (unless (memq window-system '(x w32))
768 ;; We do this regardles of whether the terminal supports colors 761 ;; We do this regardles of whether the terminal supports colors
1080 "Fancy splash screen when Emacs starts." 1073 "Fancy splash screen when Emacs starts."
1081 :version "21.1" 1074 :version "21.1"
1082 :group 'initialization) 1075 :group 'initialization)
1083 1076
1084 1077
1085 (defcustom fancy-splash-delay 10 1078 (defcustom fancy-splash-delay 7
1086 "*Delay in seconds between splash screens." 1079 "*Delay in seconds between splash screens."
1087 :group 'fancy-splash-screen 1080 :group 'fancy-splash-screen
1088 :type 'integer) 1081 :type 'integer)
1089 1082
1090 1083
1091 (defcustom fancy-splash-max-time 60 1084 (defcustom fancy-splash-max-time 30
1092 "*Show splash screens for at most this number of seconds. 1085 "*Show splash screens for at most this number of seconds.
1093 Values less than 60 seconds are ignored." 1086 Values less than twice `fancy-splash-delay' are ignored."
1094 :group 'fancy-splash-screen 1087 :group 'fancy-splash-screen
1095 :type 'integer) 1088 :type 'integer)
1096 1089
1097 1090
1098 (defcustom fancy-splash-image nil 1091 (defcustom fancy-splash-image nil
1269 minor-mode-map-alist nil 1262 minor-mode-map-alist nil
1270 buffer-undo-list t 1263 buffer-undo-list t
1271 mode-line-format (propertize "---- %b %-" 1264 mode-line-format (propertize "---- %b %-"
1272 'face '(:weight bold)) 1265 'face '(:weight bold))
1273 fancy-splash-stop-time (+ (float-time) 1266 fancy-splash-stop-time (+ (float-time)
1274 (max 60 fancy-splash-max-time)) 1267 fancy-splash-max-time)
1275 timer (run-with-timer 0 fancy-splash-delay 1268 timer (run-with-timer 0 fancy-splash-delay
1276 #'fancy-splash-screens-1 1269 #'fancy-splash-screens-1
1277 splash-buffer)) 1270 splash-buffer))
1278 (recursive-edit)) 1271 (recursive-edit))
1279 (cancel-timer timer) 1272 (cancel-timer timer)