Mercurial > emacs
changeset 91062:d7a8a1343519
* doc.c (Fsnarf_documentation):
* Makefile.in (temacs${EXEEXT}, mostlyclean): Undo last change.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sat, 20 Oct 2007 23:19:53 +0000 |
| parents | f7c2da6f53ac |
| children | 9957b92b2e1e |
| files | src/ChangeLog.unicode src/Makefile.in src/doc.c |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog.unicode Sat Oct 20 23:08:33 2007 +0000 +++ b/src/ChangeLog.unicode Sat Oct 20 23:19:53 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-21 Jason Rumney <jasonr@gnu.org> + + * doc.c (Fsnarf_documentation): + * Makefile.in (temacs${EXEEXT}, mostlyclean): Undo last change. + 2007-10-12 Miles Bader <miles@gnu.org> * src/dispextern.h (struct glyph_row): Only define "clip" field if
--- a/src/Makefile.in Sat Oct 20 23:08:33 2007 +0000 +++ b/src/Makefile.in Sat Oct 20 23:19:53 2007 +0000 @@ -1014,7 +1014,7 @@ #endif temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} - echo "${obj} ${otherobj} " OBJECTS_MACHINE > ${etc}buildobj.lst + echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_MACHINE ${LIBES} @@ -1363,7 +1363,7 @@ rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} - rm -f ${etc}buildobj.lst + rm -f buildobj.lst clean: mostlyclean rm -f emacs-*${EXEEXT} emacs${EXEEXT} /**/# This is used in making a distribution.
--- a/src/doc.c Sat Oct 20 23:08:33 2007 +0000 +++ b/src/doc.c Sat Oct 20 23:19:53 2007 +0000 @@ -629,10 +629,8 @@ int nr_read; char *cp = NULL; char *beg, *end; - Lisp_Object buildobj = Fexpand_file_name (build_string ("buildobj.lst"), - Vdoc_directory); - fd = emacs_open (SDATA (buildobj), O_RDONLY, 0); + fd = emacs_open ("buildobj.lst", O_RDONLY, 0); if (fd < 0) report_file_error ("Opening file buildobj.lst", Qnil);