Merge from emacs--devo--0
commit29adb7b55e89881d05165ddacd28144d1f878355
authorMiles Bader <miles@gnu.org>
Fri, 3 Aug 2007 05:57:16 +0000 (3 05:57 +0000)
committerMiles Bader <miles@gnu.org>
Fri, 3 Aug 2007 05:57:16 +0000 (3 05:57 +0000)
tree8ea24492e6d79c7befd2537b72054c7c420615bd
parentba55f217f5620668f4205f5bff83ae51abf584f8
parent0896d93184a719bc994a3e699de27190aac0acb1
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 843-844)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 84-87)

   - Update from CVS
   - Change capitalization of VC backend names for new backends

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-241
lisp/ChangeLog.12
lisp/faces.el
lisp/startup.el
src/ChangeLog
src/fileio.c