aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2000-07-03 19:14:39 +0000
committerGerd Moellmann2000-07-03 19:14:39 +0000
commit6753393b266d6cfd4f26e0beab026d5448754be5 (patch)
tree133ffe35c128e6255e984fb06e837e3183f096fc /lisp
parentcae2c28eeed2f90efc3fdd125b6e1d7a830b4ce1 (diff)
downloademacs-6753393b266d6cfd4f26e0beab026d5448754be5.tar.gz
emacs-6753393b266d6cfd4f26e0beab026d5448754be5.zip
(command-line): Initialize blink-cursor based
on window-system.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el7
2 files changed, 12 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8066815152a..2742992a4fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12000-07-03 Gerd Moellmann <gerd@gnu.org> 12000-07-03 Gerd Moellmann <gerd@gnu.org>
2 2
3 * frame.el (blink-cursor-mode): Don't hide cursor initially.
4
5 * startup.el (command-line): Initialize blink-cursor based
6 on window-system.
7
3 * frame.el (blink-cursor): Default to nil if not running under 8 * frame.el (blink-cursor): Default to nil if not running under
4 a window-system. 9 a window-system.
5 10
diff --git a/lisp/startup.el b/lisp/startup.el
index a51fd018c64..42a7dcffbcb 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -647,6 +647,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
647 (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0))) 647 (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0)))
648 (menu-bar-mode t)) 648 (menu-bar-mode t))
649 649
650 ;; Can't do this init in defcustom because window-system isn't set.
651 (when (and (not noninteractive)
652 (not (eq system-type 'ms-dos))
653 (memq window-system '(x w32)))
654 (setq-default blink-cursor t)
655 (blink-cursor-mode 1))
656
650 (run-hooks 'before-init-hook) 657 (run-hooks 'before-init-hook)
651 658
652 ;; Run the site-start library if it exists. The point of this file is 659 ;; Run the site-start library if it exists. The point of this file is