aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
12012-01-14 Chong Yidong <cyd@gnu.org> 12012-01-14 Chong Yidong <cyd@gnu.org>
2 2
3 * startup.el (command-line): Fix X resource class for cursorColor. 3 * startup.el (command-line): Fix X resource class for cursorColor.
4 Fix values recognized by the cursorBlink resource.
4 5
52012-01-14 Paul Eggert <eggert@cs.ucla.edu> 62012-01-14 Paul Eggert <eggert@cs.ucla.edu>
6 7
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).")
929 emacs-basic-display 929 emacs-basic-display
930 (and (memq window-system '(x w32 ns)) 930 (and (memq window-system '(x w32 ns))
931 (not (member (x-get-resource "cursorBlink" "CursorBlink") 931 (not (member (x-get-resource "cursorBlink" "CursorBlink")
932 '("off" "false"))))) 932 '("no" "off" "false" "0")))))
933 (setq no-blinking-cursor t)) 933 (setq no-blinking-cursor t))
934 934
935 ;; Re-evaluate predefined variables whose initial value depends on 935 ;; Re-evaluate predefined variables whose initial value depends on