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, 1 insertions, 1 deletions

diff --git a/src/w32term.c b/src/w32term.c
index fb312010728..100af4ebc21 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4378,7 +4378,7 @@ w32_read_socket (sd, expected, 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.  */
+                     only when it is active.  */
                   if (WINDOWP(window)
                       && !EQ (window, last_window)
                       && !EQ (window, selected_window))