Rework C source files to avoid ^(

[gnu-emacs] / src / xwidget.c

diff --git a/src/xwidget.c b/src/xwidget.c
index 91a92c0ca4cea1c02e2b5db56f8b15041a81e5b4..d438d8790986c7298efc4fc775f5cee1d92d6303 100644 (file)
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -6,8 +6,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -320,7 +320,7 @@ xwidget_show_view (struct xwidget_view *xv)
                   xv->y + xv->clip_top);
 }
 
-/* Hide an xvidget view.  */
+/* Hide an xwidget view.  */
 static void
 xwidget_hide_view (struct xwidget_view *xv)
 {
@@ -387,13 +387,16 @@ webkit_download_cb (WebKitWebView *webkitwebview,
 }
 
 static gboolean
-webkit_mime_type_policy_typedecision_requested_cb
-(WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request,
- gchar *mimetype, WebKitWebPolicyDecision *policy_decision, gpointer user_data)
+webkit_mime_type_policy_typedecision_requested_cb (WebKitWebView *webView,
+                                                  WebKitWebFrame *frame,
+                                                  WebKitNetworkRequest *request,
+                                                  gchar *mimetype,
+                                                  WebKitWebPolicyDecision *policy_decision,
+                                                  gpointer user_data)
 {
   /* This function makes webkit send a download signal for all unknown
      mime types.  TODO: Defer the decision to Lisp, so that it's
-     possible to make Emacs handle teext mime for instance.xs.  */
+     possible to make Emacs handle mime text for instance.  */
   if (!webkit_web_view_can_show_mime_type (webView, mimetype))
     {
       webkit_web_policy_decision_download (policy_decision);
@@ -404,10 +407,12 @@ webkit_mime_type_policy_typedecision_requested_cb
 }
 
 static gboolean
-webkit_new_window_policy_decision_requested_cb
-(WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request,
- WebKitWebNavigationAction *navigation_action,
- WebKitWebPolicyDecision *policy_decision, gpointer user_data)
+webkit_new_window_policy_decision_requested_cb (WebKitWebView *webView,
+                                               WebKitWebFrame *frame,
+                                               WebKitNetworkRequest *request,
+                                               WebKitWebNavigationAction *navigation_action,
+                                               WebKitWebPolicyDecision *policy_decision,
+                                               gpointer user_data)
 {
   struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET);
   webkit_web_navigation_action_get_original_uri (navigation_action);
@@ -419,10 +424,12 @@ webkit_new_window_policy_decision_requested_cb
 }
 
 static gboolean
-webkit_navigation_policy_decision_requested_cb
-(WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request,
- WebKitWebNavigationAction *navigation_action,
- WebKitWebPolicyDecision *policy_decision, gpointer user_data)
+webkit_navigation_policy_decision_requested_cb (WebKitWebView *webView,
+                                               WebKitWebFrame *frame,
+                                               WebKitNetworkRequest *request,
+                                               WebKitWebNavigationAction *navigation_action,
+                                               WebKitWebPolicyDecision *policy_decision,
+                                               gpointer user_data)
 {
   struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET);
   store_xwidget_event_string (xw, "navigation-policy-decision-requested",
@@ -530,7 +537,7 @@ xwidget_init_view (struct xwidget *xww,
      container later.  Drawing should crop container window if necessary
      to handle case where xwidget is partially obscured by other Emacs
      windows.  Other containers than gtk_fixed where explored, but
-     gtk_fixed had the most predictable behaviour so far.  */
+     gtk_fixed had the most predictable behavior so far.  */
 
   xv->emacswindow = FRAME_GTK_WIDGET (s->f);
   xv->widgetwindow = gtk_fixed_new ();
@@ -594,7 +601,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
          WINDOW_BOTTOM_EDGE_Y (s->w) - WINDOW_MODE_LINE_HEIGHT (s->w) - y);
   clip_top = max (0, WINDOW_TOP_EDGE_Y (s->w) - y);
 
-  /* We are conserned with movement of the onscreen area.  The area
+  /* We are concerned with movement of the onscreen area.  The area
      might sit still when the widget actually moves.  This happens
      when an Emacs window border moves across a widget window.  So, if
      any corner of the outer widget clipping window moves, that counts
@@ -615,7 +622,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
   /* Clip the widget window if some parts happen to be outside
      drawable area.  An Emacs window is not a gtk window.  A gtk window
      covers the entire frame.  Clipping might have changed even if we
-     havent actualy moved, we try figure out when we need to reclip
+     haven't actually moved; try to figure out when we need to reclip
      for real.  */
   if (xv->clip_right != clip_right
       || xv->clip_bottom != clip_bottom
@@ -1132,7 +1139,7 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
      not in the desired matrix.
 
      This only takes care of xwidgets in active windows.  If a window
-     goes away from screen xwidget views wust be deleted.
+     goes away from the screen, xwidget views must be deleted.
 
      dump_glyph_matrix (matrix, 2);  */
   for (i = 0; i < matrix->nrows; ++i)