aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-11-16 17:19:05 -0800
committerPaul Eggert2014-11-16 17:32:01 -0800
commit790c69057269dbed855375b91120ccf3cce0f830 (patch)
tree04200884299e942530a5f076cd7eb66a6e8c0896
parentcf100f60a6fbed0446dbc091649df4f17e4f5694 (diff)
downloademacs-790c69057269dbed855375b91120ccf3cce0f830.tar.gz
emacs-790c69057269dbed855375b91120ccf3cce0f830.zip
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/lispref/.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.
-rw-r--r--.gitignore42
-rw-r--r--ChangeLog13
-rw-r--r--doc/emacs/.gitignore23
-rw-r--r--doc/lispintro/.gitignore24
-rw-r--r--doc/lispref/.gitignore13
-rw-r--r--doc/misc/.gitignore23
-rw-r--r--lwlib/.gitignore1
-rw-r--r--oldXMenu/.gitignore1
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 @@
1**/Makefile
2**/makefile
3
1configure 4configure
2aclocal.m4 5aclocal.m4
3compile 6compile
@@ -9,10 +12,9 @@ missing
9lib/Makefile.in 12lib/Makefile.in
10src/config.in 13src/config.in
11autom4te.cache 14autom4te.cache
12makefile
13TAGS 15TAGS
14*~ 16*~
15.#* 17.#*
16/README.W32 18/README.W32
17 19
18/bin/ 20/bin/
@@ -24,7 +26,6 @@ info/dir
24info/*.info 26info/*.info
25test/biditest.txt 27test/biditest.txt
26 28
27Makefile
28config.log 29config.log
29config.status 30config.status
30config.cache 31config.cache
@@ -72,9 +73,38 @@ src/stamp-h1
72src/temacs 73src/temacs
73src/temacs.map 74src/temacs.map
74src/temacs.tmp 75src/temacs.tmp
75doc/emacs/emacsver.texi 76doc/*/*.aux
76doc/man/emacs.1 77doc/*/*.cm
77etc/refcards/emacsver.tex 78doc/*/*.cms
79doc/*/*.cp
80doc/*/*.cps
81doc/*/*.dvi
82doc/*/*.fn
83doc/*/*.fns
84doc/*/*.html
85doc/*/*.ky
86doc/*/*.kys
87doc/*/*.log
88doc/*/*.op
89doc/*/*.ops
90doc/*/*.pdf
91doc/*/*.pg
92doc/*/*.pgs
93doc/*/*.pj
94doc/*/*.pjs
95doc/*/*.ps
96doc/*/*.sc
97doc/*/*.scs
98doc/*/*.tg
99doc/*/*.tgs
100doc/*/*.tmp
101doc/*/*.toc
102doc/*/*.tp
103doc/*/*.tps
104doc/*/*.vr
105doc/*/*.vrs
106doc/*/texput.log
107doc/misc/cc-mode.ss
78lib/.deps/ 108lib/.deps/
79lisp/international/uni-brackets.el 109lisp/international/uni-brackets.el
80lwlib/deps/ 110lwlib/deps/
diff --git a/ChangeLog b/ChangeLog
index 5ec81276d8f..c9ea640b588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
12014-11-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 Simplify and fix doc-related .gitignore files.
4 This fixes some unwanted 'git status' output after 'make docs'.
5 * .gitignore: Add **/Makefile, **/makefile.
6 Remove Makefile, makefile.
7 Add doc/*/*.xxx rules for the usual kinds of documentation outputs
8 and temporaries. Add doc/misc/cc-mode.ss.
9 * doc/emacs/.gitignore, doc/lispintro/.gitignore, doc/misc/.gitignore:
10 * lwlib/.gitignore, oldXMenu/.gitignore:
11 Remove, as these .gitignore files are no longer needed.
12 * doc/lispintro/.gitignore: Replace with list of exceptional PDF files.
13
12014-11-15 Christoph Scholtes <cschol2112@gmail.com> 142014-11-15 Christoph Scholtes <cschol2112@gmail.com>
2 15
3 * .gitignore: Ignore generated file lib/stdalign.h. 16 * .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 @@
1*.aux
2*.cp
3*.cps
4*.dvi
5*.fn
6*.fns
7*.ky
8*.kys
9*.log
10*.op
11*.ops
12*.pdf
13*.pg
14*.pgs
15*.ps
16*.tmp
17*.toc
18*.tp
19*.tps
20*.vr
21*.vrs
22Makefile
23makefile
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 @@
1*.aux 1!cons-*.pdf
2*.fn 2!drawers.pdf
3*.fns 3!lambda-*.pdf
4*.cps
5*.cp
6*.kys
7*.ky
8*.toc
9*.pgs
10*.pg
11*.log
12*.vrs
13*.vr
14*.dvi
15*.ps
16*.tp
17*.tps
18*.tmp
19*.txt
20Makefile
21makefile
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 @@
1texput.log
2elisp.??
3elisp.???
4config.log
5config.cache
6config.status
7Makefile
8makefile
9elisp
10elisp-?
11elisp-??
12elisp1*
13elisp2*
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 @@
1*.aux
2*.cp
3*.cps
4*.dvi
5*.fn
6*.fns
7*.ky
8*.kys
9*.log
10*.op
11*.ops
12*.pdf
13*.pg
14*.pgs
15*.ps
16*.tmp
17*.toc
18*.tp
19*.tps
20*.vr
21*.vrs
22Makefile
23makefile
diff --git a/lwlib/.gitignore b/lwlib/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/lwlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
1Makefile
diff --git a/oldXMenu/.gitignore b/oldXMenu/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/oldXMenu/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
1Makefile