--- a/src/abbrev.c	Mon Aug 13 08:49:44 2007 +0200
+++ b/src/abbrev.c	Mon Aug 13 08:50:05 2007 +0200
@@ -77,12 +77,12 @@
 /* Expand the word before point, if it is an abbrev.
    Returns Qt if an expansion is done. */
 
-DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "" /*
+DEFUN ("expand-abbrev", Fexpand_abbrev, 0, 0, "", /*
 Expand the abbrev before point, if there is an abbrev there.
 Effective when explicitly called even when `abbrev-mode' is nil.
 Returns t if expansion took place.
-*/ )
-  ()
+*/
+       ())
 {
   /* This function can GC */
   REGISTER Bufbyte *buffer, *p;
@@ -225,7 +225,7 @@
 syms_of_abbrev (void)
 {
   defsymbol (&Qpre_abbrev_expand_hook, "pre-abbrev-expand-hook");
-  defsubr (&Sexpand_abbrev);
+  DEFSUBR (Fexpand_abbrev);
 }
 
 void