Let the cursorColor X resource set the the cursor face (Bug#7392).

* lisp/startup.el (command-line): If the cursorColor resource is set,
change the cursor face-spec (Bug#7392).

* src/xfns.c (Fx_create_frame): Don't check for the cursorColor
resource here; it's now done at startup.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dae413af666904f453a64d63b35c05ff7d7a52ef..99eca11ee4c3a8691326f313f3fa317fb8b4a3f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * startup.el (command-line): If the cursorColor resource is set,
+       change the cursor face-spec (Bug#7392).
+
 2010-11-13  Ken Manheimer  <ken.manheimer@gmail.com>
 
        The main features of the following allout.el changes are:

diff --git a/lisp/startup.el b/lisp/startup.el
index b77b4b97d5b96497ff9397c409fe0d49509322d8..8dd76b29741e6690df013a7fc56fe81563609d9f 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -885,14 +885,15 @@ opening the first frame (e.g. open a connection to an X server).")
 
   ;; Under X, this creates the X frame and deletes the terminal frame.
   (unless (daemonp)
-    ;; Enable or disable the tool-bar and menu-bar.
-    ;; While we're at it, set `no-blinking-cursor' too.
+
+    ;; If X resources are available, use them to initialize the values
+    ;; of `tool-bar-mode' and `menu-bar-mode', as well as the value of
+    ;; `no-blinking-cursor' and the `cursor' face.
     (cond
      ((or noninteractive emacs-basic-display)
       (setq menu-bar-mode nil
            tool-bar-mode nil
            no-blinking-cursor t))
-     ;; Check X resources if available.
      ((memq initial-window-system '(x w32 ns))
       (let ((no-vals  '("no" "off" "false" "0")))
        (if (member (x-get-resource "menuBar" "MenuBar") no-vals)
@@ -901,7 +902,13 @@ opening the first frame (e.g. open a connection to an X server).")
            (setq tool-bar-mode nil))
        (if (member (x-get-resource "cursorBlink" "CursorBlink")
                    no-vals)
-           (setq no-blinking-cursor t)))))
+           (setq no-blinking-cursor t)))
+      ;; If the cursorColor X resource exists, alter the `cursor' face
+      ;; spec, but mark it as changed outside of Customize.
+      (let ((color (x-get-resource "cursorColor" "CursorColor")))
+       (when color
+         (face-spec-set 'cursor `((t (:background ,color))))
+         (put 'cursor 'face-modified t)))))
     (frame-initialize))
 
   (when (fboundp 'x-create-frame)

diff --git a/src/ChangeLog b/src/ChangeLog
index 98054e08d45af0cfa884338aff3dd86f561699b3..dbd735f72f942594111c45da22c8414a7d4fe004 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xfns.c (Fx_create_frame): Don't check for the cursorColor
+       resource here; it's now done at startup.
+
 2010-11-13  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * xmenu.c: Make it clear that ../lwlib/lwlib.h is only needed for Motif.

diff --git a/src/xfns.c b/src/xfns.c
index 79e21fa0b508df663f8b77ecc53d8e83d576e7a7..32e390e1e1e9d7250d6669fab77b89a86ed812d2 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3367,8 +3367,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
                       "background", "Background", RES_TYPE_STRING);
   x_default_parameter (f, parms, Qmouse_color, build_string ("black"),
                       "pointerColor", "Foreground", RES_TYPE_STRING);
-  x_default_parameter (f, parms, Qcursor_color, build_string ("black"),
-                      "cursorColor", "Foreground", RES_TYPE_STRING);
   x_default_parameter (f, parms, Qborder_color, build_string ("black"),
                       "borderColor", "BorderColor", RES_TYPE_STRING);
   x_default_parameter (f, parms, Qscreen_gamma, Qnil,