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--multi-tty--0--patch-29

3 files changed, 14 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b8054295979..f26f918c941 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +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.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index ca8c380abb5..a4c0522c49b 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3374,11 +3374,6 @@ xg_tool_bar_callback (w, client_data)
   XSETFRAME (frame, f);
   event.kind = TOOL_BAR_EVENT;
   event.frame_or_window = frame;
-  event.arg = frame;
-  kbd_buffer_store_event (&event);
-
-  event.kind = TOOL_BAR_EVENT;
-  event.frame_or_window = frame;
   event.arg = key;
   /* Convert between the modifier bits GDK uses and the modifier bits
      Emacs uses.  This assumes GDK an X masks are the same, which they are when
diff --git a/src/mac.c b/src/mac.c
index a64c3d208e3..e81db1479b9 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -5318,8 +5318,8 @@ init_mac_osx_environment ()
   /* P should have sufficient room for the pathname of the bundle plus
      the subpath in it leading to the respective directories.  Q
      should have three times that much room because EMACSLOADPATH can
-     have the value "<path to lisp dir>:<path to leim dir>:<path to
-     site-lisp dir>".  */
+     have the value "<path to site-lisp dir>:<path to lisp dir>:<path
+     to leim dir>".  */
   p = (char *) alloca (app_bundle_pathname_len + 50);
   q = (char *) alloca (3 * app_bundle_pathname_len + 150);
   if (!getenv ("EMACSLOADPATH"))
@@ -5327,12 +5327,12 @@ init_mac_osx_environment ()
       q[0] = '\0';
 
       strcpy (p, app_bundle_pathname);
-      strcat (p, "/Contents/Resources/lisp");
+      strcat (p, "/Contents/Resources/site-lisp");
       if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR)
         strcat (q, p);
 
       strcpy (p, app_bundle_pathname);
-      strcat (p, "/Contents/Resources/leim");
+      strcat (p, "/Contents/Resources/lisp");
       if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR)
         {
           if (q[0] != '\0')
@@ -5341,7 +5341,7 @@ init_mac_osx_environment ()
         }
 
       strcpy (p, app_bundle_pathname);
-      strcat (p, "/Contents/Resources/site-lisp");
+      strcat (p, "/Contents/Resources/leim");
       if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR)
         {
           if (q[0] != '\0')