diff options
| -rw-r--r-- | .gitignore | 42 | ||||
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | doc/emacs/.gitignore | 23 | ||||
| -rw-r--r-- | doc/lispintro/.gitignore | 24 | ||||
| -rw-r--r-- | doc/lispref/.gitignore | 13 | ||||
| -rw-r--r-- | doc/misc/.gitignore | 23 | ||||
| -rw-r--r-- | lwlib/.gitignore | 1 | ||||
| -rw-r--r-- | oldXMenu/.gitignore | 1 |
8 files changed, 52 insertions, 88 deletions
diff --git a/.gitignore b/.gitignore index 6903c46278e..7f6aca7e0b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +**/Makefile +**/makefile + configure aclocal.m4 compile @@ -9,10 +12,9 @@ missing lib/Makefile.in src/config.in autom4te.cache -makefile TAGS *~ -.#* +.#* /README.W32 /bin/ @@ -24,7 +26,6 @@ info/dir info/*.info test/biditest.txt -Makefile config.log config.status config.cache @@ -72,9 +73,38 @@ src/stamp-h1 src/temacs src/temacs.map src/temacs.tmp -doc/emacs/emacsver.texi -doc/man/emacs.1 -etc/refcards/emacsver.tex +doc/*/*.aux +doc/*/*.cm +doc/*/*.cms +doc/*/*.cp +doc/*/*.cps +doc/*/*.dvi +doc/*/*.fn +doc/*/*.fns +doc/*/*.html +doc/*/*.ky +doc/*/*.kys +doc/*/*.log +doc/*/*.op +doc/*/*.ops +doc/*/*.pdf +doc/*/*.pg +doc/*/*.pgs +doc/*/*.pj +doc/*/*.pjs +doc/*/*.ps +doc/*/*.sc +doc/*/*.scs +doc/*/*.tg +doc/*/*.tgs +doc/*/*.tmp +doc/*/*.toc +doc/*/*.tp +doc/*/*.tps +doc/*/*.vr +doc/*/*.vrs +doc/*/texput.log +doc/misc/cc-mode.ss lib/.deps/ lisp/international/uni-brackets.el lwlib/deps/ diff --git a/ChangeLog b/ChangeLog index 5ec81276d8f..c9ea640b588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2014-11-17 Paul Eggert <eggert@cs.ucla.edu> + + Simplify and fix doc-related .gitignore files. + This fixes some unwanted 'git status' output after 'make docs'. + * .gitignore: Add **/Makefile, **/makefile. + Remove Makefile, makefile. + Add doc/*/*.xxx rules for the usual kinds of documentation outputs + and temporaries. Add doc/misc/cc-mode.ss. + * doc/emacs/.gitignore, doc/lispintro/.gitignore, doc/misc/.gitignore: + * lwlib/.gitignore, oldXMenu/.gitignore: + Remove, as these .gitignore files are no longer needed. + * doc/lispintro/.gitignore: Replace with list of exceptional PDF files. + 2014-11-15 Christoph Scholtes <cschol2112@gmail.com> * .gitignore: Ignore generated file lib/stdalign.h. diff --git a/doc/emacs/.gitignore b/doc/emacs/.gitignore deleted file mode 100644 index 3ff56b474dd..00000000000 --- a/doc/emacs/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.ky -*.kys -*.log -*.op -*.ops -*.pdf -*.pg -*.pgs -*.ps -*.tmp -*.toc -*.tp -*.tps -*.vr -*.vrs -Makefile -makefile diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore index e1af5a918b0..cf992dc8649 100644 --- a/doc/lispintro/.gitignore +++ b/doc/lispintro/.gitignore @@ -1,21 +1,3 @@ -*.aux -*.fn -*.fns -*.cps -*.cp -*.kys -*.ky -*.toc -*.pgs -*.pg -*.log -*.vrs -*.vr -*.dvi -*.ps -*.tp -*.tps -*.tmp -*.txt -Makefile -makefile +!cons-*.pdf +!drawers.pdf +!lambda-*.pdf diff --git a/doc/lispref/.gitignore b/doc/lispref/.gitignore deleted file mode 100644 index ba74d365995..00000000000 --- a/doc/lispref/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -texput.log -elisp.?? -elisp.??? -config.log -config.cache -config.status -Makefile -makefile -elisp -elisp-? -elisp-?? -elisp1* -elisp2* diff --git a/doc/misc/.gitignore b/doc/misc/.gitignore deleted file mode 100644 index 3ff56b474dd..00000000000 --- a/doc/misc/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.ky -*.kys -*.log -*.op -*.ops -*.pdf -*.pg -*.pgs -*.ps -*.tmp -*.toc -*.tp -*.tps -*.vr -*.vrs -Makefile -makefile diff --git a/lwlib/.gitignore b/lwlib/.gitignore deleted file mode 100644 index f3c7a7c5da6..00000000000 --- a/lwlib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/oldXMenu/.gitignore b/oldXMenu/.gitignore deleted file mode 100644 index f3c7a7c5da6..00000000000 --- a/oldXMenu/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile |