Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-331
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-332
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-333
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-334
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-335
   Add note about "link" button-class to etc/TODO

 * emacs@sv.gnu.org/emacs--devo--0--patch-336
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-337
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-338
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-339
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-340
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-341
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-342
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-343
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-344
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-345
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-346
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-347
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-348
   Update for ERC 5.1.3.

 * emacs@sv.gnu.org/emacs--devo--0--patch-349
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-350
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-111
   Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-112
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-113
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-114
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-572

1 files changed, 5 insertions, 9 deletions

diff --git a/src/window.c b/src/window.c
index f3960b96f2a..77e155675dd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3678,7 +3678,7 @@ displayed.  */)
 
 DEFUN ("force-window-update", Fforce_window_update, Sforce_window_update,
        0, 1, 0,
-       doc: /* Force redisplay of all windows.
+       doc: /* Force all windows to be updated on next redisplay.
 If optional arg OBJECT is a window, force redisplay of that window only.
 If OBJECT is a buffer or buffer name, force redisplay of all windows
 displaying that buffer.  */)
@@ -5885,8 +5885,7 @@ DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_config
   register struct save_window_data *data;
   struct Lisp_Vector *saved_windows;
 
-  if (! WINDOW_CONFIGURATIONP (config))
-    wrong_type_argument (Qwindow_configuration_p, config);
+  CHECK_WINDOW_CONFIGURATION (config);
 
   data = (struct save_window_data *) XVECTOR (config);
   saved_windows = XVECTOR (data->saved_windows);
@@ -5911,8 +5910,7 @@ the return value is nil.  Otherwise the value is t.  */)
   FRAME_PTR f;
   int old_point = -1;
 
-  while (!WINDOW_CONFIGURATIONP (configuration))
-    wrong_type_argument (Qwindow_configuration_p, configuration);
+  CHECK_WINDOW_CONFIGURATION (configuration);
 
   data = (struct save_window_data *) XVECTOR (configuration);
   saved_windows = XVECTOR (data->saved_windows);
@@ -6951,10 +6949,8 @@ compare_window_configurations (c1, c2, ignore_positions)
   struct Lisp_Vector *sw1, *sw2;
   int i;
 
-  if (!WINDOW_CONFIGURATIONP (c1))
-    wrong_type_argument (Qwindow_configuration_p, c1);
-  if (!WINDOW_CONFIGURATIONP (c2))
-    wrong_type_argument (Qwindow_configuration_p, c2);
+  CHECK_WINDOW_CONFIGURATION (c1);
+  CHECK_WINDOW_CONFIGURATION (c2);
 
   d1 = (struct save_window_data *) XVECTOR (c1);
   d2 = (struct save_window_data *) XVECTOR (c2);