Sync to HEAD

24 files changed, 120 insertions, 19 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 6e8bff007ea..aa6e9844fee 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,22 @@
+2004-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * src/Emacs.r: Update TOO_MUCH_RAM error message.
+
+2003-11-22  Lars Hansen <larsh@math.ku.dk>
+
+        * inc/grp.h: Added.
+
+2003-11-02  Andrew Choi  <akochoi@shaw.ca>
+
+        * src/Emacs.r [!TARGET_API_MAC_CARBON]: Don't define hfdr resource.
+        * Emacs.app/Contents/Resources/Emacs.rsrc: Remove.
+
+2003-10-31  Andrew Choi  <akochoi@shaw.ca>
+
+        * INSTALL: Add Nozomu Ando's changes to instructions for
+        installing on X Window (that static libraries are no longer
+        necessary after his changes to src/unexmacosx.c).
+
 2003-04-28  Andrew Choi  <akochoi@shaw.ca>
 
         * make-package: Allocate 5% extra space on disk image for
@@ -619,3 +638,5 @@
     Copyright (C) 2001 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
+
+;;; arch-tag: c6fd43f7-0e50-4c0a-ac82-1c8a9e45a9bf
diff --git a/mac/INSTALL b/mac/INSTALL
index 1c44aa529f8..def7913f83a 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,6 +1,6 @@
 * BUILDING EMACS ON MAC OS 8/9 AND MAC OS X     -*- outline -*-
 
-Copyright (c) 2001, 2002 Free Software Foundation, Inc.
+Copyright (c) 2001, 2002, 2004 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
@@ -58,16 +58,11 @@ must be typed to the shell to enable Emacs to locate its resources
 correctly.  You may want to create a symlink or alias to this path to
 quickly access both the terminal and GUI versions.
 
-If you are building Emacs to run on Mac OS X and X Window, you need to
-create a directory containing statically-linked X libraries.
+If you are building Emacs to run on Mac OS X and X Window,
+instead of typing `./configure' above, type
 
-  sudo mkdir /usr/X11R6/libstatic
-  cd /usr/X11R6/libstatic
-  sudo ln -s ../lib/lib*.a ../lib/X11 .
+  ./configure --without-carbon --with-x
 
-Instead of typing `./configure' above, type
-
-  ./configure --without-carbon --with-x --x-libraries=/usr/X11R6/libstatic
 
 To use colors in a terminal, put the following lines in the file
 ~/.termcap and log in again.
@@ -159,11 +154,6 @@ options to user
                     $prefix/bin/emacs to reduce disk space.  Note, this
                     option may removed in the future.
 
-If you are intending to build a binary distribution for X windows, you
-will probably want to follow the directions above to create static
-X11R6 libraries and run the make-package script like this
-
-./make-package --with-x -C,--x-libraries=/usr/X11R6/libstatic
 
 For usage of other options, use the --help option.
 
@@ -215,7 +205,7 @@ Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.2.
 You will need around 100 MB of disk space for the source files and
 intermediate files.
 
-It will not run on machines running Mac OS 8/9 with more than 256 MB
+It will not run on machines running Mac OS 8/9 with more than 512 MB
 of physical or virtual memory.  It does not have this restriction when
 it is run under Mac OS X.  But the usual 128MB buffer limit of a
 32-bit Emacs still exists.
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index f0b1e76fbf3..c216231eb46 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -27,3 +27,6 @@ void *__alloca(size_t size);
 #endif
 
 #endif
+
+/* arch-tag: 8d4114d1-633e-49e7-8f18-b5648f9c4511
+   (do not change this comment) */
diff --git a/mac/inc/config.h b/mac/inc/config.h
index beb8c0a6373..b7257f35f35 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -570,3 +570,6 @@ extern char *getenv ();
 /* #define GLYPH_DEBUG 1 */
 
 #define NO_RETURN /* nothing */
+
+/* arch-tag: 2596b649-b569-448e-8880-373d2a9909b7
+   (do not change this comment) */
diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index e8d8abb8750..da8d442126e 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -24,3 +24,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #define MAC_OS8 1
 #define MAC_OS 1
+
+/* arch-tag: 4aa4fcea-3a95-433d-a7d6-b029afca17f1
+   (do not change this comment) */
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 59b0c44cc41..5e1b3a66603 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -46,3 +46,6 @@ extern int closedir(DIR *);
 extern struct dirent *readdir(DIR *);
 
 #endif /* _DIRENT_H */
+
+/* arch-tag: ec3116df-70f9-4a4a-b6d0-1858aaa9ea22
+   (do not change this comment) */
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 0ec9da70a2b..8c9bbd2f8ba 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -59,3 +59,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Where Emacs should look for the application default file. */
 /* #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S" */
+
+/* arch-tag: 32e95134-dfe4-47be-be28-e8cbf78505b6
+   (do not change this comment) */
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
new file mode 100755
index 00000000000..9c60d5ca2ce
--- /dev/null
+++ b/mac/inc/grp.h
@@ -0,0 +1,36 @@
+/* Replacement grp.h file for building GNU Emacs on the Macintosh.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _GRP_H
+#define _GRP_H
+
+#include <sys/types.h>
+
+/* Emacs uses only gr_name */
+struct group {
+  char *gr_name;        /* group name */
+};
+
+struct group *getgrgid(gid_t);
+
+#endif /* _GRP_H */
+
+/* arch-tag: 3b1d3315-05d5-4c7a-8404-3754bb40020c
+   (do not change this comment) */
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 9e257a3121b..f3f6f084b34 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -138,3 +138,6 @@ Boston, MA 02111-1307, USA.  */
 extern int sign_extend_temp;
 #endif
 #endif
+
+/* arch-tag: 9e759031-ab7b-4c76-99d7-3ae94a98de38
+   (do not change this comment) */
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index dedc8091c45..b5eba307824 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -35,3 +35,6 @@ struct passwd *getpwuid(uid_t);
 struct passwd *getpwnam(const char *);
 
 #endif /* _PWD_H */
+
+/* arch-tag: e169cad7-12ca-4660-a35e-36f80d5d345f
+   (do not change this comment) */
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 35143ddf267..c187944ae6b 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -318,3 +318,6 @@ extern double atof (const char *);
 #define volatile
 
 #define SYMS_SYSTEM syms_of_mac()
+
+/* arch-tag: 6a941c4b-a419-4d25-80ac-9335053e58b2
+   (do not change this comment) */
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index b33f8aaa9cc..0566b63cd58 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -57,3 +57,6 @@ int pause(void);
 char *getwd(char *);
 
 #endif  /* _SYS_FILE_H */
+
+/* arch-tag: c3a653d5-f228-4d62-a47c-0398015195de
+   (do not change this comment) */
diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index ae1a76b7a0f..36a921f2a1e 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -29,3 +29,6 @@ int ioctl(int, int, void *);
 #define TCGETA 2
 
 #endif  /* _SYS_IOCTL_H */
+
+/* arch-tag: fa0c3dda-dbe0-4a49-86c4-7516c83c3c8c
+   (do not change this comment) */
diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index 247f3971a4c..a0e3c6d6f26 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -26,3 +26,6 @@ Boston, MA 02111-1307, USA.  */
 #define MAXPATHLEN 255
 
 #endif /* _SYS_PARAM_H */
+
+/* arch-tag: dceae288-b9cf-4a8f-a780-bca2cadf0c47
+   (do not change this comment) */
diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 0f9ee79dab1..b72385c1b4d 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -84,3 +84,6 @@ struct stat {
 #endif  /* __MRC__ */
 
 #endif /* _SYS_STAT_H */
+
+/* arch-tag: b7da83f5-3d3f-4b19-9cd2-790dd87145e4
+   (do not change this comment) */
diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index b9936e92075..b80135b7b5e 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -29,3 +29,6 @@ struct timeval {
 };
 
 #endif  /* _SYS_TYPES_H */
+
+/* arch-tag: f85ed04d-0e99-4f97-892b-fe029d0e92f9
+   (do not change this comment) */
diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 9f358b2a4e8..0d647d16c9e 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -38,3 +38,6 @@ typedef unsigned long mode_t;
 #endif  /* __MRC__ */
 
 #endif  /* _SYS_TYPES_H */
+
+/* arch-tag: d4b69a6a-b2ff-4be2-a152-a162af81d823
+   (do not change this comment) */
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 7d423630c93..3996351a79a 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -66,3 +66,6 @@ struct termio {
 #define TCSETAF 5
 
 #endif /* _SYS_TERMIO_H */
+
+/* arch-tag: 0e7a100d-2ac0-412e-9dc4-52e39ef43e14
+   (do not change this comment) */
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 1a7f9253296..a6ce81af1ee 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -35,3 +35,6 @@ struct utimbuf {
 int utime(const char *path, const struct utimbuf *buf);
 
 #endif
+
+/* arch-tag: 52dc3f6b-6122-4568-8f09-a5a56de6a324
+   (do not change this comment) */
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index 0469fcf9eab..e1fe3217ea6 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -30,3 +30,6 @@ struct utsname {
 int uname(struct utsname *name);
 
 #endif
+
+/* arch-tag: 8a013744-4d43-4084-8e2f-d3fb66c83160
+   (do not change this comment) */
diff --git a/mac/make-package b/mac/make-package
index b3911afa0da..d9186605386 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -425,4 +425,5 @@ rm ${builddir}/mac/EmacsRW.dmg
 echo "Cleaning up the staging directory"
 rm -rf ${builddir}/mac/Emacs.pkg ${removable_build_dir}
 
+# arch-tag: 1b631d0d-9fde-4f71-80c0-33e0e5815515
 ### make-package ends here
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index d170750679f..063e63e1759 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1123,3 +1123,4 @@ Make-DocFile Ä {Make-DocFileDir}Make-DocFile
 "{Source}chdir.c.x" Ä {Makefile} "{Source}chdir.c"
         {PPCC} "{Source}chdir.c" -o "{Source}chdir.c.x" {Make-DocFile-PPCCOptions}
 
+# arch-tag: c9d9bc1a-142f-41da-b75e-79e0c44ffbb4
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) */