diff options
| author | Chong Yidong | 2010-11-13 21:09:11 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-11-13 21:09:11 -0500 |
| commit | afa42fe3f1f069e403c21f2872347c448b06af58 (patch) | |
| tree | 2372ab9db371c89fe9b1525410877589a653b9f6 /src | |
| parent | 626b459f3331e9f83ac8c79d267921ecceb94091 (diff) | |
| download | emacs-afa42fe3f1f069e403c21f2872347c448b06af58.tar.gz emacs-afa42fe3f1f069e403c21f2872347c448b06af58.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 98054e08d45..dbd735f72f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-14 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xfns.c (Fx_create_frame): Don't check for the cursorColor | ||
| 4 | resource here; it's now done at startup. | ||
| 5 | |||
| 1 | 2010-11-13 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2010-11-13 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * xmenu.c: Make it clear that ../lwlib/lwlib.h is only needed for Motif. | 8 | * 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 79e21fa0b50..32e390e1e1e 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3367,8 +3367,6 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 3367 | "background", "Background", RES_TYPE_STRING); | 3367 | "background", "Background", RES_TYPE_STRING); |
| 3368 | x_default_parameter (f, parms, Qmouse_color, build_string ("black"), | 3368 | x_default_parameter (f, parms, Qmouse_color, build_string ("black"), |
| 3369 | "pointerColor", "Foreground", RES_TYPE_STRING); | 3369 | "pointerColor", "Foreground", RES_TYPE_STRING); |
| 3370 | x_default_parameter (f, parms, Qcursor_color, build_string ("black"), | ||
| 3371 | "cursorColor", "Foreground", RES_TYPE_STRING); | ||
| 3372 | x_default_parameter (f, parms, Qborder_color, build_string ("black"), | 3370 | x_default_parameter (f, parms, Qborder_color, build_string ("black"), |
| 3373 | "borderColor", "BorderColor", RES_TYPE_STRING); | 3371 | "borderColor", "BorderColor", RES_TYPE_STRING); |
| 3374 | x_default_parameter (f, parms, Qscreen_gamma, Qnil, | 3372 | x_default_parameter (f, parms, Qscreen_gamma, Qnil, |