diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-14 13:44:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-14 14:50:02 -0700 |
| commit | fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd (patch) | |
| tree | 1b9618b5eea568e8230b4348af3df1084bd63e67 /.gitignore | |
| parent | 5a64d78854998c2ed6d9b8de1b593d8462b8fa39 (diff) | |
| download | emacs-fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd.tar.gz | |
Merge from gnulib
This incorporates:
2017-03-14 snippets: move unadjusted snippet sources to lib
2017-03-14 gnulib-tool: fix typo in comment output
2017-03-14 snippets: work around GNU Make 3.82 VPATH
2017-03-13 gnulib-tool: minor --gnu-make fixups
2017-03-12 gnulib-tool: new option --gnu-make
* .gitignore: Remove lib/arg-nonnull.h, lib/c++defs.h,
lib/warn-on-use.h. Change exception from
build-aux/snippet/_Noreturn.h to lib/_Noreturn.h.
* admin/authors.el (authors-renamed-files-regexps):
* admin/notes/copyright, make-dist:
The snippet files moved from build-aux/snippet to lib.
* lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h.
* lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h.
* lib/c++defs.h: Rename from build-aux/snippet/c++defs.h.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index e8eb4fdeaed..f5265ff1ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -57,9 +57,7 @@ src/epaths.h # C-level sources built by 'make'. lib/alloca.h -lib/arg-nonnull.h lib/byteswap.h -lib/c++defs.h lib/dirent.h lib/errno.h lib/execinfo.h @@ -76,7 +74,6 @@ lib/string.h lib/sys/ lib/time.h lib/unistd.h -lib/warn-on-use.h src/buildobj.h src/globals.h src/lisp.mk @@ -274,7 +271,7 @@ etc/emacs.tmpdesktop # Microsoft-related builds and installations. *.in-h _* -!build-aux/snippet/_Noreturn.h +!lib/_Noreturn.h /bin/ /BIN/ /data/ |