Sync to HEAD

2 files changed, 5 insertions, 4 deletions

diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 61630858730..1403a24721c 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -1,5 +1,5 @@
 /* Resource definitions for GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #include "Types.r"
 /* added for finder icon balloon help --ben */
 #include "Balloons.r"
-#endif
 
 /* Define to use gnu icon */
 /* #define GNU_ICON 1 */
@@ -57,7 +56,6 @@ resource 'hfdr' (-5696) { /*help for emacs icon*/
         }
 };
 
-#ifndef TARGET_API_MAC_CARBON
 /* added for finder icon balloon help --ben */
 resource 'STR ' (128) { /*help message for emacs icon*/
         "GNU Emacs\0xd1the extensible, customizable, self-documenting real-time display editor."
@@ -176,7 +174,7 @@ resource 'DITL' (129, purgeable) {
                 {10, 60, 72, 278},
                 StaticText {
                         disabled,
-                        "Emacs does not run on a Macintosh with more than 256 MB of physical or virtual memory"
+                        "Emacs does not run on a Macintosh with more than 512 MB of physical or virtual memory"
                 }
         }
 };
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index cfa77c8c44c..a982e941f98 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -41,3 +41,6 @@ int chdir(const char *path)
 
   return error == noErr ? 0 : -1;
 }
+
+/* arch-tag: f567b034-fd9e-43d1-94cb-9012375237d1
+   (do not change this comment) */