Navigation

← Previous Changeset
Next Changeset →

Changeset 4235

Timestamp:

04/29/08 18:10:06 (3 weeks ago)

Author:

miyoshi

Message:

* w32select.c: Include mw32term.h for Meadow.

* makefile.mw32-in: Update dependencies.
(WIN32OBJ): Add w32select.o instead of mw32clpbd.o.

* w32.c (globals_of_w32): mw32_mule_clipboard_format is removed.

* emacs.c (main): Call syms_of_w32select() instead of
syms_of_mw32clipboard().
(main): Call globals_of_w32select().
(main): Don't call init_mw32clpbd().

* mw32clpbd.c: Removed.

Files:

trunk/src/ChangeLog.Meadow (modified) (1 diff)
trunk/src/emacs.c (modified) (3 diffs)
trunk/src/makefile.mw32-in (modified) (50 diffs)
trunk/src/w32.c (modified) (1 diff)
trunk/src/w32select.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/ChangeLog.Meadow

r4233	r4235
	1	2008-04-29 MIYOSHI Masanori <miyoshi@meadowy.org>
	2
	3	* w32select.c: Include mw32term.h for Meadow.
	4
	5	* makefile.mw32-in: Update dependencies.
	6	(WIN32OBJ): Add w32select.o instead of mw32clpbd.o.
	7
	8	* w32.c (globals_of_w32): mw32_mule_clipboard_format is removed.
	9
	10	* emacs.c (main): Call syms_of_w32select() instead of
	11	syms_of_mw32clipboard().
	12	(main): Call globals_of_w32select().
	13	(main): Don't call init_mw32clpbd().
	14
	15	* mw32clpbd.c: Removed.
	16
1	17	2008-04-13 MIYOSHI Masanori <miyoshi@meadowy.org>
2	18

trunk/src/emacs.c

r4220	r4235
1632	1632	syms_of_mw32font ();
1633	1633	syms_of_mw32ime ();
1634		syms_of_~~mw32clipboard~~ ();
	1634	syms_of_w32select ();
1635	1635	syms_of_mw32menu ();
1636	1636	syms_of_mw32reg ();
…	…
1680	1680	#endif /* not MEADOW */
1681	1681	globals_of_w32menu ();
1682		~~#ifndef MEADOW~~
1683	1682	globals_of_w32select ();
1684		~~#endif /* not MEADOW */~~
1685	1683	#endif /* HAVE_NTGUI */
1686	1684	}
…	…
1705	1703	init_mw32reg ();
1706	1704	init_mw32mci ();
1707		~~init_mw32clpbd ();~~
1708	1705	#endif
1709	1706	init_fns ();

trunk/src/makefile.mw32-in

r4230	r4235
128	128	WIN32OBJ = $(BLD)/mw32term.$(O) \
129	129	$(BLD)/mw32fns.$(O) \
130		$(BLD)/~~mw32clpbd~~.$(O) \
	130	$(BLD)/w32select.$(O) \
131	131	$(BLD)/mw32menu.$(O) \
132	132	$(BLD)/mw32font.$(O) \
…	…
362	362	$(SRC)/lisp.h \
363	363	$(SRC)/process.h \
	364	$(EMACS_ROOT)/nt/inc/unistd.h \
364	365	$(SRC)/intervals.h \
365	366	$(SRC)/dispextern.h \
…	…
371	372	$(SRC)/window.h \
372	373	$(SRC)/keyboard.h \
373		$(SRC)/~~fra~~me.h \
374		$(~~SRC)/blockinput~~.h \
375		$(SRC)/~~atimer~~.h \
376		$(SRC)/~~systime~~.h \
377		$(~~EMACS_ROOT)/nt/inc/sys/time~~.h \
	374	$(SRC)/systime.h \
	375	$(EMACS_ROOT)/nt/inc/sys/time.h \
	376	$(SRC)/frame.h \
	377	$(SRC)/blockinput.h \
	378	$(SRC)/atimer.h \
378	379	$(SRC)/charset.h \
379	380	$(SRC)/syssignal.h \
380		$(EMACS_ROOT)/nt/inc/unistd.h \
381		$(EMACS_ROOT)/nt/inc/sys/file.h \
382		$(SRC)/coding.h \
383		$(SRC)/ccl.h \
384		$(EMACS_ROOT)/nt/inc/sys/param.h
	381	$(SRC)/w32.h
385	382
386	383	$(BLD)/alloca.$(O): \
…	…
436	433	$(SRC)/commands.h \
437	434	$(SRC)/keyboard.h \
	435	$(SRC)/systime.h \
	436	$(EMACS_ROOT)/nt/inc/sys/time.h \
438	437	$(SRC)/window.h \
439	438	$(SRC)/dispextern.h \
…	…
498	497	$(SRC)/mw32font.h \
499	498	$(SRC)/keyboard.h \
	499	$(SRC)/systime.h \
	500	$(EMACS_ROOT)/nt/inc/sys/time.h \
500	501	$(SRC)/keymap.h
501	502
…	…
509	510	$(SRC)/buffer.h \
510	511	$(SRC)/keyboard.h \
	512	$(SRC)/systime.h \
	513	$(EMACS_ROOT)/nt/inc/sys/time.h \
511	514	$(SRC)/frame.h \
512	515	$(SRC)/syssignal.h
…	…
518	521	$(EMACS_ROOT)/nt/inc/pwd.h \
519	522	$(EMACS_ROOT)/nt/inc/grp.h \
520		~~$(SRC)/systime.h \~~
521		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
522	523	$(EMACS_ROOT)/nt/inc/unistd.h \
523	524	$(EMACS_ROOT)/nt/inc/sys/dir.h \
524	525	$(EMACS_ROOT)/nt/inc/sys/..\..\..\src\ndir.h \
525	526	$(SRC)/lisp.h \
526		$(SRC)/buffer.h \
527		$(SRC)/commands.h \
528		$(SRC)/charset.h \
529		$(SRC)/coding.h \
530		$(SRC)/ccl.h \
531		$(SRC)/regex.h
	527	$(SRC)/systime.h \
	528	$(EMACS_ROOT)/nt/inc/sys/time.h \
	529	$(SRC)/buffer.h \
	530	$(SRC)/commands.h \
	531	$(SRC)/charset.h \
	532	$(SRC)/coding.h \
	533	$(SRC)/ccl.h \
	534	$(SRC)/regex.h \
	535	$(SRC)/blockinput.h \
	536	$(SRC)/atimer.h
532	537
533	538	$(BLD)/dispnew.$(O): \
…	…
547	552	$(SRC)/charset.h \
548	553	$(SRC)/keyboard.h \
	554	$(SRC)/systime.h \
	555	$(EMACS_ROOT)/nt/inc/sys/time.h \
549	556	$(SRC)/frame.h \
550	557	$(SRC)/window.h \
…	…
556	563	$(SRC)/blockinput.h \
557	564	$(SRC)/atimer.h \
558		~~$(SRC)/systime.h \~~
559		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
560	565	$(SRC)/process.h \
561	566	$(SRC)/syssignal.h \
…	…
572	577	$(SRC)/buffer.h \
573	578	$(SRC)/keyboard.h \
	579	$(SRC)/systime.h \
	580	$(EMACS_ROOT)/nt/inc/sys/time.h \
574	581	$(SRC)/charset.h \
575	582	$(SRC)/keymap.h
…	…
589	596	$(EMACS_ROOT)/nt/inc/pwd.h \
590	597	$(EMACS_ROOT)/nt/inc/unistd.h \
591		$(SRC)/systime.h \
592		$(EMACS_ROOT)/nt/inc/sys/time.h \
593		$(SRC)/lisp.h \
594		$(SRC)/intervals.h \
595		$(SRC)/dispextern.h \
596		$(SRC)/w32gui.h \
597		$(SRC)/mw32font.h \
598		$(SRC)/composite.h \
599		$(SRC)/buffer.h \
600		$(SRC)/charset.h \
601		$(SRC)/coding.h \
602		$(SRC)/ccl.h \
603		$(SRC)/frame.h \
604		$(SRC)/window.h
	598	$(SRC)/lisp.h \
	599	$(SRC)/systime.h \
	600	$(EMACS_ROOT)/nt/inc/sys/time.h \
	601	$(SRC)/intervals.h \
	602	$(SRC)/dispextern.h \
	603	$(SRC)/w32gui.h \
	604	$(SRC)/mw32font.h \
	605	$(SRC)/composite.h \
	606	$(SRC)/buffer.h \
	607	$(SRC)/charset.h \
	608	$(SRC)/coding.h \
	609	$(SRC)/ccl.h \
	610	$(SRC)/frame.h \
	611	$(SRC)/window.h \
	612	$(SRC)/blockinput.h \
	613	$(SRC)/atimer.h
605	614
606	615	$(BLD)/eval.$(O): \
…	…
637	646	$(SRC)/ccl.h \
638	647	$(SRC)/window.h \
	648	$(SRC)/blockinput.h \
	649	$(SRC)/atimer.h \
639	650	$(SRC)/systime.h \
640	651	$(EMACS_ROOT)/nt/inc/sys/time.h \
…	…
673	684	$(SRC)/buffer.h \
674	685	$(SRC)/keyboard.h \
	686	$(SRC)/systime.h \
	687	$(EMACS_ROOT)/nt/inc/sys/time.h \
675	688	$(SRC)/keymap.h \
676	689	$(SRC)/intervals.h \
…	…
683	696	$(SRC)/blockinput.h \
684	697	$(SRC)/atimer.h \
685		$(~~SRC)/systime~~.h \
686		$(EMACS_ROOT)/nt/inc/~~sys/time~~.h \
	698	$(EMACS_ROOT)/nt/inc/langinfo.h \
	699	$(EMACS_ROOT)/nt/inc/nl_types.h \
687	700	$(SRC)/md5.h
688	701
…	…
697	710	$(SRC)/indent.h \
698	711	$(SRC)/keyboard.h \
	712	$(SRC)/systime.h \
	713	$(EMACS_ROOT)/nt/inc/sys/time.h \
699	714	$(SRC)/frame.h \
700	715	$(SRC)/window.h \
…	…
738	753	$(SRC)/macros.h \
739	754	$(SRC)/keyboard.h \
	755	$(SRC)/systime.h \
	756	$(EMACS_ROOT)/nt/inc/sys/time.h \
740	757	$(SRC)/frame.h \
741	758	$(SRC)/window.h \
…	…
753	770	$(SRC)/blockinput.h \
754	771	$(SRC)/atimer.h \
755		~~$(SRC)/systime.h \~~
756		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
757	772	$(SRC)/mw32sync.h \
758	773	$(SRC)/mw32mci.h \
…	…
775	790	$(SRC)/charset.h \
776	791	$(SRC)/keyboard.h \
	792	$(SRC)/systime.h \
	793	$(EMACS_ROOT)/nt/inc/sys/time.h \
777	794	$(SRC)/termhooks.h \
778	795	$(SRC)/blockinput.h \
779	796	$(SRC)/atimer.h \
780		~~$(SRC)/systime.h \~~
781		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
782	797	$(SRC)/puresize.h \
783	798	$(SRC)/intervals.h \
…	…
786	801	$(SRC)/mw32font.h \
787	802	$(SRC)/composite.h \
788		$(SRC)/keymap.h
	803	$(SRC)/keymap.h \
	804	$(SRC)/window.h
789	805
790	806	$(BLD)/lread.$(O): \
…	…
804	820	$(SRC)/commands.h \
805	821	$(SRC)/keyboard.h \
	822	$(SRC)/systime.h \
	823	$(EMACS_ROOT)/nt/inc/sys/time.h \
806	824	$(SRC)/termhooks.h \
807	825	$(SRC)/coding.h \
808	826	$(SRC)/ccl.h \
	827	$(SRC)/blockinput.h \
	828	$(SRC)/atimer.h \
809	829	$(EMACS_ROOT)/nt/inc/unistd.h
810	830
…	…
821	841	$(SRC)/w32gui.h \
822	842	$(SRC)/mw32font.h \
823		$(SRC)/keyboard.h
	843	$(SRC)/keyboard.h \
	844	$(SRC)/systime.h \
	845	$(EMACS_ROOT)/nt/inc/sys/time.h
824	846
825	847	$(BLD)/marker.$(O): \
…	…
849	871	$(SRC)/mw32font.h \
850	872	$(SRC)/keyboard.h \
	873	$(SRC)/systime.h \
	874	$(EMACS_ROOT)/nt/inc/sys/time.h \
851	875	$(SRC)/frame.h \
852	876	$(SRC)/window.h \
…	…
865	889	$(EMACS_ROOT)/nt/inc/pwd.h \
866	890	$(EMACS_ROOT)/nt/inc/grp.h \
	891	$(SRC)/charset.h \
	892	$(SRC)/coding.h \
	893	$(SRC)/ccl.h \
867	894	$(SRC)/mw32reg.h \
868	895	$(SRC)/mw32sync.h \
…	…
871	898	$(SRC)/w32.h \
872	899	$(SRC)/ndir.h \
	900	$(SRC)/w32heap.h \
873	901	$(SRC)/systime.h
874	902
	903	$(BLD)/w32heap.$(O): \
	904	$(SRC)/config.h \
	905	$(SRC)/s/ms-w32.h \
	906	$(SRC)/m/intel386.h \
	907	$(SRC)/w32heap.h \
	908	$(SRC)/lisp.h
	909
875	910	$(BLD)/w32inevt.$(O): \
876	911	$(SRC)/config.h \
…	…
879	914	$(SRC)/lisp.h \
880	915	$(SRC)/keyboard.h \
881		$(SRC)/~~fra~~me.h \
882		$(~~SRC)/blockinput~~.h \
883		$(SRC)/~~atimer~~.h \
884		$(SRC)/~~systime~~.h \
885		$(~~EMACS_ROOT)/nt/inc/sys/time~~.h \
	916	$(SRC)/systime.h \
	917	$(EMACS_ROOT)/nt/inc/sys/time.h \
	918	$(SRC)/frame.h \
	919	$(SRC)/blockinput.h \
	920	$(SRC)/atimer.h \
886	921	$(SRC)/termhooks.h
887	922
…	…
891	926	$(SRC)/s/ms-w32.h \
892	927	$(SRC)/m/intel386.h \
	928	$(EMACS_ROOT)/nt/inc/nl_types.h \
	929	$(EMACS_ROOT)/nt/inc/langinfo.h \
893	930	$(SRC)/lisp.h \
894	931	$(SRC)/w32.h \
	932	$(SRC)/charset.h \
	933	$(SRC)/coding.h \
	934	$(SRC)/ccl.h \
	935	$(SRC)/w32heap.h \
895	936	$(SRC)/systime.h \
896	937	$(EMACS_ROOT)/nt/inc/sys/time.h \
897	938	$(SRC)/syswait.h \
898	939	$(SRC)/process.h \
899		$(SRC)/syssignal.h \
900		$(SRC)/w32term.h \
901		$(SRC)/w32gui.h \
902		$(SRC)/mw32font.h
	940	$(EMACS_ROOT)/nt/inc/unistd.h \
	941	$(SRC)/syssignal.h
903	942
904	943	$(BLD)/w32console.$(O): \
…	…
926	965	$(SRC)/charset.h \
927	966	$(SRC)/keyboard.h \
	967	$(SRC)/systime.h \
	968	$(EMACS_ROOT)/nt/inc/sys/time.h \
928	969	$(SRC)/frame.h \
929	970	$(SRC)/window.h \
…	…
932	973	$(SRC)/mw32font.h \
933	974	$(SRC)/process.h \
	975	$(EMACS_ROOT)/nt/inc/unistd.h \
934	976	$(SRC)/termchar.h \
935	977	$(SRC)/intervals.h \
936		$(SRC)/composite.h
	978	$(SRC)/composite.h \
	979	$(SRC)/blockinput.h \
	980	$(SRC)/atimer.h
937	981
938	982	$(BLD)/process.$(O): \
…	…
947	991	$(EMACS_ROOT)/nt/inc/netinet/in.h \
948	992	$(EMACS_ROOT)/nt/inc/arpa/inet.h \
	993	$(SRC)/lisp.h \
949	994	$(SRC)/systime.h \
950	995	$(EMACS_ROOT)/nt/inc/sys/time.h \
951	996	$(SRC)/systty.h \
952		~~$(SRC)/lisp.h \~~
953	997	$(SRC)/window.h \
954	998	$(SRC)/dispextern.h \
…	…
993	1037	$(SRC)/mw32font.h \
994	1038	$(SRC)/keyboard.h \
	1039	$(SRC)/systime.h \
	1040	$(EMACS_ROOT)/nt/inc/sys/time.h \
995	1041	$(SRC)/frame.h \
996	1042	$(SRC)/window.h
…	…
1077	1123	$(SRC)/ccl.h \
1078	1124	$(SRC)/keyboard.h \
	1125	$(SRC)/systime.h \
	1126	$(EMACS_ROOT)/nt/inc/sys/time.h \
1079	1127	$(SRC)/frame.h \
1080	1128	$(SRC)/disptab.h \
…	…
1085	1133	$(SRC)/window.h \
1086	1134	$(SRC)/keymap.h \
	1135	$(SRC)/blockinput.h \
	1136	$(SRC)/atimer.h \
1087	1137	$(SRC)/cm.h
1088	1138
…	…
1107	1157	$(SRC)/lisp.h \
1108	1158	$(SRC)/buffer.h \
1109		$(SRC)/commands.h
	1159	$(SRC)/commands.h \
	1160	$(SRC)/window.h \
	1161	$(SRC)/dispextern.h \
	1162	$(SRC)/w32gui.h \
	1163	$(SRC)/mw32font.h
	1164
	1165	$(BLD)/unexw32.$(O): \
	1166	$(SRC)/config.h \
	1167	$(SRC)/s/ms-w32.h \
	1168	$(SRC)/m/intel386.h \
	1169	$(SRC)/w32heap.h
1110	1170
1111	1171	$(BLD)/window.$(O): \
…	…
1116	1176	$(SRC)/buffer.h \
1117	1177	$(SRC)/keyboard.h \
	1178	$(SRC)/systime.h \
	1179	$(EMACS_ROOT)/nt/inc/sys/time.h \
1118	1180	$(SRC)/keymap.h \
1119	1181	$(SRC)/frame.h \
…	…
1128	1190	$(SRC)/blockinput.h \
1129	1191	$(SRC)/atimer.h \
1130		~~$(SRC)/systime.h \~~
1131		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
1132	1192	$(SRC)/intervals.h \
1133	1193	$(SRC)/composite.h \
…	…
1141	1201	$(SRC)/lisp.h \
1142	1202	$(SRC)/keyboard.h \
	1203	$(SRC)/systime.h \
	1204	$(EMACS_ROOT)/nt/inc/sys/time.h \
1143	1205	$(SRC)/frame.h \
1144	1206	$(SRC)/window.h \
…	…
1160	1222	$(SRC)/ccl.h \
1161	1223	$(SRC)/process.h \
	1224	$(EMACS_ROOT)/nt/inc/unistd.h \
1162	1225	$(SRC)/region-cache.h \
1163	1226	$(SRC)/fontset.h \
1164	1227	$(SRC)/blockinput.h \
1165	1228	$(SRC)/atimer.h \
1166		~~$(SRC)/systime.h \~~
1167		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
1168	1229	$(SRC)/mw32term.h \
1169	1230	$(SRC)/mw32sync.h
…	…
1198	1259	$(SRC)/commands.h \
1199	1260	$(SRC)/keyboard.h \
	1261	$(SRC)/systime.h \
	1262	$(EMACS_ROOT)/nt/inc/sys/time.h \
1200	1263	$(SRC)/fontset.h \
1201	1264	$(SRC)/blockinput.h \
1202	1265	$(SRC)/atimer.h \
1203		~~$(SRC)/systime.h \~~
1204		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
1205	1266	$(SRC)/termhooks.h \
1206	1267	$(SRC)/dispextern.h \
…	…
1227	1288	$(SRC)/puresize.h \
1228	1289	$(SRC)/keyboard.h \
	1290	$(SRC)/systime.h \
	1291	$(EMACS_ROOT)/nt/inc/sys/time.h \
1229	1292	$(SRC)/keymap.h
1230	1293
…	…
1344	1407	$(SRC)/ccl.h \
1345	1408	$(SRC)/keyboard.h \
	1409	$(SRC)/systime.h \
	1410	$(EMACS_ROOT)/nt/inc/sys/time.h \
1346	1411	$(SRC)/frame.h \
1347	1412	$(SRC)/dispextern.h \
…	…
1384	1449	$(EMACS_ROOT)/nt/inc/sys/time.h \
1385	1450	$(SRC)/epaths.h \
	1451	$(SRC)/charset.h \
	1452	$(SRC)/coding.h \
	1453	$(SRC)/ccl.h \
1386	1454	$(SRC)/mw32term.h \
1387	1455	$(SRC)/mw32wand.h
…	…
1433	1501	$(SRC)/composite.h \
1434	1502	$(SRC)/process.h \
	1503	$(EMACS_ROOT)/nt/inc/unistd.h \
1435	1504	$(SRC)/keymap.h
1436	1505
…	…
1451	1520	$(SRC)/composite.h \
1452	1521	$(SRC)/keyboard.h \
1453		$(SRC)/~~blockinput~~.h \
1454		$(~~SRC)/atimer~~.h \
1455		$(SRC)/~~systime~~.h \
1456		$(~~EMACS_ROOT)/nt/inc/sys/time~~.h \
	1522	$(SRC)/systime.h \
	1523	$(EMACS_ROOT)/nt/inc/sys/time.h \
	1524	$(SRC)/blockinput.h \
	1525	$(SRC)/atimer.h \
1457	1526	$(SRC)/mw32sync.h \
1458	1527	$(SRC)/epaths.h \
…	…
1464	1533	$(SRC)/mw32rgb.h
1465	1534
1466		$(BLD)/mw32clpbd.$(O): \
1467		$(SRC)/config.h \
1468		$(SRC)/s/ms-w32.h \
1469		$(SRC)/m/intel386.h \
1470		$(SRC)/lisp.h \
1471		$(SRC)/charset.h \
1472		$(SRC)/coding.h \
1473		$(SRC)/ccl.h \
1474		$(SRC)/buffer.h \
1475		$(SRC)/blockinput.h \
1476		$(SRC)/atimer.h \
1477		$(SRC)/systime.h \
1478		$(EMACS_ROOT)/nt/inc/sys/time.h
	1535	$(BLD)/w32select.$(O): \
	1536	$(SRC)/config.h \
	1537	$(SRC)/s/ms-w32.h \
	1538	$(SRC)/m/intel386.h \
	1539	$(SRC)/lisp.h \
	1540	$(SRC)/mw32term.h \
	1541	$(SRC)/w32gui.h \
	1542	$(SRC)/mw32font.h \
	1543	$(SRC)/frame.h \
	1544	$(SRC)/w32heap.h \
	1545	$(SRC)/blockinput.h \
	1546	$(SRC)/atimer.h \
	1547	$(SRC)/systime.h \
	1548	$(EMACS_ROOT)/nt/inc/sys/time.h \
	1549	$(SRC)/keyboard.h \
	1550	$(SRC)/charset.h \
	1551	$(SRC)/coding.h \
	1552	$(SRC)/ccl.h \
	1553	$(SRC)/composite.h
1479	1554
1480	1555	$(BLD)/mw32menu.$(O): \
…	…
1485	1560	$(SRC)/termhooks.h \
1486	1561	$(SRC)/keyboard.h \
	1562	$(SRC)/systime.h \
	1563	$(EMACS_ROOT)/nt/inc/sys/time.h \
1487	1564	$(SRC)/keymap.h \
1488	1565	$(SRC)/frame.h \
…	…
1493	1570	$(SRC)/blockinput.h \
1494	1571	$(SRC)/atimer.h \
1495		~~$(SRC)/systime.h \~~
1496		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
1497	1572	$(SRC)/buffer.h \
1498	1573	$(SRC)/charset.h \
…	…
1539	1614	$(SRC)/mw32dl.h
1540	1615
1541		~~$(BLD)/mw32mem.$(O): \~~
1542		~~$(SRC)/config.h \~~
1543		~~$(SRC)/s/ms-w32.h \~~
1544		~~$(SRC)/m/intel386.h \~~
1545		~~$(SRC)/lisp.h \~~
1546		~~$(SRC)/w32.h~~
1547
1548	1616	$(BLD)/mw32mci.$(O): \
1549	1617	$(SRC)/config.h \
…	…
1567	1635	$(SRC)/charset.h \
1568	1636	$(SRC)/keyboard.h \
	1637	$(SRC)/systime.h \
	1638	$(EMACS_ROOT)/nt/inc/sys/time.h \
1569	1639	$(SRC)/frame.h \
1570	1640	$(SRC)/fontset.h \
…	…
1576	1646	$(SRC)/blockinput.h \
1577	1647	$(SRC)/atimer.h \
1578		~~$(SRC)/systime.h \~~
1579		~~$(EMACS_ROOT)/nt/inc/sys/time.h \~~
1580	1648	$(SRC)/window.h \
1581	1649	$(SRC)/intervals.h \
…	…
1594	1662	$(SRC)/m/intel386.h \
1595	1663	$(SRC)/lisp.h \
1596		$(SRC)/buffer.h \
1597		$(SRC)/frame.h \
1598		$(SRC)/window.h \
1599		$(SRC)/dispextern.h \
1600		$(SRC)/w32gui.h \
1601		$(SRC)/mw32font.h \
	1664	$(SRC)/intervals.h \
	1665	$(SRC)/dispextern.h \
	1666	$(SRC)/w32gui.h \
	1667	$(SRC)/mw32font.h \
	1668	$(SRC)/composite.h \
	1669	$(SRC)/buffer.h \
	1670	$(SRC)/frame.h \
	1671	$(SRC)/window.h \
1602	1672	$(SRC)/charset.h \
1603	1673	$(SRC)/coding.h \

trunk/src/w32.c

r4220	r4235
4911	4911	SetConsoleCtrlHandler(shutdown_handler, TRUE);
4912	4912
4913		~~#if 0~~
4914		~~/* To encode and decode clipboard string properly, I don't make use~~
4915		~~of w32_mule_clipboard_format. */~~
4916		~~mw32_mule_clipboard_format = RegisterClipboardFormat (MULE_CLIPBOARD_FORMAT);~~
4917		~~#else~~
4918		~~mw32_mule_clipboard_format = 0;~~
4919		~~#endif~~
4920
4921	4913	#ifdef MEADOW
4922	4914	InitializeCriticalSection (&critsec_message);

trunk/src/w32select.c

r4220	r4235
77	77	#include <config.h>
78	78	#include "lisp.h"
	79	#ifdef MEADOW
	80	#include "mw32term.h" /* for all of the w32 includes */
	81	#else
79	82	#include "w32term.h" /* for all of the w32 includes */
	83	#endif
80	84	#include "w32heap.h" /* os_subtype */
81	85	#include "blockinput.h"