--- a/src/doc.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/doc.c	Mon Aug 13 09:02:59 2007 +0200
@@ -155,7 +155,7 @@
             case '_': *to++ = '\037'; break;
             default:
               return_me = list2 (build_string
-	("Invalid data in documentation file -- ^A followed by weird code"),
+      ("Invalid data in documentation file -- ^A followed by weird code"),
                                  make_int (c));
               goto done;
             }
@@ -180,7 +180,7 @@
 /* Extract a doc string from a file.  FILEPOS says where to get it.
    (This could actually be byte code instructions/constants instead
    of a doc string.)
-   If it is an integer, use that position in the standard DOC file.
+   If it is an integer, use that position in the standard DOC-... file.
    If it is (FILE . INTEGER), use FILE as the file name
    and INTEGER as the position in that file.
    But if INTEGER is negative, make it positive.
@@ -255,7 +255,7 @@
 
 	  fd = open (name_nonreloc, O_RDONLY, 0);
 	}
-#endif /* CANNOT_DUMP */
+#endif /* CANNOT DUMP */
 
       if (fd < 0)
 	error ("Cannot open doc string file \"%s\"",
@@ -421,10 +421,9 @@
 static void
 weird_doc (Lisp_Object sym, CONST char *weirdness, CONST char *type, int pos)
 {
-/*#if defined(ENERGIZE) || defined(SUNPRO)*/	/* hide kludgery... */
-						/* (for everyone) */
+#if defined(ENERGIZE) || defined(SUNPRO) /* hide kludgery... */
   if (!strcmp (weirdness, GETTEXT ("duplicate"))) return;
-/*#endif*/
+#endif
   message ("Note: Strange doc (%s) for %s %s @ %d",
            weirdness, type, string_data (XSYMBOL (sym)->name), pos);
 }