martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ca25231a264d0c8dead443ab75c2edb02161cff9
emacs/lib
History
Paul Eggert 39c2fa3f4e Merge from gnulib and try to repair bad merge 
This attempts to repair problems introduced by the bad merge
5491fd1098.  The easiest way for me
to fix the badly-merged gnulib files was to run
'admin/merge-gnulib', so I did that, which also imported the
following changes:
* build-aux/update-copyright, m4/gnulib.m4:
Update from gnulib, incorporating:
2015-01-15 time: port to MinGW32 3.21
2015-01-15 update-copyright: apply to self
2015-01-11 update-copyright: recognize groff's \(co marker
2015-01-27 22:24:47 -08:00
..
acl_entries.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
acl-errno-valid.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
acl-internal.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
acl.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
alloca.in.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
allocator.c
…
allocator.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
at-func.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
binary-io.c
Port recent close-on-exec changes to Cygwin.
2013-07-09 10:16:21 -07:00
binary-io.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
byteswap.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
c-ctype.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
c-ctype.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
c-strcase.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
c-strcasecmp.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
c-strncasecmp.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
careadlinkat.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
careadlinkat.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
close-stream.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
close-stream.h
…
COPYING
…
count-one-bits.c
Improve support for popcount and counting trailing zeros.
2013-10-07 14:37:19 -07:00
count-one-bits.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
count-trailing-zeros.c
Improve support for popcount and counting trailing zeros.
2013-10-07 14:37:19 -07:00
count-trailing-zeros.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
dirent.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
dosname.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
dtoastr.c
…
dtotimespec.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
dup2.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
errno.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
euidaccess.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
execinfo.c
…
execinfo.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
faccessat.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
fcntl.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
fcntl.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
fdatasync.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
fdopendir.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
file-has-acl.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
filemode.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
filemode.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
fpending.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
fpending.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
fstatat.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
fsync.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
ftoastr.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
ftoastr.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
getdtablesize.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
getgroups.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
getloadavg.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
getopt1.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
getopt_.h
Fix copyright years by hand
2015-01-01 14:27:34 -08:00
getopt_int.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
getopt.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
getopt.in.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
gettext.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
gettime.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
gettimeofday.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
gnulib.mk
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
group-member.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
intprops.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
inttypes.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
lstat.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
Makefile.am
Parallelize clean rules using GNU make features
2014-06-14 17:17:21 -07:00
makefile.w32-in
Update copyright year to 2015
2015-01-01 14:26:41 -08:00
md5.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
md5.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
memrchr.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
min-max.h
…
mkostemp.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
mktime-internal.h
…
mktime.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
openat-die.c
…
openat-priv.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
openat-proc.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
openat.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
pathmax.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
pipe2.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
pselect.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
pthread_sigmask.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
putenv.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
qcopy-acl.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
qset-acl.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
readlink.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
readlinkat.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
root-uid.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
save-cwd.c
Update copyright year to 2015
2015-01-01 14:26:41 -08:00
save-cwd.h
Update copyright year to 2015
2015-01-01 14:26:41 -08:00
secure_getenv.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sha1.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
sha1.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sha256.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sha256.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sha512.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sha512.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sig2str.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
sig2str.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
signal.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
stat-time.c
…
stat-time.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
stat.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
stdalign.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
stddef.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
stdint.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
stdio.in.h
Merge from gnulib
2015-01-06 09:15:29 -08:00
stdlib.in.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
stpcpy.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
strftime.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
strftime.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
string.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
strtoimax.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
strtol.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
strtoll.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
strtoul.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
strtoull.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
strtoumax.c
…
symlink.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sys_select.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sys_stat.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sys_time.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
sys_types.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
tempname.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
tempname.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
time_r.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
time.in.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
timespec-add.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
timespec-sub.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
timespec.c
…
timespec.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
u64.c
…
u64.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
unistd.c
…
unistd.in.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
unsetenv.c
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00
utimens.c
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
utimens.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
verify.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
vla.h
Merge from gnulib, incorporating:
2015-01-01 11:06:53 -08:00
xalloc-oversized.h
Merge from gnulib and try to repair bad merge
2015-01-27 22:24:47 -08:00