Remove mocklisp files.

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index 1a9ae2ea8ddc3a1abf394dde31f0d6596caca631..e2a391d1e75f99b494e77304aa145aab172b18ba 100644 (file)
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -139,7 +139,7 @@ $(BLD)\ebrowse.obj: ebrowse.c ..\src\config.h
 #
 # From ..\src\makefile.nt.
 #
-obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c mocklisp.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
 
 #
 # These are the lisp files that are loaded up in loadup.el

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 4daf6675aa99a0f245f88879dd6acbdf5dd30369..7b50b973c67f525751aa87f18438b63915488e3c 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -126,7 +126,7 @@ $(BLD)/ctags.$(O): ctags.c
 #
 # From ..\src\makefile.nt.
 #
-obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c mocklisp.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c xfaces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c xfaces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
 
 #
 # These are the lisp files that are loaded up in loadup.el

diff --git a/mac/cw5-mcp.xml b/mac/cw5-mcp.xml
index be62ecb785789aa82fdc20000bbcad5e4953a1ec..42cb8746778e50018d9d3f47eb0a461cc92c85dd 100644 (file)
--- a/mac/cw5-mcp.xml
+++ b/mac/cw5-mcp.xml
@@ -877,13 +877,6 @@ emacs-cw5.mcp project.
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>mocklisp.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>marker.c</PATH>
@@ -1479,11 +1472,6 @@ emacs-cw5.mcp project.
                     <PATH>mktime.c</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>mocklisp.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>print.c</PATH>
@@ -1902,12 +1890,6 @@ emacs-cw5.mcp project.
                 <PATH>mktime.c</PATH>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Emacs</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>mocklisp.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
             <FILEREF>
                 <TARGETNAME>Emacs</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 22e613690896899f1ef69bbb098bde31b6b42ce1..454b947b78b53ded858997fc01638418ecb23fff 100644 (file)
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -1125,13 +1125,6 @@ emacs-cw6.mcp project.
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS>Debug</FILEFLAGS>
                 </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>mocklisp.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>marker.c</PATH>
@@ -1734,11 +1727,6 @@ emacs-cw6.mcp project.
                     <PATH>mktime.c</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>mocklisp.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
                     <PATH>print.c</PATH>
@@ -2157,12 +2145,6 @@ emacs-cw6.mcp project.
                 <PATH>mktime.c</PATH>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Emacs</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>mocklisp.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
             <FILEREF>
                 <TARGETNAME>Emacs</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 3f1d27dec742796f3ffe144631d7d16ccd691246..66ad1c73f9bd3051741da2f0a991ee9df7122c50 100644 (file)
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -104,7 +104,6 @@ EmacsObjects = 
        "{Src}md5.c.x" ¶
        "{Src}minibuf.c.x" ¶
        "{Src}mktime.c.x" ¶
-       "{Src}mocklisp.c.x" ¶
        "{Src}print.c.x" ¶
        "{Src}process.c.x" ¶
        "{Src}regex.c.x" ¶
@@ -233,8 +232,7 @@ Emacs 
        "{Src}buffer.h" ¶
        "{Src}commands.h" ¶
        "{Src}keyboard.h" ¶
-       {WINDOW_H_GROUP} ¶
-       "{Src}mocklisp.h"
+       {WINDOW_H_GROUP}
 
 {Src}callproc.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -620,11 +618,6 @@ Emacs 
        {CONFIG_H_GROUP} ¶
        "{Includes}sys:types.h"
 
-{Src}mocklisp.c.x Ä ¶
-       {CONFIG_H_GROUP} ¶
-       "{Src}lisp.h" ¶
-       "{Src}buffer.h"
-
 {Src}print.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
        "{Src}lisp.h" ¶
@@ -979,7 +972,6 @@ EmacsSource = 
        "{Src}marker.c" ¶
        "{Src}minibuf.c" ¶
        "{Src}mktime.c" ¶
-       "{Src}mocklisp.c" ¶
        "{Src}print.c" ¶
        "{Src}process.c" ¶
        "{Src}regex.c" ¶

diff --git a/src/Makefile.in b/src/Makefile.in
index 978e2b35dca003af0f56dff8c33633b4aa89c428..997a1c8fd33306017ee3f38f12804cdf547c2f22 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -539,7 +539,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
        cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
        alloc.o data.o doc.o editfns.o callint.o \
        eval.o floatfns.o fns.o print.o lread.o \
-       abbrev.o syntax.o UNEXEC mocklisp.o bytecode.o \
+       abbrev.o syntax.o UNEXEC bytecode.o \
        process.o callproc.o \
        region-cache.o sound.o atimer.o \
        doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
@@ -1010,7 +1010,7 @@ abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h charset.h \
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
    dispextern.h $(INTERVAL_SRC) blockinput.h atimer.h systime.h charset.h \
    $(config_h)
-callint.o: callint.c window.h commands.h buffer.h mocklisp.h \
+callint.o: callint.c window.h commands.h buffer.h \
    keyboard.h dispextern.h $(config_h)
 callproc.o: callproc.c epaths.h buffer.h commands.h $(config_h) \
        process.h systty.h syssignal.h charset.h coding.h ccl.h msdos.h \
@@ -1072,7 +1072,6 @@ marker.o: marker.c buffer.h charset.h $(config_h)
 minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
    buffer.h commands.h charset.h msdos.h $(config_h)
 mktime.o: mktime.c $(config_h)
-mocklisp.o: mocklisp.c buffer.h $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \
    keyboard.h $(config_h)

diff --git a/src/makefile.nt b/src/makefile.nt
index d97a96a696901562d895c6e21afb483ad796c371..e3d05846ccc768d3790d739456b44598fb885940 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -117,8 +117,7 @@ OBJ1 =  $(BLD)\abbrev.obj       \
        $(BLD)\macros.obj       \
        $(BLD)\marker.obj       \
         $(BLD)\md5.obj          \
-       $(BLD)\minibuf.obj      \
-       $(BLD)\mocklisp.obj
+       $(BLD)\minibuf.obj
 
 OBJ2 =  $(BLD)\w32.obj           \
        $(BLD)\w32heap.obj       \
@@ -400,8 +399,7 @@ $(BLD)\callint.obj : \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
        $(SRC)\keyboard.h \
-       $(SRC)\window.h \
-       $(SRC)\mocklisp.h
+       $(SRC)\window.h
 
 $(BLD)\callproc.obj : \
        $(SRC)\callproc.c \
@@ -817,13 +815,6 @@ $(BLD)\minibuf.obj : \
        $(SRC)\window.h \
        $(SRC)\syntax.h
 
-$(BLD)\mocklisp.obj : \
-       $(SRC)\mocklisp.c \
-       $(EMACS_ROOT)\src\s\ms-w32.h \
-       $(EMACS_ROOT)\src\m\intel386.h \
-       $(EMACS_ROOT)\src\config.h \
-       $(SRC)\buffer.h
-
 $(BLD)\w32.obj : \
        $(SRC)\w32.c \
        $(SRC)\w32.h \

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 2cf1458eac7f46e44085c8665bbaff7c69ab4246..b9b1b2a85ab72f2b2d17438acd841116efc3ac21 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -84,7 +84,6 @@ OBJ1 =  $(BLD)/abbrev.$(O)                    \
        $(BLD)/marker.$(O)                      \
         $(BLD)/md5.$(O)                         \
        $(BLD)/minibuf.$(O)                     \
-       $(BLD)/mocklisp.$(O)                    \
        $(BLD)/w32.$(O)                         \
        $(BLD)/w32heap.$(O)                     \
        $(BLD)/w32inevt.$(O)                    \
@@ -335,8 +334,7 @@ $(BLD)/callint.$(O) : \
        $(SRC)/buffer.h \
        $(SRC)/commands.h \
        $(SRC)/keyboard.h \
-       $(SRC)/window.h \
-       $(SRC)/mocklisp.h
+       $(SRC)/window.h
 
 $(BLD)/callproc.$(O) : \
        $(SRC)/callproc.c \
@@ -750,13 +748,6 @@ $(BLD)/minibuf.$(O) : \
        $(SRC)/window.h \
        $(SRC)/syntax.h
 
-$(BLD)/mocklisp.$(O) : \
-       $(SRC)/mocklisp.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/buffer.h
-
 $(BLD)/w32.$(O) : \
        $(SRC)/w32.c \
        $(SRC)/w32.h \