aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2010-12-06 07:51:06 +0100
committerJan Djärv2010-12-06 07:51:06 +0100
commit0afb6242c77237cd2cc1f0e623b08e20488c5b74 (patch)
tree380a958bf517d672f98e66a0528390eb4c82e3d2
parenta56d164e67624f351b2b89a340fa212f8c5b8efd (diff)
downloademacs-0afb6242c77237cd2cc1f0e623b08e20488c5b74.tar.gz
emacs-0afb6242c77237cd2cc1f0e623b08e20488c5b74.zip
* frame.el (blink-cursor-mode): Make default t for ns.
-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 @@
12010-12-06 Jan Djärv <jan.h.d@swipnet.se>
2
3 * frame.el (blink-cursor-mode): Make default t for ns.
4
12010-12-05 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> 52010-12-05 Bob Rogers <rogers-emacs@rgrjr.dyndns.org>
2 6
3 * vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501). 7 * 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."
1614 :init-value (not (or noninteractive 1614 :init-value (not (or noninteractive
1615 no-blinking-cursor 1615 no-blinking-cursor
1616 (eq system-type 'ms-dos) 1616 (eq system-type 'ms-dos)
1617 (not (memq window-system '(x w32))))) 1617 (not (memq window-system '(x w32 ns)))))
1618 :initialize 'custom-initialize-delay 1618 :initialize 'custom-initialize-delay
1619 :group 'cursor 1619 :group 'cursor
1620 :global t 1620 :global t