[Emacs-diffs] emacs/src ChangeLog xdisp.c

[Seiji Zenitani]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Seiji Zenitani <zenitani>       09/06/14 06:12:36

Modified files:
        src            : ChangeLog xdisp.c 

Log message:
        Remove USE_MAC_TOOLBAR (for Mac Carbon [22.x])

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7571&r2=1.7572
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1286&r2=1.1287

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7571
retrieving revision 1.7572
diff -u -b -r1.7571 -r1.7572
--- ChangeLog   11 Jun 2009 05:09:52 -0000      1.7571
+++ ChangeLog   14 Jun 2009 06:12:34 -0000      1.7572
@@ -1,3 +1,7 @@
+2009-06-14  Seiji Zenitani  <address@hidden>
+
+       * xdisp.c [USE_MAC_TOOLBAR]: Remove obsolete definition for Mac Carbon.
+
 2009-06-11  Kenichi Handa  <address@hidden>
 
        * xdisp.c (x_get_glyph_overhangs): Fix calculation of right

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -b -r1.1286 -r1.1287
--- xdisp.c     11 Jun 2009 02:34:34 -0000      1.1286
+++ xdisp.c     14 Jun 2009 06:12:35 -0000      1.1287
@@ -9863,7 +9863,7 @@
      struct frame *f;
      int save_match_data;
 {
-#if defined (USE_GTK) || defined (HAVE_NS) || USE_MAC_TOOLBAR
+#if defined (USE_GTK) || defined (HAVE_NS)
   int do_update = FRAME_EXTERNAL_TOOL_BAR (f);
 #else
   int do_update = WINDOWP (f->tool_bar_window)
@@ -10337,7 +10337,7 @@
   struct it it;
   struct glyph_row *row;
 
-#if defined (USE_GTK) || defined (HAVE_NS) || USE_MAC_TOOLBAR
+#if defined (USE_GTK) || defined (HAVE_NS)
   if (FRAME_EXTERNAL_TOOL_BAR (f))
     update_frame_tool_bar (f);
   return 0;
@@ -13968,7 +13968,7 @@
 #ifdef HAVE_WINDOW_SYSTEM
       if (FRAME_WINDOW_P (f))
         {
-#if defined (USE_GTK) || defined (HAVE_NS) || USE_MAC_TOOLBAR
+#if defined (USE_GTK) || defined (HAVE_NS)
           redisplay_tool_bar_p = FRAME_EXTERNAL_TOOL_BAR (f);
 #else
           redisplay_tool_bar_p = WINDOWP (f->tool_bar_window)