defun/defmacro autoload generation

[bpt/emacs.git] / src / fns.c

diff --git a/src/fns.c b/src/fns.c
index 01c1f43..05e79bb 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1906,7 +1906,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.  */)
   (Lisp_Object symbol, Lisp_Object propname)
 {
   CHECK_SYMBOL (symbol);
-  return Fplist_get (XSYMBOL (symbol)->plist, propname);
+  return Fplist_get (symbol_plist (symbol), propname);
 }
 
 DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
@@ -1949,7 +1949,7 @@ It can be retrieved with `(get SYMBOL PROPNAME)'.  */)
 {
   CHECK_SYMBOL (symbol);
   set_symbol_plist
-    (symbol, Fplist_put (XSYMBOL (symbol)->plist, propname, value));
+    (symbol, Fplist_put (symbol_plist (symbol), propname, value));
   return value;
 }
 \f
@@ -2042,10 +2042,10 @@ of strings.  (`equal' ignores text properties.)  */)
 {
   Lisp_Object tem;
 
-  scm_dynwind_begin (0);
+  dynwind_begin ();
   scm_dynwind_fluid (compare_text_properties, SCM_BOOL_T);
   tem = Fequal (o1, o2);
-  scm_dynwind_end ();
+  dynwind_end ();
   return tem;
 }
 
@@ -2743,16 +2743,13 @@ usage: (widget-apply WIDGET PROPERTY &rest ARGS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
   /* This function can GC.  */
-  Lisp_Object newargs[3];
   struct gcpro gcpro1, gcpro2;
   Lisp_Object result;
 
-  newargs[0] = Fwidget_get (args[0], args[1]);
-  newargs[1] = args[0];
-  newargs[2] = Flist (nargs - 2, args + 2);
-  GCPRO2 (newargs[0], newargs[2]);
-  result = Fapply (3, newargs);
-  UNGCPRO;
+  result = call3 (intern ("apply"),
+                  Fwidget_get (args[0], args[1]),
+                  args[0],
+                  Flist (nargs - 2, args + 2));
   return result;
 }