[Emacs-diffs] emacs-25 13c8f29 2/2: make-xwidget unused arg cleanup

[Paul Eggert]

branch: emacs-25
commit 13c8f29ce361e3aad71cf2b44e76d5cfdaf7dda3
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    make-xwidget unused arg cleanup
    
    * doc/lispref/display.texi (Xwidgets): Remove stray refs.
    * src/xwidget.c (syms_of_xwidget): Qwebkit, not Qwebkit_osr.
---
 doc/lispref/display.texi |    5 ++---
 src/xwidget.c            |   14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 2d8b60d..9ea9548 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5642,8 +5642,7 @@ in a @code{display} text or overlay property 
(@pxref{Display
 Property}).
 
 @defun make-xwidget type title width height arguments &optional buffer
-This creates an xwidget object between @var{beg} and @var{end}, buffer
-positions in @var{buffer}, and returns the new object.  If
+This creates and returns an xwidget object.  If
 @var{buffer} is omitted or @code{nil}, it defaults to the current
 buffer.  If @var{buffer} names a buffer that doesn't exist, it will be
 created.  The @var{type} identifies the type of the xwidget component,
@@ -5651,7 +5650,7 @@ it can be one of the following:
 
 @table @code
 @item webkit
-The WebKit (@dfn{on-stack replacement}) component.
+The WebKit component.
 @end table
 
 The @var{width} and @var{height} arguments specify the widget size in
diff --git a/src/xwidget.c b/src/xwidget.c
index 4f1df1a..8ff4c23 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -187,7 +187,7 @@ Returns the newly constructed xwidget, or nil if 
construction fails.  */)
   xw->widget_osr = NULL;
   xw->plist = Qnil;
 
-  if (EQ (xw->type, Qwebkit_osr))
+  if (EQ (xw->type, Qwebkit))
     {
       block_input ();
       xw->widgetwindow_osr = gtk_offscreen_window_new ();
@@ -197,7 +197,7 @@ Returns the newly constructed xwidget, or nil if 
construction fails.  */)
       /* WebKit OSR is the only scrolled component at the moment.  */
       xw->widgetscrolledwindow_osr = NULL;
 
-      if (EQ (xw->type, Qwebkit_osr))
+      if (EQ (xw->type, Qwebkit))
         {
           xw->widgetscrolledwindow_osr = gtk_scrolled_window_new (NULL, NULL);
           gtk_scrolled_window_set_min_content_height
@@ -218,7 +218,7 @@ Returns the newly constructed xwidget, or nil if 
construction fails.  */)
       gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width,
                                    xw->height);
 
-      if (EQ (xw->type, Qwebkit_osr))
+      if (EQ (xw->type, Qwebkit))
         {
           gtk_container_add (GTK_CONTAINER (xw->widgetwindow_osr),
                              xw->widgetscrolledwindow_osr);
@@ -239,7 +239,7 @@ Returns the newly constructed xwidget, or nil if 
construction fails.  */)
       g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, xw);
 
       /* signals */
-      if (EQ (xw->type, Qwebkit_osr))
+      if (EQ (xw->type, Qwebkit))
         {
           g_signal_connect (G_OBJECT (xw->widget_osr),
                             "document-load-finished",
@@ -497,7 +497,7 @@ xwidget_init_view (struct xwidget *xww,
   XSETWINDOW (xv->w, s->w);
   XSETXWIDGET (xv->model, xww);
 
-  if (EQ (xww->type, Qwebkit_osr))
+  if (EQ (xww->type, Qwebkit))
     {
       xv->widget = gtk_drawing_area_new ();
       /* Expose event handling.  */
@@ -508,7 +508,7 @@ xwidget_init_view (struct xwidget *xww,
       g_signal_connect (G_OBJECT (xww->widgetwindow_osr), "damage-event",
                         G_CALLBACK (offscreen_damage_event), xv->widget);
 
-      if (EQ (xww->type, Qwebkit_osr))
+      if (EQ (xww->type, Qwebkit))
         {
           g_signal_connect (G_OBJECT (xv->widget), "button-press-event",
                             G_CALLBACK (xwidget_osr_event_forward), NULL);
@@ -983,7 +983,7 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_webkit_goto_uri);
   defsubr (&Sxwidget_webkit_execute_script);
   defsubr (&Sxwidget_webkit_get_title);
-  DEFSYM (Qwebkit_osr, "webkit");
+  DEFSYM (Qwebkit, "webkit");
 
   defsubr (&Sxwidget_size_request);
   defsubr (&Sdelete_xwidget_view);