Mercurial > emacs
diff lisp/startup.el @ 83288:2c2b97b30980
Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-246
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-249
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-250
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-251
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-252
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-253
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-255
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-257
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-258
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-259
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-260
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-261
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-262
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-263
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-264
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-265
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
(mm-string-to-multibyte): Use Gnus trunk definition.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-328
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 18 Apr 2005 13:40:23 +0000 |
parents | 9deb6323655c a473e4d3af75 |
children | ad07ff6e4555 |
line wrap: on
line diff
--- a/lisp/startup.el Mon Apr 18 13:17:40 2005 +0000 +++ b/lisp/startup.el Mon Apr 18 13:40:23 2005 +0000 @@ -719,10 +719,19 @@ (and command-line-args (setcdr command-line-args args))) - ;; Under X Windows, this creates the X frame and deletes the terminal frame. + ;; Under X Window, this creates the X frame and deletes the terminal frame. (when (fboundp 'frame-initialize) (frame-initialize)) + ;; Turn off blinking cursor if so specified in X resources. This is here + ;; only because all other settings of no-blinking-cursor are here. + (unless (or noninteractive + emacs-basic-display + (and (memq window-system '(x w32 mac)) + (not (member (x-get-resource "cursorBlink" "CursorBlink") + '("off" "false"))))) + (setq no-blinking-cursor t)) + ;; If frame was created with a menu bar, set menu-bar-mode on. (unless (or noninteractive emacs-basic-display @@ -742,6 +751,9 @@ (custom-reevaluate-setting 'blink-cursor-mode) (custom-reevaluate-setting 'normal-erase-is-backspace) + ;; If you change the code below, you need to also change the + ;; corresponding code in the tooltip-mode defcustom. The two need + ;; to be equivalent under all conditions, or Custom will get confused. (unless (or noninteractive emacs-basic-display (not (display-graphic-p)) @@ -1067,15 +1079,15 @@ :group 'initialization) -(defcustom fancy-splash-delay 10 +(defcustom fancy-splash-delay 7 "*Delay in seconds between splash screens." :group 'fancy-splash-screen :type 'integer) -(defcustom fancy-splash-max-time 60 +(defcustom fancy-splash-max-time 30 "*Show splash screens for at most this number of seconds. -Values less than 60 seconds are ignored." +Values less than twice `fancy-splash-delay' are ignored." :group 'fancy-splash-screen :type 'integer) @@ -1253,7 +1265,7 @@ mode-line-format (propertize "---- %b %-" 'face '(:weight bold)) fancy-splash-stop-time (+ (float-time) - (max 60 fancy-splash-max-time)) + fancy-splash-max-time) timer (run-with-timer 0 fancy-splash-delay #'fancy-splash-screens-1 splash-buffer))