mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 22:40:51 -08:00
Code Issues Projects Releases Wiki Activity
99343 commits 242 branches 194 tags 7.7 GiB
Commit graph

1904 commits

Author SHA1 Message Date
Chong Yidong
8d9101d850 admin/admin.el: Add some code for deploying web manuals. 2011-03-12 22:50:33 -05: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
61353ac8cd Merge: Import crypto/md5 and stdint modules from gnulib. 2011-02-20 00:48:52 -08:00
Eli Zaretskii
9d9d12cdf3 Initial version of fix for the MS-DOS build, not yet tested. 
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.
 2011-02-19 17:57:35 +02: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
1f5d53eb53 Import getloadavg module from gnulib. 2011-02-15 16:33:44 -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
Glenn Morris
7b24e97ab5 * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. 2011-02-12 15:37:43 -08:00
Glenn Morris
9218b9bd6c * admin/notes/bugtracker: Small updates. 2011-02-08 19:27:57 -08:00
Glenn Morris
4d881c8341 bzrmerge.el trivia. 
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
 2011-02-05 14:46:34 -08:00
Glenn Morris
f6041baa9d bzrmerge.el trivia. 
* 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.
 2011-02-02 23:09:50 -08:00
Eli Zaretskii
70b0d280eb Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu 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.
 2011-01-31 21:36:08 +02:00
Paul Eggert
16fab14354 src/emacs.c now gets version number from configure.in 2011-01-31 00:12:52 -08:00
Paul Eggert
16c3e636a6 strftime: import from gnulib 2011-01-30 15:34:18 -08:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
d0cb866238 Make it easier to control which revisions bzrmerge might skip. 
* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
 2011-01-24 21:10:02 -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
Paul Eggert
d6100f3de6 * make-tarball.txt: Suggest 'autoreconf -I m4 --force' 
rather than doing rm and autoconf by hand.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
 2011-01-19 15:56:42 -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
acce4a473a * admin/bzrmerge.el: Fix paren typo in previous. 2011-01-17 18:35:23 -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
Stefan Monnier
41f44310b3 * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in 
an inconsistent state.
 2011-01-17 16:18:00 -05:00
Paul Eggert
a3e44e7937 Merge from mainline. 2011-01-17 11:01:01 -08:00
Glenn Morris
e9bffc61f2 Refill some copyright headers. 2011-01-15 18:21:30 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Glenn Morris
2153c86209 * admin/charsets/cp51932.awk: No longer print arch-tag. 2011-01-15 14:46:51 -08:00
Glenn Morris
623717b76c * admin/charsets/eucjp-ms.awk: No longer print arch-tag. 2011-01-15 14:44:52 -08:00
Glenn Morris
d0d4361dba Add 2011 to remaining FSF/AIST copyright years. 2011-01-15 14:10:37 -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
Glenn Morris
6fffc9003c bzrmerge.el trivia. 
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
 2011-01-15 12:42:23 -08:00
Paul Eggert
8a1f4a98c1 Merge from mainline. 2011-01-14 10:14:17 -08:00
Glenn Morris
15a1cca8ec ChangeLog merge fixes. 2011-01-14 09:42:40 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Paul Eggert
3720fa2b1a Merge from mainline. 2011-01-13 21:07:26 -08:00
Glenn Morris
1851cac3e3 * admin/bzrmerge.el: Require cl when compiling. 
(bzrmerge-merges): Doc fix.
 2011-01-13 18:44:25 -08:00
Paul Eggert
7ea5475741 Merge from mainline. 2011-01-11 21:57:19 -08:00
Glenn Morris
529ee9edf2 * admin/bzrmerge.el: Standardize copyright and license headers. 2011-01-11 20:28:12 -08: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