Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31

1 files changed, 3 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 6183ffade0d..1ced63932e5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2537,9 +2537,11 @@ x_draw_image_glyph_string (s)
             {
               /* Fill background with a stipple pattern.  */
               XSetFillStyle (s->display, s->gc, FillOpaqueStippled);
+              XSetTSOrigin (s->display, s->gc, - s->x, - s->y);
               XFillRectangle (s->display, pixmap, s->gc,
                               0, 0, s->background_width, s->height);
               XSetFillStyle (s->display, s->gc, FillSolid);
+              XSetTSOrigin (s->display, s->gc, 0, 0);
             }
           else
             {
@@ -6711,7 +6713,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
                 /* Window will be selected only when it is not selected now and
                    last mouse movement event was not in it.  Minibuffer window
-                   will be selected iff it is active.  */
+                   will be selected only when it is active.  */
                 if (WINDOWP (window)
                     && !EQ (window, last_window)
                     && !EQ (window, selected_window))