emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] [emacs] 01/01: .gitignore cleanup.


From: Paul Eggert
Subject: [Emacs-diffs] [emacs] 01/01: .gitignore cleanup.
Date: Tue, 18 Nov 2014 01:58:34 +0000

branch: emacs-24
commit 342bc0e04b68d9c52503816bedaf67c9e77be8d2
Author: Paul Eggert <address@hidden>
Date:   Mon Nov 17 17:56:49 2014 -0800

    .gitignore cleanup.
    
    * .gitignore: Merge contents of subsidiary files and organize the
    result so as to avoid duplication.  Remove no-longer needed entries.
    * admin/charsets/.gitignore, admin/unidata/.gitignore:
    * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
    * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
    * lisp/calc/.gitignore, lisp/calendar/.gitignore:
    * lisp/cedet/.gitignore, lisp/emulation/.gitignore:
    * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
    * lisp/international/.gitignore, lisp/language/.gitignore:
    * lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
    * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
    * lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
    * lisp/play/.gitignore, lisp/progmodes/.gitignore:
    * lisp/term/.gitignore, lisp/textmodes/.gitignore:
    * lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
    Remove; no longer needed.
---
 .gitignore                    |  230 ++++++++++++++++++++++++++---------------
 ChangeLog                     |   20 ++++
 admin/charsets/.gitignore     |    2 -
 admin/unidata/.gitignore      |    3 -
 doc/lispintro/.gitignore      |    3 -
 etc/.gitignore                |    2 -
 leim/.gitignore               |    2 -
 leim/ja-dic/.gitignore        |    1 -
 lib-src/.gitignore            |    7 --
 lisp/.gitignore               |    6 -
 lisp/calc/.gitignore          |    2 -
 lisp/calendar/.gitignore      |    4 -
 lisp/cedet/.gitignore         |    8 --
 lisp/emulation/.gitignore     |    1 -
 lisp/erc/.gitignore           |    3 -
 lisp/eshell/.gitignore        |    2 -
 lisp/gnus/.gitignore          |    1 -
 lisp/international/.gitignore |   16 ---
 lisp/language/.gitignore      |    1 -
 lisp/leim/.gitignore          |    2 -
 lisp/leim/quail/.gitignore    |   22 ----
 lisp/mail/.gitignore          |    1 -
 lisp/mh-e/.gitignore          |    3 -
 lisp/net/.gitignore           |    1 -
 lisp/nxml/.gitignore          |    2 -
 lisp/play/.gitignore          |    1 -
 lisp/progmodes/.gitignore     |    1 -
 lisp/term/.gitignore          |    1 -
 lisp/textmodes/.gitignore     |    1 -
 lisp/url/.gitignore           |    4 -
 nt/.gitignore                 |    5 -
 src/.gitignore                |    8 --
 32 files changed, 165 insertions(+), 201 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f6aca7..bd48c28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,24 @@
-**/Makefile
-**/makefile
-
-configure
-aclocal.m4
-compile
-config.guess
-config.sub
-depcomp
-install-sh
-missing
+# Built by 'autogen.sh'.
+/aclocal.m4
+/configure
+build-aux/compile
+build-aux/config.guess
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/missing
 lib/Makefile.in
 src/config.in
-autom4te.cache
-TAGS
-*~
-.#*
-/README.W32
 
-/bin/
-/site-lisp/
-/leim/ja-dic/
-etc/refcards/*.aux
-etc/refcards/*.log
-info/dir
-info/*.info
-test/biditest.txt
+# Built by 'configure'.
+Makefile
+makefile
+/*.cache
+/config.status
+src/config.h
+src/epaths.h
 
-config.log
-config.status
-config.cache
-lib-src/blessmail
-lib-src/ctags
-lib-src/ebrowse
-lib-src/emacsclient
-lib-src/etags
-lib-src/hexl
-lib-src/make-docfile
-lib-src/movemail
-lib-src/profile
-lib-src/test-distrib
-lib-src/update-game-score
-*.o
-*.exe
-*.res
+# C-level sources built by 'make'.
 lib/alloca.h
 lib/arg-nonnull.h
 lib/byteswap.h
@@ -55,59 +31,143 @@ lib/getopt.h
 lib/inttypes.h
 lib/libgnu.a
 lib/signal.h
+lib/stdalign.h
 lib/stdio.h
 lib/stdlib.h
-lib/stdalign.h
 lib/string.h
 lib/sys/
 lib/time.h
 lib/unistd.h
 lib/warn-on-use.h
+src/buildobj.h
+src/globals.h
+
+# Lisp-level sources built by 'make'.
+*cus-load.el
+*loaddefs.el
+leim/changed.misc
+leim/changed.tit
+lisp/cedet/semantic/bovine/c-by.el
+lisp/cedet/semantic/bovine/make-by.el
+lisp/cedet/semantic/bovine/scm-by.el
+lisp/cedet/semantic/wisent/javat-wy.el
+lisp/cedet/semantic/wisent/js-wy.el
+lisp/cedet/semantic/wisent/python-wy.el
+lisp/cedet/srecode/srt-wy.el
+lisp/eshell/esh-groups.el
+lisp/finder-inf.el
+lisp/leim/ja-dic/
+lisp/leim/leim-list.el
+lisp/leim/quail/4Corner.el
+lisp/leim/quail/ARRAY30.el
+lisp/leim/quail/CCDOSPY.el
+lisp/leim/quail/CTLau.el
+lisp/leim/quail/CTLau-b5.el
+lisp/leim/quail/ECDICT.el
+lisp/leim/quail/ETZY.el
+lisp/leim/quail/PY-b5.el
+lisp/leim/quail/PY.el
+lisp/leim/quail/Punct.el
+lisp/leim/quail/Punct-b5.el
+lisp/leim/quail/QJ.el
+lisp/leim/quail/QJ-b5.el
+lisp/leim/quail/SW.el
+lisp/leim/quail/TONEPY.el
+lisp/leim/quail/ZIRANMA.el
+lisp/leim/quail/ZOZY.el
+lisp/leim/quail/quick-b5.el
+lisp/leim/quail/quick-cns.el
+lisp/leim/quail/tsang-b5.el
+lisp/leim/quail/tsang-cns.el
+lisp/subdirs.el
+
+# Dependencies.
+.deps/
+deps/
+
+# Temporaries.
+*.tmp
+
+# Time stamps.
+stamp_BLD
+src/gl-stamp
+src/stamp-h.in
+src/stamp-h1
+
+# Object files and debugging.
+*.a
+*.elc
+*.o
+oo/
+oo-spd/
+src/*.map
+
+# Executables.
+lib-src/blessmail
+lib-src/ctags
+lib-src/ebrowse
+lib-src/emacsclient
+lib-src/etags
+lib-src/hexl
+lib-src/make-docfile
+lib-src/movemail
+lib-src/profile
+lib-src/test-distrib
+lib-src/update-game-score
 src/bootstrap-emacs
-src/deps/
 src/emacs
 src/emacs-[0-9]*
-src/gl-stamp
-src/globals.h
-src/stamp-h1
 src/temacs
-src/temacs.map
-src/temacs.tmp
-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
+
+# Character-set info.
+admin/charsets/*.el
+admin/charsets/*.map
+admin/unidata/unidata.txt
+lisp/international/charprop.el
+lisp/international/uni-*.el
+
+# Documentation.
+*.aux
+*.cm
+*.cms
+*.cp
+*.cps
+*.dvi
+*.fn
+*.fns
+*.html
+*.info
+*.ky
+*.kys
+*.log
+*.op
+*.ops
+*.pdf
+*.pg
+*.pgs
+*.pj
+*.pjs
+*.ps
+*.sc
+*.scs
+*.tg
+*.tgs
+*.toc
+*.tp
+*.tps
+*.vr
+*.vrs
+!doc/lispintro/cons-*.pdf
+!doc/lispintro/drawers.pdf
+!doc/lispintro/lambda-*.pdf
 doc/misc/cc-mode.ss
-lib/.deps/
-lisp/international/uni-brackets.el
-lwlib/deps/
-lwlib/liblw.a
-leim/changed.misc
-leim/changed.tit
+etc/DOC
+!etc/refcards/gnus-logo.pdf
+info/dir
+
+# Backup files and locks.
+*~
+.#*
+
+# Git output.
+[0-9]*.patch
diff --git a/ChangeLog b/ChangeLog
index 239b5ef..8cc6635 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2014-11-18  Paul Eggert  <address@hidden>
+
+       .gitignore cleanup.
+       * .gitignore: Merge contents of subsidiary files and organize the
+       result so as to avoid duplication.  Remove no-longer needed entries.
+       * admin/charsets/.gitignore, admin/unidata/.gitignore:
+       * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
+       * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
+       * lisp/calc/.gitignore, lisp/calendar/.gitignore:
+       * lisp/cedet/.gitignore, lisp/emulation/.gitignore:
+       * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
+       * lisp/international/.gitignore, lisp/language/.gitignore:
+       * lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
+       * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
+       * lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
+       * lisp/play/.gitignore, lisp/progmodes/.gitignore:
+       * lisp/term/.gitignore, lisp/textmodes/.gitignore:
+       * lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
+       Remove; no longer needed.
+
 2014-11-17  Paul Eggert  <address@hidden>
 
        Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
diff --git a/admin/charsets/.gitignore b/admin/charsets/.gitignore
deleted file mode 100644
index ea375dc..0000000
--- a/admin/charsets/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.map
-*.el
diff --git a/admin/unidata/.gitignore b/admin/unidata/.gitignore
deleted file mode 100644
index 3f2d8ca..0000000
--- a/admin/unidata/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.elc
-unidata.txt
-
diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore
deleted file mode 100644
index cf992dc..0000000
--- a/doc/lispintro/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-!cons-*.pdf
-!drawers.pdf
-!lambda-*.pdf
diff --git a/etc/.gitignore b/etc/.gitignore
deleted file mode 100644
index 8e12acb..0000000
--- a/etc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-DOC
-icons/
diff --git a/leim/.gitignore b/leim/.gitignore
deleted file mode 100644
index 02175a1..0000000
--- a/leim/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.elc
-leim-list.el
diff --git a/leim/ja-dic/.gitignore b/leim/ja-dic/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/leim/ja-dic/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lib-src/.gitignore b/lib-src/.gitignore
deleted file mode 100644
index c931a15..0000000
--- a/lib-src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-DOC
-ctags.c
-stamp_BLD
-echolisp.tmp
-
-oo/
-oo-spd/
diff --git a/lisp/.gitignore b/lisp/.gitignore
deleted file mode 100644
index 6d5166e..0000000
--- a/lisp/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.elc
-*-loaddefs.el
-loaddefs.el
-subdirs.el
-finder-inf.el
-cus-load.el
diff --git a/lisp/calc/.gitignore b/lisp/calc/.gitignore
deleted file mode 100644
index a46b68d..0000000
--- a/lisp/calc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.elc
-calc-loaddefs.el
diff --git a/lisp/calendar/.gitignore b/lisp/calendar/.gitignore
deleted file mode 100644
index d0de296..0000000
--- a/lisp/calendar/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.elc
-cal-loaddefs.el
-diary-loaddefs.el
-hol-loaddefs.el
diff --git a/lisp/cedet/.gitignore b/lisp/cedet/.gitignore
deleted file mode 100644
index 976586e..0000000
--- a/lisp/cedet/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-## Generated grammar files.
-semantic/bovine/c-by.el
-semantic/bovine/make-by.el
-semantic/bovine/scm-by.el
-semantic/wisent/javat-wy.el
-semantic/wisent/js-wy.el
-semantic/wisent/python-wy.el
-srecode/srt-wy.el
diff --git a/lisp/emulation/.gitignore b/lisp/emulation/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/emulation/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/erc/.gitignore b/lisp/erc/.gitignore
deleted file mode 100644
index 7053c31..0000000
--- a/lisp/erc/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-{arch}
-.arch-ids
-*.elc
diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore
deleted file mode 100644
index 2abf84b..0000000
--- a/lisp/eshell/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-esh-groups.el
-
diff --git a/lisp/gnus/.gitignore b/lisp/gnus/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/gnus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/international/.gitignore b/lisp/international/.gitignore
deleted file mode 100644
index 161b312..0000000
--- a/lisp/international/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated Unicode files.
-charprop.el
-uni-bidi.el
-uni-category.el
-uni-combining.el
-uni-comment.el
-uni-decimal.el
-uni-decomposition.el
-uni-digit.el
-uni-lowercase.el
-uni-mirrored.el
-uni-name.el
-uni-numeric.el
-uni-old-name.el
-uni-titlecase.el
-uni-uppercase.el
diff --git a/lisp/language/.gitignore b/lisp/language/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/language/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/leim/.gitignore b/lisp/leim/.gitignore
deleted file mode 100644
index 57b77ba..0000000
--- a/lisp/leim/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-ja-dic/
-leim-list.el
diff --git a/lisp/leim/quail/.gitignore b/lisp/leim/quail/.gitignore
deleted file mode 100644
index c3f9e36..0000000
--- a/lisp/leim/quail/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-4Corner.el
-ARRAY30.el
-CCDOSPY.el
-CTLau-b5.el
-CTLau.el
-ECDICT.el
-ETZY.el
-PY-b5.el
-PY.el
-Punct-b5.el
-Punct.el
-QJ-b5.el
-QJ.el
-SW.el
-TONEPY.el
-ZIRANMA.el
-ZOZY.el
-quick-b5.el
-quick-cns.el
-tsang-b5.el
-tsang-cns.el
-
diff --git a/lisp/mail/.gitignore b/lisp/mail/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/mail/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/mh-e/.gitignore b/lisp/mh-e/.gitignore
deleted file mode 100644
index 2e5b174..0000000
--- a/lisp/mh-e/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-mh-autoloads.el
-mh-cus-load.el
-mh-loaddefs.el
diff --git a/lisp/net/.gitignore b/lisp/net/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/net/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/nxml/.gitignore b/lisp/nxml/.gitignore
deleted file mode 100644
index f18ed02..0000000
--- a/lisp/nxml/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.elc
-subdirs.el
diff --git a/lisp/obsolete/.gitignore b/lisp/obsolete/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/lisp/play/.gitignore b/lisp/play/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/play/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/progmodes/.gitignore b/lisp/progmodes/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/progmodes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/term/.gitignore b/lisp/term/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/term/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/textmodes/.gitignore b/lisp/textmodes/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/lisp/textmodes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/lisp/url/.gitignore b/lisp/url/.gitignore
deleted file mode 100644
index 362a9c8..0000000
--- a/lisp/url/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-auto-autoloads.el
-custom-load.el
-url-auto.el
diff --git a/nt/.gitignore b/nt/.gitignore
deleted file mode 100644
index 4e2fa24..0000000
--- a/nt/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-config.log
-stamp_BLD
-
-oo/
-oo-spd/
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index ebacd57..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-buildobj.h
-config.h
-epaths.h
-stamp_BLD
-stamp-h.in
-
-oo/
-oo-spd/



reply via email to

[Prev in Thread] Current Thread [Next in Thread]