Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 113-115)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90

1 files changed, 10 insertions, 14 deletions

diff --git a/src/window.c b/src/window.c
index 5a03296a18a..2d15cdc7e4e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3676,7 +3676,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.  */)
@@ -4959,9 +4959,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
           else if (noerror)
             return;
           else if (n < 0)       /* could happen with empty buffers */
-            Fsignal (Qbeginning_of_buffer, Qnil);
+            xsignal0 (Qbeginning_of_buffer);
           else
-            Fsignal (Qend_of_buffer, Qnil);
+            xsignal0 (Qend_of_buffer);
         }
       else
         {
@@ -4972,7 +4972,7 @@ window_scroll_pixel_based (window, n, whole, noerror)
           else if (noerror)
             return;
           else
-            Fsignal (Qbeginning_of_buffer, Qnil);
+            xsignal0 (Qbeginning_of_buffer);
         }
 
       /* If control gets here, then we vscrolled.  */
@@ -5173,7 +5173,7 @@ window_scroll_line_based (window, n, whole, noerror)
       if (noerror)
         return;
       else
-        Fsignal (Qbeginning_of_buffer, Qnil);
+        xsignal0 (Qbeginning_of_buffer);
     }
 
   if (pos < ZV)
@@ -5259,7 +5259,7 @@ window_scroll_line_based (window, n, whole, noerror)
       if (noerror)
         return;
       else
-        Fsignal (Qend_of_buffer, Qnil);
+        xsignal0 (Qend_of_buffer);
     }
 }
 
@@ -5883,8 +5883,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);
@@ -5909,8 +5908,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);
@@ -6949,10 +6947,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);