1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-13 01:20:28 -08:00
Commit graph

268 commits

Author SHA1 Message Date
Paul Eggert
b49e353d9d Merge from trunk. 2011-09-03 16:03:38 -07:00
Glenn Morris
e350c3a032 bzr 2.4.0, including changelog_merge plugin, was released. 2011-09-01 00:24:27 -07:00
Paul Eggert
24e0f6b1dc Merge from gnulib, using build-aux to remove clutter.
* m4/largefile.m4: New file, so that Emacs does not mess up when
accessing files with large inode numbers in MacOS X 10.5 and later.
* m4/nocrash.m4: New file, to avoid triggering background debugger
and/or create core dumps during 'configure'.
* build-aux/move-if-change: Renamed from move-if-change.
* build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h.
* build-aux/snippet/c++defs.h: Renamed from c++defs.h.
* build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h.
* build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn.
* .bzrignore: The autogenerated files compile, config.guess,
config.sub, depcomp, install-sh, and missing are now in build-aux.
* Makefile.in (epaths-force, sync-from-gnulib):
move-if-change is now in build-aux.
(GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite
of gnulib's pthread_sigmask module, but Emacs doesn't need it.
(mkdir): install-sh is now in build-aux.
* config.bat: c++defs.h is now in build-aux/snippets.
* configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the
usual parameter).
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved
to build-aux/snippet.
* lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4:
* m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4:
Merge from gnuilib.  This fixes porting bugs on Cygwin, Irix, and
Solaris, enables MacOS extensions, and enables nocrash during
'configure'.
* make-dist: Adjust to new build-aux and build-aux/snippit dirs.
* admin/notes/copyright: The files compile, config.guess, config.sub,
depcomp, install-sh, missing, and move-if-change are now in the
new build-aux subdirectory.  The files arg-nonnull.h, c++defs.h,
and warn-on-use.h are now in build-aux/snippets.  New file
build-aux/snippets/_Noreturn.h.
* leim/Makefile.in (install): install-sh is now in build-aux.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
to build-aux.
* msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
from top level to build-aux/snippet.
* src/Makefile.in (gl-stamp): move-if-change is now in build-aux.
2011-07-24 15:15:47 -07:00
Glenn Morris
f5c7a9297c * admin/notes/bugtracker: How to add new tags. 2011-07-14 22:15:05 -04:00
Glenn Morris
57f4e35d09 * admin/notes/bzr: Your very own Loggerhead server. 2011-05-28 10:46:02 -07:00
Glenn Morris
1adfa36f83 * admin/notes/bugtracker: Small updates. 2011-05-14 12:11:47 -07:00
Glenn Morris
dc5e0b5aac * admin/notes/bzr: Update changelog_merge branch details. 2011-05-14 12:09:37 -07:00
U. Ser
9b053e766d fix many doubled-word typos 2011-05-10 15:57:12 +02:00
Glenn Morris
0c6b7b19e5 * admin/notes/bzr: Small updates. 2011-04-25 21:50:33 -07:00
Glenn Morris
f74c8aebdd * admin/notes/years: Small updates. 2011-04-25 21:45:37 -07:00
Glenn Morris
577c4ec057 * admin/notes/copyright: Remove info on some files no longer present. 2011-03-25 00:00:36 -07:00
Glenn Morris
abd57f5960 * admin/notes/copyright: Remove comments about deleted files in src/{m,s}.
Files that were merged into other files have been kept.
2011-03-22 20:38:15 -07:00
Glenn Morris
8cc1d51933 Replace mkinstalldirs with `install-sh -d', as automake recommends.
* Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
(sync-from-gnulib): Don't sync mkinstalldirs.

* make-dist: Don't distribute mkinstalldirs.

* leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
Use `install-sh -d' rather than mkinstalldirs.

* configure.in, doc/emacs/Makefile.in: Update comments.

* admin/notes/copyright: Remove mkinstalldirs.
2011-03-22 20:09:55 -07:00
Glenn Morris
8ae17ff2bf * admin/notes/bzr: Update bzr changelog_merge plugin details. 2011-03-22 19:57:57 -07:00
Chong Yidong
7f0869bd1d admin/notes/elpa: Make Bzr checkout directions more explicit. 2011-03-11 17:53:47 -05:00
Chong Yidong
eb8694ee59 Mention elpa branch in admin/notes/BRANCH; clarify admin/notes/elpa. 2011-03-07 19:08:03 -05:00
Glenn Morris
0560d0ea3d * admin/notes/bzr: Tiny addition. 2011-02-28 19:41:05 -08:00
Glenn Morris
3cbbfdc34f * admin/notes/bzr: Small updates. 2011-02-23 19:56:36 -08:00
Glenn Morris
ed3d163155 * admin/notes/bzr: More details about merging ChangeLogs. 2011-02-22 20:24:13 -08:00
Glenn Morris
cce7d53002 Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org. 2011-02-22 20:19:28 -08:00
Glenn Morris
59af988b40 Add comments about fixing dates in merged ChangeLogs. 2011-02-22 19:50:04 -08:00
Juanma Barranquero
31fdb54408 admin/notes/bugtracker (bugtracker_debbugs_url): Fix typo. 2011-02-22 02:04:16 +01:00
Paul Eggert
942f733fd1 Import crypto/md5 module from gnulib.
* Makefile.in (MAKEFILE_MODULES): Add crypto/md5.
* admin/notes/copyright: Remove src/md5.c and src/md5.h as
special cases.
* src/Makefile.in (base_obj): Remove md5.o, since this file
is in lib now.
* src/deps.mk (md5.o): Remove.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
Regenerate.
* lib/md5.c: Regenerate.  This renames the file from src/md5.c,
and adds some porting improvements from gnulib.
* lib/md5.h: Regenerate, likwise; rename from src/md5.h.
* m4/md5.m4: New file, from gnulib.

2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-18 00:07:03 -08:00
Paul Eggert
fae95934b8 Merge from mainline. 2011-02-14 21:41:07 -08:00
Glenn Morris
a241b7c067 * admin/notes/bzr: Add section on undoing a bzr remove. 2011-02-13 18:52:02 -08:00
Glenn Morris
d0ba09dcd8 * admin/notes/bzr: Mention the helpful changelog_merge plugin. 2011-02-12 15:43:42 -08:00
Paul Eggert
be6d99804b Merge from mainline. 2011-02-09 23:04:56 -08:00
Glenn Morris
9218b9bd6c * admin/notes/bugtracker: Small updates. 2011-02-08 19:27:57 -08:00
Paul Eggert
79ab4b7f0e Import getloadavg module from gnulib. 2011-02-07 23:05:03 -08:00
Paul Eggert
16c3e636a6 strftime: import from gnulib 2011-01-30 15:34:18 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
4474c927a7 * admin/notes/bzrmerge: Comment on skipped revisions. 2011-01-22 11:44:38 -08:00
Glenn Morris
b69258a1a8 * admin/notes/bzr: Fix typos in previous. 2011-01-17 18:57:04 -08:00
Glenn Morris
565cb73650 * admin/notes/bzr: More bzrmerge notes. 2011-01-17 18:55:26 -08:00
Glenn Morris
b91f171d26 * admin/notes/bzr: Add some more bzrmerge details. 2011-01-17 18:22:36 -08:00
Paul Eggert
9092d18633 * notes/bzr (Installing changes from gnulib): New section.
Need for this suggested by Stefan Monnier.
2011-01-17 14:11:13 -08:00
Paul Eggert
a3e44e7937 Merge from mainline. 2011-01-17 11:01:01 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Glenn Morris
4ebf3ee11c * admin/notes/bzr: More on previous. 2011-01-15 13:51:36 -08:00
Glenn Morris
9aafb22b66 * admin/notes/bzr: Add an idiot's guide to merging between branches. 2011-01-15 13:47:46 -08:00
Paul Eggert
8a1f4a98c1 Merge from mainline. 2011-01-14 10:14:17 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Paul Eggert
e8c53d3abf Update copyright notes to match recent gnulib-related changes.
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
arg-nonnull.h, c++defs.h, compile, depcomp, missing,
warn-on-use.h, lib/*.[ch], lib/gnulib.mk.  Remove src/mktime.c,
lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
are subsumed by the lib/*.[ch] rule).  Remove m4/getopt.m4 (now
subsumed by m4/*.m4 rule).  config.guess, config.sub, and
doc/man/texinfo.tex are now copied in from gnulib.
2011-01-09 00:42:24 -08:00
Paul Eggert
2b3f5bc80a * install-sh, mkinstalldirs, move-if-change: Update from master 2011-01-07 12:42:11 -08:00
Paul Eggert
dfa36fa1a2 * notes/copyright: Report status more accurately for non-GPL files.
Report copyright status more accurately for mkinstalldirs,
configure, m4/getopt.m4, and msdos/sed*.inp.
2011-01-07 11:23:35 -08:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Chong Yidong
07976ae3b8 Merge changes from emacs-23 branch 2010-11-27 15:04:57 -05:00
Eli Zaretskii
0c3b672775 bugtracker: REALLY correct locations of bzr *.conf files. 2010-11-22 05:52:49 +02:00
Eli Zaretskii
5b9b7ef448 bugtracker: Correct locations of bzr *.conf files. 2010-11-21 19:59:08 +02:00
Stefan Monnier
4a47c27573 Merge from emacs-23 2010-11-17 22:54:14 -05:00