[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 01/01: Simplify and fix doc-related .gitignore fil
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] [emacs] 01/01: Simplify and fix doc-related .gitignore files. |
Date: |
Mon, 17 Nov 2014 01:32:06 +0000 |
eggert pushed a commit to branch emacs-24
in repository emacs.
commit 790c69057269dbed855375b91120ccf3cce0f830
Author: Paul Eggert <address@hidden>
Date: Sun Nov 16 17:19:05 2014 -0800
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.
---
.gitignore | 42 ++++++++++++++++++++++++++++++++++++------
ChangeLog | 13 +++++++++++++
doc/emacs/.gitignore | 23 -----------------------
doc/lispintro/.gitignore | 24 +++---------------------
doc/lispref/.gitignore | 13 -------------
doc/misc/.gitignore | 23 -----------------------
lwlib/.gitignore | 1 -
oldXMenu/.gitignore | 1 -
8 files changed, 52 insertions(+), 88 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6903c46..7f6aca7 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 5ec8127..c9ea640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-11-17 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* .gitignore: Ignore generated file lib/stdalign.h.
diff --git a/doc/emacs/.gitignore b/doc/emacs/.gitignore
deleted file mode 100644
index 3ff56b4..0000000
--- 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 e1af5a9..cf992dc 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 ba74d36..0000000
--- 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 3ff56b4..0000000
--- 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 f3c7a7c..0000000
--- a/lwlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/oldXMenu/.gitignore b/oldXMenu/.gitignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/oldXMenu/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile