diff options
| author | Kenichi Handa | 2014-01-11 22:00:54 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-01-11 22:00:54 +0900 |
| commit | af05bef2d1985fb9bd8485f3084f3bfe282a911f (patch) | |
| tree | 073c53ac52592c200d8b00e5458d4dc70c8647f4 /src/ChangeLog.3 | |
| parent | 3923e7bde942018135c7362c75327ffddcbd81fc (diff) | |
| parent | 02013850f638520bed0d6c3f77eb9c80e0f73983 (diff) | |
| download | emacs-af05bef2d1985fb9bd8485f3084f3bfe282a911f.tar.gz emacs-af05bef2d1985fb9bd8485f3084f3bfe282a911f.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog.3')
| -rw-r--r-- | src/ChangeLog.3 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 1a2763f8ff8..cee5d43ed57 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -15138,8 +15138,8 @@ | |||
| 15138 | 15138 | ||
| 15139 | 1989-06-23 Joseph Arceneaux (jla@apple-gunkies.ai.mit.edu) | 15139 | 1989-06-23 Joseph Arceneaux (jla@apple-gunkies.ai.mit.edu) |
| 15140 | 15140 | ||
| 15141 | * xfns.c, lisp/term/x-win.el: C routine Fscreen_color_p now lisp | 15141 | * xfns.c: C routine Fscreen_color_p now lisp |
| 15142 | function x-color-screen-p in x-win.el. | 15142 | function x-color-screen-p in lisp/term/x-win.el. |
| 15143 | (x_set_cursor_color): New method: first disallow same cursor as | 15143 | (x_set_cursor_color): New method: first disallow same cursor as |
| 15144 | background, then if cursor not foreground, use it as cursor | 15144 | background, then if cursor not foreground, use it as cursor |
| 15145 | foreground. | 15145 | foreground. |