aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-07-03 16:01:31 +0000
committerGerd Moellmann2000-07-03 16:01:31 +0000
commite4f98ad3c65b83a8d49ec2f9c2657758fcb250a6 (patch)
tree9cc6b333d10602e0c2f47a15440334ac911934c0
parent2f51694043f0ef49a8e1c2ca342abc3700c3cc5a (diff)
downloademacs-e4f98ad3c65b83a8d49ec2f9c2657758fcb250a6.tar.gz
emacs-e4f98ad3c65b83a8d49ec2f9c2657758fcb250a6.zip
(blink-cursor): Default to nil if not running under
a window-system.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/frame.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2efa91c95a1..8066815152a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12000-07-03 Gerd Moellmann <gerd@gnu.org> 12000-07-03 Gerd Moellmann <gerd@gnu.org>
2 2
3 * frame.el (blink-cursor): Default to nil if not running under
4 a window-system.
5
3 * faces.el (face-spec-set): Ignore invalid attributes like 20.x. 6 * faces.el (face-spec-set): Ignore invalid attributes like 20.x.
4 (face-x-resources): Remove duplicate entry for :font. 7 (face-x-resources): Remove duplicate entry for :font.
5 8
diff --git a/lisp/frame.el b/lisp/frame.el
index e3925d2c6ca..03b9bc6e65e 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1072,7 +1072,8 @@ window blinks."
1072 (setq blink-cursor-mode t)) 1072 (setq blink-cursor-mode t))
1073 (internal-show-cursor nil t)))) 1073 (internal-show-cursor nil t))))
1074 1074
1075(defcustom blink-cursor (not (eq system-type 'ms-dos)) 1075(defcustom blink-cursor (unless (eq system-type 'ms-dos)
1076 window-system)
1076 "*Non-nil means blinking cursor mode is active." 1077 "*Non-nil means blinking cursor mode is active."
1077 :tag "Blinking cursor" 1078 :tag "Blinking cursor"
1078 :type 'boolean 1079 :type 'boolean