diff options
| author | YAMAMOTO Mitsuharu | 2014-03-04 20:02:36 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2014-03-04 20:02:36 +0900 |
| commit | a55130ca1052ba7ddcd9ef22db986cef053f4e00 (patch) | |
| tree | ca39a8f9efd8b30b4211738cc4aaaeca660d9d58 | |
| parent | 87132570ad230845ece2204c5c29a30af253c2f5 (diff) | |
| download | emacs-a55130ca1052ba7ddcd9ef22db986cef053f4e00.tar.gz emacs-a55130ca1052ba7ddcd9ef22db986cef053f4e00.zip | |
* xterm.c (x_draw_stretch_glyph_string): Reset clipping. (Bug#16932)
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ca2d811f27..54ee0ffcc8a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * xterm.c (x_draw_stretch_glyph_string): Reset clipping. | ||
| 4 | (Bug#16932) | ||
| 5 | |||
| 1 | 2014-03-04 Michal Nazarewicz <mina86@mina86.com> | 6 | 2014-03-04 Michal Nazarewicz <mina86@mina86.com> |
| 2 | 7 | ||
| 3 | * cmds.c (delete-char): Update docstring pointing out that the | 8 | * cmds.c (delete-char): Update docstring pointing out that the |
diff --git a/src/xterm.c b/src/xterm.c index f06225002a7..71b5126f340 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -2501,6 +2501,8 @@ x_draw_stretch_glyph_string (struct glyph_string *s) | |||
| 2501 | XFillRectangle (s->display, s->window, gc, x, y, w, h); | 2501 | XFillRectangle (s->display, s->window, gc, x, y, w, h); |
| 2502 | XSetForeground (s->display, gc, xgcv.foreground); | 2502 | XSetForeground (s->display, gc, xgcv.foreground); |
| 2503 | } | 2503 | } |
| 2504 | |||
| 2505 | XSetClipMask (s->display, gc, None); | ||
| 2504 | } | 2506 | } |
| 2505 | } | 2507 | } |
| 2506 | else if (!s->background_filled_p) | 2508 | else if (!s->background_filled_p) |