aboutsummaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
Diffstat (limited to 'mac')
-rw-r--r--mac/ChangeLog4
-rw-r--r--mac/cw5-mcp.xml25
-rw-r--r--mac/cw6-mcp.xml20
3 files changed, 45 insertions, 4 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 91c0fd6c029..d6f1ce67f89 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,5 +1,9 @@
12000-12-12 Andrew Choi <akochoi@i-cable.com> 12000-12-12 Andrew Choi <akochoi@i-cable.com>
2 2
3 * cw5-mcp.xml: add md5.c to project.
4
5 * cw6-mcp.xml: add md5.c to project.
6
3 * src/macfns.c (x_create_tip_frame, Fx_hide_tip): change to handle 7 * src/macfns.c (x_create_tip_frame, Fx_hide_tip): change to handle
4 Lisp_Object type tip_frame (was struct frame *) as in xfns.c. 8 Lisp_Object type tip_frame (was struct frame *) as in xfns.c.
5 9
diff --git a/mac/cw5-mcp.xml b/mac/cw5-mcp.xml
index 835903ffedf..bd6e28f46d6 100644
--- a/mac/cw5-mcp.xml
+++ b/mac/cw5-mcp.xml
@@ -617,9 +617,10 @@
617 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING> 617 <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
618 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME> 618 <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
619 <SETTING><VALUE></VALUE></SETTING> 619 <SETTING><VALUE></VALUE></SETTING>
620 <SETTING><VALUE>ª^</VALUE></SETTING> 620 <SETTING><VALUE>ªZƒ</VALUE></SETTING>
621 <SETTING><VALUE>à8</VALUE></SETTING> 621 <SETTING><VALUE>~—¯</VALUE></SETTING>
622 <SETTING><VALUE>¢ê</VALUE></SETTING> 622 <SETTING><VALUE>
623|0</VALUE></SETTING>
623 </SETTING> 624 </SETTING>
624 625
625 <!-- Settings for "PPC CodeGen" panel --> 626 <!-- Settings for "PPC CodeGen" panel -->
@@ -1224,6 +1225,13 @@
1224 <FILEKIND>Library</FILEKIND> 1225 <FILEKIND>Library</FILEKIND>
1225 <FILEFLAGS>Debug</FILEFLAGS> 1226 <FILEFLAGS>Debug</FILEFLAGS>
1226 </FILE> 1227 </FILE>
1228 <FILE>
1229 <PATHTYPE>Name</PATHTYPE>
1230 <PATH>md5.c</PATH>
1231 <PATHFORMAT>MacOS</PATHFORMAT>
1232 <FILEKIND>Text</FILEKIND>
1233 <FILEFLAGS>Debug</FILEFLAGS>
1234 </FILE>
1227 </FILELIST> 1235 </FILELIST>
1228 <LINKORDER> 1236 <LINKORDER>
1229 <FILEREF> 1237 <FILEREF>
@@ -1428,6 +1436,11 @@
1428 </FILEREF> 1436 </FILEREF>
1429 <FILEREF> 1437 <FILEREF>
1430 <PATHTYPE>Name</PATHTYPE> 1438 <PATHTYPE>Name</PATHTYPE>
1439 <PATH>md5.c</PATH>
1440 <PATHFORMAT>MacOS</PATHFORMAT>
1441 </FILEREF>
1442 <FILEREF>
1443 <PATHTYPE>Name</PATHTYPE>
1431 <PATH>minibuf.c</PATH> 1444 <PATH>minibuf.c</PATH>
1432 <PATHFORMAT>MacOS</PATHFORMAT> 1445 <PATHFORMAT>MacOS</PATHFORMAT>
1433 </FILEREF> 1446 </FILEREF>
@@ -1844,6 +1857,12 @@
1844 <FILEREF> 1857 <FILEREF>
1845 <TARGETNAME>Emacs</TARGETNAME> 1858 <TARGETNAME>Emacs</TARGETNAME>
1846 <PATHTYPE>Name</PATHTYPE> 1859 <PATHTYPE>Name</PATHTYPE>
1860 <PATH>md5.c</PATH>
1861 <PATHFORMAT>MacOS</PATHFORMAT>
1862 </FILEREF>
1863 <FILEREF>
1864 <TARGETNAME>Emacs</TARGETNAME>
1865 <PATHTYPE>Name</PATHTYPE>
1847 <PATH>minibuf.c</PATH> 1866 <PATH>minibuf.c</PATH>
1848 <PATHFORMAT>MacOS</PATHFORMAT> 1867 <PATHFORMAT>MacOS</PATHFORMAT>
1849 </FILEREF> 1868 </FILEREF>
diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 5e459157eeb..213f6b6d263 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -607,7 +607,7 @@
607 <!-- Settings for "FTP Panel" panel --> 607 <!-- Settings for "FTP Panel" panel -->
608 <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING> 608 <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING>
609 <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING> 609 <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING>
610 <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>854um6254wjei54ctb6054ctb6054cjfi55gdei</VALUE></SETTING> 610 <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>3654kr6a654npes6544xbe*&#154;A&#145;&#224;"</VALUE></SETTING>
611 <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING> 611 <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING>
612 <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>0</VALUE></SETTING> 612 <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>0</VALUE></SETTING>
613 <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING> 613 <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING>
@@ -1480,6 +1480,13 @@
1480 <FILEKIND>Library</FILEKIND> 1480 <FILEKIND>Library</FILEKIND>
1481 <FILEFLAGS>Debug</FILEFLAGS> 1481 <FILEFLAGS>Debug</FILEFLAGS>
1482 </FILE> 1482 </FILE>
1483 <FILE>
1484 <PATHTYPE>Name</PATHTYPE>
1485 <PATH>md5.c</PATH>
1486 <PATHFORMAT>MacOS</PATHFORMAT>
1487 <FILEKIND>Text</FILEKIND>
1488 <FILEFLAGS>Debug</FILEFLAGS>
1489 </FILE>
1483 </FILELIST> 1490 </FILELIST>
1484 <LINKORDER> 1491 <LINKORDER>
1485 <FILEREF> 1492 <FILEREF>
@@ -1684,6 +1691,11 @@
1684 </FILEREF> 1691 </FILEREF>
1685 <FILEREF> 1692 <FILEREF>
1686 <PATHTYPE>Name</PATHTYPE> 1693 <PATHTYPE>Name</PATHTYPE>
1694 <PATH>md5.c</PATH>
1695 <PATHFORMAT>MacOS</PATHFORMAT>
1696 </FILEREF>
1697 <FILEREF>
1698 <PATHTYPE>Name</PATHTYPE>
1687 <PATH>minibuf.c</PATH> 1699 <PATH>minibuf.c</PATH>
1688 <PATHFORMAT>MacOS</PATHFORMAT> 1700 <PATHFORMAT>MacOS</PATHFORMAT>
1689 </FILEREF> 1701 </FILEREF>
@@ -2100,6 +2112,12 @@
2100 <FILEREF> 2112 <FILEREF>
2101 <TARGETNAME>Emacs</TARGETNAME> 2113 <TARGETNAME>Emacs</TARGETNAME>
2102 <PATHTYPE>Name</PATHTYPE> 2114 <PATHTYPE>Name</PATHTYPE>
2115 <PATH>md5.c</PATH>
2116 <PATHFORMAT>MacOS</PATHFORMAT>
2117 </FILEREF>
2118 <FILEREF>
2119 <TARGETNAME>Emacs</TARGETNAME>
2120 <PATHTYPE>Name</PATHTYPE>
2103 <PATH>minibuf.c</PATH> 2121 <PATH>minibuf.c</PATH>
2104 <PATHFORMAT>MacOS</PATHFORMAT> 2122 <PATHFORMAT>MacOS</PATHFORMAT>
2105 </FILEREF> 2123 </FILEREF>