annotate info/.arch-inventory @ 83488:f47495b26508

Fix ediff problems. (Reported by Dan Nicolaescu.) * lisp/subr.el (with-selected-frame): Make sure the current buffer is restored as well. * src/xfns.c (Fx_create_frame): Use `store_frame_param' to set `window-system' frame parameter, and make sure it overrides any user-supplied setting. * src/xfns.c (x_icon): Disable redundant call to `x_wm_set_window_state'. (Also applied in CVS.) * lisp/faces.el (x-create-frame-with-faces): Don't make frame visible until we are done setting up all its parameters. * lisp/ediff-wind.el (ediff-setup-windows-automatic): New function. (ediff-window-setup-function): Use it as default. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-528
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 12 Mar 2006 04:12:31 +0000
parents a33e80b6ae49
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
60841
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
1 # There are only three real source files in this directory:
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
2 #
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
3 # "dir", ".cvsignore", and this file, ".arch-inventory"
60357
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
4
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
5 # Everything else is generated at compile time. Unfortunately, the "backup"
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
6 # category overrides the "source" category, so we have to have horrible
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
7 # regexp that matches everything _except_ "dir"...
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
8
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
9 # 1 or 2 characters long
60841
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
10 backup ^[a-zA-Z0-9][-_.a-zA-Z0-9]?$
60357
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
11 # 4 or more characters long
60841
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
12 backup ^[a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]+$
60357
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
13 # 3 chars long, but 1st char not "d"
60841
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
14 backup ^[abce-zA-Z0-9][-_.a-zA-Z0-9][-_.a-zA-Z0-9]$
60357
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
15 # 3 chars long, but 2nd char not "i"
60841
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
16 backup ^[a-zA-Z0-9][-_.a-hj-zA-Z0-9][-_.a-zA-Z0-9]$
60357
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
17 # 3 chars long, but 3rd char not "r"
60841
a33e80b6ae49 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 60357
diff changeset
18 backup ^[a-zA-Z0-9][-_.a-zA-Z0-9][-_.a-qs-zA-Z0-9]$
60357
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
19
7cb1d5f71446 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
Miles Bader <miles@gnu.org>
parents:
diff changeset
20 # arch-tag: 60144ab9-cdc1-45b6-8193-b9683c80ec86