diff mac/src/Emacs.r @ 89909:68c22ea6027c

Sync to HEAD

--- a/mac/src/Emacs.r	Thu Apr 15 01:08:34 2004 +0000
+++ b/mac/src/Emacs.r	Fri Apr 16 12:51:06 2004 +0000
@@ -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 @@
 #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 @@
    	}
 };
 
-#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 @@
 		{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"
 		}
 	}
 };