summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/startup.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81556de8934..b90a40a17ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
2012-01-14 Chong Yidong <cyd@gnu.org>
* startup.el (command-line): Fix X resource class for cursorColor.
+ Fix values recognized by the cursorBlink resource.
2012-01-14 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/lisp/startup.el b/lisp/startup.el
index 44e0708e3a9..41056f3907e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -929,7 +929,7 @@ opening the first frame (e.g. open a connection to an X server).")
emacs-basic-display
(and (memq window-system '(x w32 ns))
(not (member (x-get-resource "cursorBlink" "CursorBlink")
- '("off" "false")))))
+ '("no" "off" "false" "0")))))
(setq no-blinking-cursor t))
;; Re-evaluate predefined variables whose initial value depends on