Merged from miles@gnu.org--gnu-2005 (patch 192-203)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-192
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193
   Use gdb-ui breakpoint faces on ttys too

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-194
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-195
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-196
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-197
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-198
   Tweak gdb-ui breakpoint faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-199
   Tweak gdb-ui breakpoint faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-200
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-201
   Tweak info/.arch-inventory to identify info/.cvsignore as source

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-202
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-203
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-316

2 files changed, 9 insertions, 7 deletions

diff --git a/info/.arch-inventory b/info/.arch-inventory
index 31f45f86485..4efa6ef48f9 100644
--- a/info/.arch-inventory
+++ b/info/.arch-inventory
@@ -1,19 +1,20 @@
-# Only two real source files: "dir", and this file, ".arch-inventory"
-source ^(dir|\.arch-inventory)$
+# There are only three real source files in this directory:
+#
+#   "dir", ".cvsignore", and this file, ".arch-inventory"
 
 # Everything else is generated at compile time.  Unfortunately, the "backup"
 # category overrides the "source" category, so we have to have horrible
 # regexp that matches everything _except_ "dir"...
 
 # 1 or 2 characters long
-backup ^[-_.a-zA-Z0-9][-_.a-zA-Z0-9]?$
+backup ^[a-zA-Z0-9][-_.a-zA-Z0-9]?$
 # 4 or more characters long
-backup ^[-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]+$
+backup ^[a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]+$
 # 3 chars long, but 1st char not "d"
-backup ^[-_.abce-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]$
+backup ^[abce-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]$
 # 3 chars long, but 2nd char not "i"
-backup ^[-_.a-zA-Z0-9][-_.a-hj-zA-Z0-9][-_.a-zA-Z0-9]$
+backup ^[a-zA-Z0-9][-_.a-hj-zA-Z0-9][-_.a-zA-Z0-9]$
 # 3 chars long, but 3rd char not "r"
-backup ^[-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-qs-zA-Z0-9]$
+backup ^[a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-qs-zA-Z0-9]$
 
 # arch-tag: 60144ab9-cdc1-45b6-8193-b9683c80ec86
diff --git a/info/.gitignore b/info/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/info/.gitignore
@@ -0,0 +1 @@
+*