Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 839-842)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-240

diff --combined src/ChangeLog
index 8c6d978a09f490cdfc24a2bfcfba52064841b659,f26f918c9413ff09756956f39d9ff624cb55887d..7e0edb14fd3de823f828a393d1601841072d7802
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,12 +1,12 @@@
+ 2007-08-01  Ryo Yoshitake  <ryo@shiftmode.net>  (tiny change)
+ 
+       * mac.c (init_mac_osx_environment): Adjust load-path on self-contained
+       build.
+ 
+ 2007-07-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * gtkutil.c (xg_tool_bar_callback): Generate a single TOOL_BAR_EVENT.
+ 
  2007-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * puresize.h (BASE_PURESIZE): Increase to 1130000.
@@@ -13263,6 -13272,11 +13272,6 @@@
        * regex.c (re_error_msgid): Add an entry for REG_ERANGEX.
        (regex_compile): Return REG_ERANGEX if appropriate.
  
 -2004-10-22  Kenichi Handa  <handa@m17n.org>
 -
 -      * editfns.c (Ftranslate_region_internal): New function.
 -      (syms_of_editfns): Defsubr it.
 -
  2004-10-22  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
  
        * xfns.c (xic_create_xfontset): Initialize missing_list to NULL.