diff options
| author | Chong Yidong | 2012-01-14 21:52:14 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-14 21:52:14 +0800 |
| commit | 301afadcbf1dca3b78e11d2c8781d904aa00abea (patch) | |
| tree | f486ed8872ad82664e27c80e73a564ff6c805115 | |
| parent | 233ae9000657e56086ef9396e659af67e1fc2217 (diff) | |
| download | emacs-301afadcbf1dca3b78e11d2c8781d904aa00abea.tar.gz emacs-301afadcbf1dca3b78e11d2c8781d904aa00abea.zip | |
* startup.el (command-line): Fix X resource class for cursorColor.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 968e2f91996..81556de8934 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-01-14 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * startup.el (command-line): Fix X resource class for cursorColor. | ||
| 4 | |||
| 1 | 2012-01-14 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-01-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * epg.el (epg--make-temp-file): Avoid permission race condition | 7 | * epg.el (epg--make-temp-file): Avoid permission race condition |
diff --git a/lisp/startup.el b/lisp/startup.el index 1cbf2f74c14..44e0708e3a9 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -910,7 +910,7 @@ opening the first frame (e.g. open a connection to an X server).") | |||
| 910 | (setq no-blinking-cursor t))) | 910 | (setq no-blinking-cursor t))) |
| 911 | ;; If the cursorColor X resource exists, alter the `cursor' face | 911 | ;; If the cursorColor X resource exists, alter the `cursor' face |
| 912 | ;; spec, but mark it as changed outside of Customize. | 912 | ;; spec, but mark it as changed outside of Customize. |
| 913 | (let ((color (x-get-resource "cursorColor" "CursorColor"))) | 913 | (let ((color (x-get-resource "cursorColor" "Foreground"))) |
| 914 | (when color | 914 | (when color |
| 915 | (put 'cursor 'theme-face | 915 | (put 'cursor 'theme-face |
| 916 | `((changed ((t :background ,color))))) | 916 | `((changed ((t :background ,color))))) |