aboutsummaryrefslogtreecommitdiffstats
path: root/admin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * admin/notes/bzr: Tiny addition.Glenn Morris2011-02-281-0/+2
|
* * admin/notes/bzr: Small updates.Glenn Morris2011-02-231-0/+8
|
* * admin/notes/bzr: More details about merging ChangeLogs.Glenn Morris2011-02-221-1/+4
|
* Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.Glenn Morris2011-02-222-1/+5
|\
| * admin/notes/bugtracker (bugtracker_debbugs_url): Fix typo.Juanma Barranquero2011-02-222-1/+5
| |
* | Add comments about fixing dates in merged ChangeLogs.Glenn Morris2011-02-222-3/+9
| |
* | Merge: Import crypto/md5 and stdint modules from gnulib.Paul Eggert2011-02-201-3/+1
|\ \
| * | Import crypto/md5 module from gnulib.Paul Eggert2011-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | Initial version of fix for the MS-DOS build, not yet tested.Eli Zaretskii2011-02-192-0/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.bat: Configure in `lib'. msdos/sedlibmk.inp: New file. msdos/sedlibcf.inp: New file. msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty. (@true): Edit to "@rem". (move-if-change): Edit to "update". (echo): Edit to "djecho". (cd $(lib) && ...): Edit to "$(MAKE) -C ...". msdos/mainmake.v2 (version): Remove, no longer needed (config.in defines VERSION). (all): Add lib. (lib): New target and recipe. (lib-src): Depend on lib. (src): Depend on lib and lib-src. (clean, mostlyclean, distclean, maintainer-clean, extraclean) (bootstrap-clean): Recurse into lib. msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || BROKEN_MKTIME" stuff -- it's no longer in src/config.in. (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) (HAVE__BOOL): Edit to 1. (VERSION, inline, restrict): Edit for DJGPP. src/s/msdos.h (strtold): Define to _strtold. admin/admin.el (set-version): Add msdos/sed2v2.inp.
* | Import getloadavg module from gnulib.Paul Eggert2011-02-153-7/+6
| |
* | * admin/notes/bzr: Add section on undoing a bzr remove.Glenn Morris2011-02-131-0/+24
| |
* | * admin/notes/bzr: Mention the helpful changelog_merge plugin.Glenn Morris2011-02-121-0/+15
| |
* | * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.Glenn Morris2011-02-122-1/+7
| |
* | * admin/notes/bugtracker: Small updates.Glenn Morris2011-02-081-0/+5
| |
* | bzrmerge.el trivia.Glenn Morris2011-02-052-1/+15
| | | | | | | | | | | | * admin/bzrmerge.el (bzrmerge-warning-buffer): New constant. (bzrmerge-apply): Use it. (bzrmerge): Kill any old warning buffer first.
* | bzrmerge.el trivia.Glenn Morris2011-02-022-11/+26
| | | | | | | | | | | | | | | | * admin/bzrmerge.el (bzrmerge-buffer): New constant. (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it. (bzrmerge-missing): If nothing to do, return nil not (nil). (bzrmerge-apply): Remove odd character from message. (bzrmerge): Give status messages.
* | Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu ↵Eli Zaretskii2011-01-312-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu. lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and $(BLD)/time_r.$(O). ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and $(EMACS_ROOT)/src/m/intel386.h. ($(BLD)/strftime.$(O)): ($(BLD)/time_r.$(O)): Define prerequisites. src/makefile.w32-in (OBJ2): Remove strftime.$(O). ($(BLD)/strftime.$(O)): Remove prerequisites. lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt. (ECLIENT_CFLAGS): Remove -DVERSION. ($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in. nt/config.nt (VERSION): Uncomment definition. (restrict): Define. nt/inc/stdbool.h: New file. admin/admin.el (set-version): Remove lib-src/makefile.w32-in. Add nt/config.nt.
* | src/emacs.c now gets version number from configure.inPaul Eggert2011-01-313-5/+11
| |
* | strftime: import from gnulibPaul Eggert2011-01-302-1/+5
| |
* | Refill some long/short copyright headers.Glenn Morris2011-01-265-13/+6
| |
* | Make it easier to control which revisions bzrmerge might skip.Glenn Morris2011-01-242-2/+12
| | | | | | | | | | * admin/bzrmerge.el (bzrmerge-skip-regexp): New variable. (bzrmerge-missing): Use it.
* | Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-2421-30/+21
| |
* | * admin/notes/bzrmerge: Comment on skipped revisions.Glenn Morris2011-01-221-0/+5
| |
* | * make-tarball.txt: Suggest 'autoreconf -I m4 --force'Paul Eggert2011-01-192-2/+7
| | | | | | | | | | rather than doing rm and autoconf by hand. See <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
* | * admin/notes/bzr: Fix typos in previous.Glenn Morris2011-01-171-2/+2
| |
* | * admin/notes/bzr: More bzrmerge notes.Glenn Morris2011-01-171-4/+14
| |
* | * admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris2011-01-171-1/+1
| |
* | * admin/notes/bzr: Add some more bzrmerge details.Glenn Morris2011-01-171-4/+15
| |
* | * notes/bzr (Installing changes from gnulib): New section.Paul Eggert2011-01-172-0/+26
| | | | | | | | Need for this suggested by Stefan Monnier.
* | * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier2011-01-172-0/+16
| | | | | | | | an inconsistent state.
* | Merge from mainline.Paul Eggert2011-01-1735-46/+49
|\ \
| * | Refill some copyright headers.Glenn Morris2011-01-151-2/+2
| | |
| * | Nuke arch-tags.Glenn Morris2011-01-1527-32/+0
| | |
| * | * admin/charsets/cp51932.awk: No longer print arch-tag.Glenn Morris2011-01-152-5/+1
| | |
| * | * admin/charsets/eucjp-ms.awk: No longer print arch-tag.Glenn Morris2011-01-152-3/+2
| | |
| * | Add 2011 to remaining FSF/AIST copyright years.Glenn Morris2011-01-152-2/+2
| | |
| * | * admin/notes/bzr: More on previous.Glenn Morris2011-01-151-0/+5
| | |
| * | * admin/notes/bzr: Add an idiot's guide to merging between branches.Glenn Morris2011-01-151-0/+29
| | |
| * | bzrmerge.el trivia.Glenn Morris2011-01-152-2/+8
| | | | | | | | | | | | | | | * admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator. (bzrmerge-resolve): Also ignore cl-loaddefs.el.
* | | Merge from mainline.Paul Eggert2011-01-1431-43/+56
|\ \ \ | |/ /
| * | ChangeLog merge fixes.Glenn Morris2011-01-141-1/+0
| | |
| * | Merge from emacs-23Stefan Monnier2011-01-1431-43/+57
| |\ \ | | |/
| | * * admin/admin.el (set-copyright): Also handle \year in refcards/*.tex.Glenn Morris2011-01-022-15/+26
| | |
| | * Revert accidental update of non-FSF copyright from ↵Glenn Morris2011-01-021-1/+1
| | | | | | | | | | | | 2010-01-13T08:35:10Z!rgm@gnu.org.
| | * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-0233-35/+34
| | |
* | | Merge from mainline.Paul Eggert2011-01-132-5/+10
|\ \ \ | |/ /
| * | * admin/bzrmerge.el: Require cl when compiling.Glenn Morris2011-01-132-4/+9
| | | | | | | | | | | | (bzrmerge-merges): Doc fix.
* | | Merge from mainline.Paul Eggert2011-01-111-5/+5
|\ \ \ | |/ /
| * | * admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris2011-01-111-5/+5
| | |
* | | Update copyright notes to match recent gnulib-related changes.Paul Eggert2011-01-092-10/+25
|/ / | | | | | | | | | | | | | | | | | | * 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.