HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(apply-partially): Move from subr.el to simple.el.
[bpt/emacs.git]
/
lib-src
/
make-docfile.c
diff --git
a/lib-src/make-docfile.c
b/lib-src/make-docfile.c
index
6e22eb8
..
945a920
100644
(file)
--- a/
lib-src/make-docfile.c
+++ b/
lib-src/make-docfile.c
@@
-5,10
+5,10
@@
This file is part of GNU Emacs.
This file is part of GNU Emacs.
-GNU Emacs is free software
;
you can redistribute it and/or modify
+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
it under the terms of the GNU General Public License as published by
-the Free Software Foundation
; either version 3, or (at your option)
-any later version.
+the Free Software Foundation
, either version 3 of the License, or
+
(at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-16,9
+16,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
/* The arguments given to this program are all the C and Lisp source files
of GNU Emacs. .elc and .el and .c files are allowed.
/* The arguments given to this program are all the C and Lisp source files
of GNU Emacs. .elc and .el and .c files are allowed.
@@
-35,7
+34,6
@@
Boston, MA 02110-1301, USA. */
Then comes the documentation for that function or variable.
*/
Then comes the documentation for that function or variable.
*/
-#define NO_SHORTNAMES /* Tell config not to load remap.h */
#include <config.h>
/* defined to be emacs_main, sys_fopen, etc. in config.h */
#include <config.h>
/* defined to be emacs_main, sys_fopen, etc. in config.h */
@@
-535,7
+533,7
@@
write_c_args (out, func, buf, minargs, maxargs)
}
\f
/* Read through a c file. If a .o file is named,
}
\f
/* Read through a c file. If a .o file is named,
- the corresponding .c file is read instead.
+ the corresponding .c
or .m
file is read instead.
Looks for DEFUN constructs such as are defined in ../src/lisp.h.
Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED. */
Looks for DEFUN constructs such as are defined in ../src/lisp.h.
Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED. */
@@
-557,6
+555,15
@@
scan_c_file (filename, mode)
infile = fopen (filename, mode);
infile = fopen (filename, mode);
+ if (infile == NULL && extension == 'o')
+ {
+ /* try .m */
+ filename[strlen (filename) - 1] = 'm';
+ infile = fopen (filename, mode);
+ if (infile == NULL)
+ filename[strlen (filename) - 1] = 'c'; /* don't confuse people */
+ }
+
/* No error if non-ex input file */
if (infile == NULL)
{
/* No error if non-ex input file */
if (infile == NULL)
{
@@
-1184,7
+1191,7
@@
scan_lisp_file (filename, mode)
else
{
#ifdef DEBUG
else
{
#ifdef DEBUG
- fprintf (stderr, "## unrecogni
s
ed top-level form, %s (%s)\n",
+ fprintf (stderr, "## unrecogni
z
ed top-level form, %s (%s)\n",
buffer, filename);
#endif
continue;
buffer, filename);
#endif
continue;