*** empty log message ***

2 files changed, 25 insertions, 19 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 9df18a74517..b3bf673bfa8 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -118,52 +118,52 @@ getopt.o: getopt.c getopt.h
 getopt1.o: getopt1.c getopt.h
 
 etags: etags.c $(GETOPTDEPS)
-        $(CC) -o etags ${CFLAGS} -DETAGS etags.c $(GETOPTOBJS) $(LOADLIBES)
+        $(CC) ${CFLAGS} -DETAGS etags.c $(GETOPTOBJS) $(LOADLIBES) -o etags
 
 ctags: etags.c $(GETOPTDEPS)
-        $(CC) -o ctags ${CFLAGS} -DCTAGS etags.c $(GETOPTOBJS) $(LOADLIBES)
+        $(CC) ${CFLAGS} -DCTAGS etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
 
 wakeup: wakeup.c
-        $(CC) -o wakeup ${CFLAGS} wakeup.c $(LOADLIBES)
+        $(CC) ${CFLAGS} wakeup.c $(LOADLIBES) -o wakeup
 
 make-docfile: make-docfile.c
-        $(CC) -o make-docfile ${CFLAGS} make-docfile.c $(LOADLIBES)
+        $(CC) ${CFLAGS} make-docfile.c $(LOADLIBES) -o make-docfile
 
 digest-doc: digest-doc.c
-        $(CC) -o digest-doc ${CFLAGS} digest-doc.c $(LOADLIBES)
+        $(CC) ${CFLAGS} digest-doc.c $(LOADLIBES) -o digest-doc 
 
 sorted-doc: sorted-doc.c
-        $(CC) -o sorted-doc ${CFLAGS} sorted-doc.c $(LOADLIBES)
+        $(CC) ${CFLAGS} sorted-doc.c $(LOADLIBES) -o sorted-doc
 
 b2m: b2m.c
-        $(CC) -o b2m ${CFLAGS} b2m.c $(LOADLIBES)
+        $(CC) ${CFLAGS} b2m.c $(LOADLIBES) -o b2m 
 
 movemail: movemail.c ../src/config.h
-        $(CC) -o movemail ${CFLAGS} movemail.c $(LOADLIBES)
+        $(CC) ${CFLAGS} movemail.c $(LOADLIBES) -o movemail
 
 cvtmail: cvtmail.c
-        $(CC) -o cvtmail ${CFLAGS} cvtmail.c $(LOADLIBES)
+        $(CC) ${CFLAGS} cvtmail.c $(LOADLIBES) -o cvtmail
 
 fakemail: fakemail.c ../src/config.h
-        $(CC) -o fakemail ${CFLAGS} fakemail.c $(LOADLIBES)
+        $(CC) ${CFLAGS} fakemail.c $(LOADLIBES) -o fakemail
 
 yow: yow.c ../src/paths.h
-        $(CC) -o yow ${CFLAGS} yow.c $(LOADLIBES)
+        $(CC) ${CFLAGS} yow.c $(LOADLIBES) -o yow
 
 env: env.c ../src/config.h
-        $(CC) -o env -DEMACS ${CFLAGS} env.c $(LOADLIBES)
+        $(CC) -DEMACS ${CFLAGS} env.c $(LOADLIBES) -o env
 
 emacsserver: emacsserver.c ../src/config.h
-        $(CC) -o emacsserver ${CFLAGS} emacsserver.c $(LOADLIBES)
+        $(CC) ${CFLAGS} emacsserver.c $(LOADLIBES) -o emacsserver
 
 emacsclient: emacsclient.c ../src/config.h
-        $(CC) -o emacsclient ${CFLAGS} emacsclient.c $(LOADLIBES)
+        $(CC) ${CFLAGS} emacsclient.c $(LOADLIBES) -o emacsclient
 
 hexl: hexl.c
-        $(CC) -o hexl ${CFLAGS} hexl.c $(LOADLIBES)
+        $(CC) ${CFLAGS} hexl.c $(LOADLIBES) -o hexl
 
 timer: getdate.o timer.o
-        $(CC) -o timer $(CFLAGS) getdate.o timer.o
+        $(CC) $(CFLAGS) getdate.o timer.o -o timer
 
 # These are NOT included in INSTALLABLES or UTILITIES.
 # See ../src/ymakefile.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 1af038027e0..2436ac6458f 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,11 +1,11 @@
 /* Generate doc-string file for GNU Emacs from source files.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -166,7 +166,13 @@ write_c_args (out, buf, minargs, maxargs)
       else if (c == ' ' && space)
         continue;
       space = (c == ' ');
-      putc (c, out);
+
+      /* Print the C arguments as they would appear in Elisp;
+         print underscores as hyphens.  */
+      if (c == '_')
+        putc ('-');
+      else
+        putc (c, out);
     }
   putc ('\n', out);
 }