summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e80a7a6e19..125ce3351ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-06 Jan Djärv <jan.h.d@swipnet.se>
+
+ * frame.el (blink-cursor-mode): Make default t for ns.
+
2010-12-05 Bob Rogers <rogers-emacs@rgrjr.dyndns.org>
* vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).
diff --git a/lisp/frame.el b/lisp/frame.el
index 0628db7ee38..99f7a26d27a 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1614,7 +1614,7 @@ cursor display. On a text-only terminal, this is not implemented."
:init-value (not (or noninteractive
no-blinking-cursor
(eq system-type 'ms-dos)
- (not (memq window-system '(x w32)))))
+ (not (memq window-system '(x w32 ns)))))
:initialize 'custom-initialize-delay
:group 'cursor
:global t