aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong <[email protected]>2012-01-15 00:09:55 +0800
committerChong Yidong <[email protected]>2012-01-15 00:09:55 +0800
commit04877ddb324700e5fbd97fdd52516ed6a81582ea (patch)
tree380afca828e5766b4d8454aad2f8a6ab2dbf77b5
parent301afadcbf1dca3b78e11d2c8781d904aa00abea (diff)
* startup.el (command-line): Fix values recognized by cursorBlink resource.
-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 81556de893..b90a40a17a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
2012-01-14 Chong Yidong <[email protected]>
* startup.el (command-line): Fix X resource class for cursorColor.
+ Fix values recognized by the cursorBlink resource.
2012-01-14 Paul Eggert <[email protected]>
diff --git a/lisp/startup.el b/lisp/startup.el
index 44e0708e3a..41056f3907 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