1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Commit Graph

253 Commits

Author SHA1 Message Date
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
Eli Zaretskii
43335389f1 The fixes' attribute does show in bzr log'. 2010-11-12 18:42:12 +02:00
Eli Zaretskii
6173c5b551 Expand and clarify the description of bugtracker setting for bzr. 2010-11-12 10:37:27 +02:00
Glenn Morris
de4708cbd8 Comments related to `bzr commit --fixes'. 2010-11-09 20:50:31 -08:00
Chong Yidong
eea682b6d1 Notes about elpa.gnu.org for maintainers. 2010-11-04 13:00:43 -04:00
Glenn Morris
e63715a071 * admin/notes/bugtracker: Mention "found". 2010-10-30 17:38:13 -07:00
Glenn Morris
16a0af11ec Move nextstep/DEV-NOTES to admin/notes/nextstep. 2010-10-11 20:55:21 -07:00
Glenn Morris
3da5f1d0ce * admin/notes/newfile: Update. 2010-06-09 22:42:55 -07:00
Glenn Morris
3a61723751 * admin/notes/bugtracker: Note on some emacs-bug-tracker minutiae. 2010-06-08 23:53:17 -07:00
Glenn Morris
2db4b11ebd * admin/notes/font-backend: Remove obsolete information. 2010-06-02 22:45:20 -07:00
Glenn Morris
81ac4f3536 Do not preprocess src/Makefile.in.
* configure.in: Do not preprocess src/Makefile.in.
(cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
(AC_EGREP_CPP): Test no longer needed.
* configure: Regenerate.

* config.bat: Do not preprocess src/Makefile.in.

* make-dist: No more Makefile.c files.

* INSTALL, src/README: Makefiles are not preprocessed.

* src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk:
Convert comments to Makefile format.

* lib-src/Makefile.in (distclean): No more Makefile.c.
* src/Makefile.in (bootstrap-clean): No more Makefile.c.

* admin/notes/cpp: Remove file.

* admin/quick-install-emacs (AVOID): No more Makefile.c files.

* etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can
no longer occur.
2010-05-26 22:43:27 -07:00
Glenn Morris
9d5c6f0e5f * admin/notes/bugtracker: More about recovering from moderation mistakes. 2010-05-22 10:39:35 -07:00
Eli Zaretskii
5739cdd25a Advise against unnecessary merges from trunk to feature branches. 2010-05-18 10:38:35 +03:00
Glenn Morris
51603dabe0 * admin/notes/bzr: New file.
More mailing-list wisdom.  Probably should be merged with commits.
2010-05-17 19:52:21 -07:00
Glenn Morris
d3b23034e8 Do not preprocess lib-src/Makefile.in
* configure.in: Generate lib-src/Makefile directly, do not run cpp.
* config.bat: Do not run cpp on lib-src/Makefile.in.

* lib-src/Makefile.in: Convert comments to makefile format.

* admin/notes/cpp: lib-src/Makefile not preprocessed.
2010-05-10 20:00:32 -07:00
Stefan Monnier
6e104790e7 Merge from emacs-23 2010-04-19 11:07:52 -04:00