Mercurial > vim

comparison src/Makefile @ 19181:94eda51ba9ba v8.2.0149

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0149: maintaining a Vim9 branch separately is more work Commit: https://github.com/vim/vim/commit/8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 26 15:56:19 2020 +0100 patch 8.2.0149: maintaining a Vim9 branch separately is more work Problem: Maintaining a Vim9 branch separately is more work. Solution: Merge the Vim9 script changes.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Jan 2020 16:00:05 +0100
parents 38d18056e6e6
children a961efb326e5
comparison
equal deleted inserted replaced
19180:8edf0aeb71b9 19181:94eda51ba9ba
1621 json.c \ 1621 json.c \
1622 list.c \ 1622 list.c \
1623 main.c \ 1623 main.c \
1624 map.c \ 1624 map.c \
1625 mark.c \ 1625 mark.c \
1626 mbyte.c \
1626 memfile.c \ 1627 memfile.c \
1627 memline.c \ 1628 memline.c \
1628 menu.c \ 1629 menu.c \
1629 message.c \ 1630 message.c \
1630 misc1.c \ 1631 misc1.c \
1631 misc2.c \ 1632 misc2.c \
1632 mouse.c \ 1633 mouse.c \
1633 move.c \ 1634 move.c \
1634 mbyte.c \
1635 normal.c \ 1635 normal.c \
1636 ops.c \ 1636 ops.c \
1637 option.c \ 1637 option.c \
1638 optionstr.c \ 1638 optionstr.c \
1639 os_unix.c \ 1639 os_unix.c \
1643 profiler.c \ 1643 profiler.c \
1644 pty.c \ 1644 pty.c \
1645 quickfix.c \ 1645 quickfix.c \
1646 regexp.c \ 1646 regexp.c \
1647 register.c \ 1647 register.c \
1648 screen.c \
1648 scriptfile.c \ 1649 scriptfile.c \
1649 screen.c \
1650 search.c \ 1650 search.c \
1651 session.c \ 1651 session.c \
1652 sha256.c \ 1652 sha256.c \
1653 sign.c \ 1653 sign.c \
1654 sound.c \ 1654 sound.c \
1664 ui.c \ 1664 ui.c \
1665 undo.c \ 1665 undo.c \
1666 usercmd.c \ 1666 usercmd.c \
1667 userfunc.c \ 1667 userfunc.c \
1668 version.c \ 1668 version.c \
1669 vim9compile.c \
1670 vim9execute.c \
1671 vim9script.c \
1669 viminfo.c \ 1672 viminfo.c \
1670 window.c \ 1673 window.c \
1671 bufwrite.c \ 1674 bufwrite.c \
1672 $(OS_EXTRA_SRC) 1675 $(OS_EXTRA_SRC)
1673 1676
1759 objects/indent.o \ 1762 objects/indent.o \
1760 objects/insexpand.o \ 1763 objects/insexpand.o \
1761 objects/list.o \ 1764 objects/list.o \
1762 objects/map.o \ 1765 objects/map.o \
1763 objects/mark.o \ 1766 objects/mark.o \
1767 objects/mbyte.o \
1764 objects/memline.o \ 1768 objects/memline.o \
1765 objects/menu.o \ 1769 objects/menu.o \
1766 objects/misc1.o \ 1770 objects/misc1.o \
1767 objects/misc2.o \ 1771 objects/misc2.o \
1768 objects/mouse.o \ 1772 objects/mouse.o \
1769 objects/move.o \ 1773 objects/move.o \
1770 objects/mbyte.o \
1771 objects/normal.o \ 1774 objects/normal.o \
1772 objects/ops.o \ 1775 objects/ops.o \
1773 objects/option.o \ 1776 objects/option.o \
1774 objects/optionstr.o \ 1777 objects/optionstr.o \
1775 objects/os_unix.o \ 1778 objects/os_unix.o \
1779 objects/profiler.o \ 1782 objects/profiler.o \
1780 objects/pty.o \ 1783 objects/pty.o \
1781 objects/quickfix.o \ 1784 objects/quickfix.o \
1782 objects/regexp.o \ 1785 objects/regexp.o \
1783 objects/register.o \ 1786 objects/register.o \
1787 objects/screen.o \
1784 objects/scriptfile.o \ 1788 objects/scriptfile.o \
1785 objects/screen.o \
1786 objects/search.o \ 1789 objects/search.o \
1787 objects/session.o \ 1790 objects/session.o \
1788 objects/sha256.o \ 1791 objects/sha256.o \
1789 objects/sign.o \ 1792 objects/sign.o \
1790 objects/sound.o \ 1793 objects/sound.o \
1800 objects/ui.o \ 1803 objects/ui.o \
1801 objects/undo.o \ 1804 objects/undo.o \
1802 objects/usercmd.o \ 1805 objects/usercmd.o \
1803 objects/userfunc.o \ 1806 objects/userfunc.o \
1804 objects/version.o \ 1807 objects/version.o \
1808 objects/vim9compile.o \
1809 objects/vim9execute.o \
1810 objects/vim9script.o \
1805 objects/viminfo.o \ 1811 objects/viminfo.o \
1806 objects/window.o \ 1812 objects/window.o \
1807 objects/bufwrite.o \ 1813 objects/bufwrite.o \
1808 $(GUI_OBJ) \ 1814 $(GUI_OBJ) \
1809 $(TERM_OBJ) \ 1815 $(TERM_OBJ) \
1871 1877
1872 PRO_AUTO = \ 1878 PRO_AUTO = \
1873 arabic.pro \ 1879 arabic.pro \
1874 arglist.pro \ 1880 arglist.pro \
1875 autocmd.pro \ 1881 autocmd.pro \
1882 beval.pro \
1876 blowfish.pro \ 1883 blowfish.pro \
1877 buffer.pro \ 1884 buffer.pro \
1885 bufwrite.pro \
1878 change.pro \ 1886 change.pro \
1887 channel.pro \
1879 charset.pro \ 1888 charset.pro \
1880 cindent.pro \ 1889 cindent.pro \
1881 cmdexpand.pro \ 1890 cmdexpand.pro \
1882 cmdhist.pro \ 1891 cmdhist.pro \
1883 crypt.pro \ 1892 crypt.pro \
1902 fileio.pro \ 1911 fileio.pro \
1903 filepath.pro \ 1912 filepath.pro \
1904 findfile.pro \ 1913 findfile.pro \
1905 fold.pro \ 1914 fold.pro \
1906 getchar.pro \ 1915 getchar.pro \
1916 gui_beval.pro \
1907 hardcopy.pro \ 1917 hardcopy.pro \
1908 hashtab.pro \ 1918 hashtab.pro \
1909 highlight.pro \ 1919 highlight.pro \
1910 if_cscope.pro \ 1920 if_cscope.pro \
1911 if_lua.pro \ 1921 if_lua.pro \
1928 message.pro \ 1938 message.pro \
1929 misc1.pro \ 1939 misc1.pro \
1930 misc2.pro \ 1940 misc2.pro \
1931 mouse.pro \ 1941 mouse.pro \
1932 move.pro \ 1942 move.pro \
1943 netbeans.pro \
1933 normal.pro \ 1944 normal.pro \
1934 ops.pro \ 1945 ops.pro \
1935 option.pro \ 1946 option.pro \
1936 optionstr.pro \ 1947 optionstr.pro \
1937 os_mac_conv.pro \ 1948 os_mac_conv.pro \
1941 profiler.pro \ 1952 profiler.pro \
1942 pty.pro \ 1953 pty.pro \
1943 quickfix.pro \ 1954 quickfix.pro \
1944 regexp.pro \ 1955 regexp.pro \
1945 register.pro \ 1956 register.pro \
1957 screen.pro \
1946 scriptfile.pro \ 1958 scriptfile.pro \
1947 screen.pro \
1948 search.pro \ 1959 search.pro \
1949 session.pro \ 1960 session.pro \
1950 sha256.pro \ 1961 sha256.pro \
1951 sign.pro \ 1962 sign.pro \
1952 sound.pro \ 1963 sound.pro \
1963 ui.pro \ 1974 ui.pro \
1964 undo.pro \ 1975 undo.pro \
1965 usercmd.pro \ 1976 usercmd.pro \
1966 userfunc.pro \ 1977 userfunc.pro \
1967 version.pro \ 1978 version.pro \
1979 vim9compile.pro \
1980 vim9execute.pro \
1981 vim9script.pro \
1968 viminfo.pro \ 1982 viminfo.pro \
1969 window.pro \ 1983 window.pro \
1970 bufwrite.pro \
1971 beval.pro \
1972 gui_beval.pro \
1973 netbeans.pro \
1974 channel.pro \
1975 $(ALL_GUI_PRO) \ 1984 $(ALL_GUI_PRO) \
1976 $(TCL_PRO) 1985 $(TCL_PRO)
1977 1986
1978 # Resources used for the Mac are in one directory. 1987 # Resources used for the Mac are in one directory.
1979 RSRC_DIR = os_mac_rsrc 1988 RSRC_DIR = os_mac_rsrc
3077 $(CCC) -o $@ blowfish.c 3086 $(CCC) -o $@ blowfish.c
3078 3087
3079 objects/buffer.o: buffer.c 3088 objects/buffer.o: buffer.c
3080 $(CCC) -o $@ buffer.c 3089 $(CCC) -o $@ buffer.c
3081 3090
3091 objects/bufwrite.o: bufwrite.c
3092 $(CCC) -o $@ bufwrite.c
3093
3082 objects/change.o: change.c 3094 objects/change.o: change.c
3083 $(CCC) -o $@ change.c 3095 $(CCC) -o $@ change.c
3084 3096
3085 objects/charset.o: charset.c 3097 objects/charset.o: charset.c
3086 $(CCC) -o $@ charset.c 3098 $(CCC) -o $@ charset.c
3431 $(CCC) -o $@ usercmd.c 3443 $(CCC) -o $@ usercmd.c
3432 3444
3433 objects/userfunc.o: userfunc.c 3445 objects/userfunc.o: userfunc.c
3434 $(CCC) -o $@ userfunc.c 3446 $(CCC) -o $@ userfunc.c
3435 3447
3448 objects/vim9compile.o: vim9compile.c
3449 $(CCC) -o $@ vim9compile.c
3450
3451 objects/vim9execute.o: vim9execute.c
3452 $(CCC) -o $@ vim9execute.c
3453
3454 objects/vim9script.o: vim9script.c
3455 $(CCC) -o $@ vim9script.c
3456
3436 objects/viminfo.o: viminfo.c 3457 objects/viminfo.o: viminfo.c
3437 $(CCC) -o $@ viminfo.c 3458 $(CCC) -o $@ viminfo.c
3438 3459
3439 objects/window.o: window.c 3460 objects/window.o: window.c
3440 $(CCC) -o $@ window.c 3461 $(CCC) -o $@ window.c
3441
3442 objects/bufwrite.o: bufwrite.c
3443 $(CCC) -o $@ bufwrite.c
3444 3462
3445 objects/netbeans.o: netbeans.c 3463 objects/netbeans.o: netbeans.c
3446 $(CCC) -o $@ netbeans.c 3464 $(CCC) -o $@ netbeans.c
3447 3465
3448 objects/channel.o: channel.c 3466 objects/channel.o: channel.c
3785 proto.h globals.h 3803 proto.h globals.h
3786 objects/mark.o: mark.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3804 objects/mark.o: mark.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3787 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3805 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3788 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3806 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3789 proto.h globals.h 3807 proto.h globals.h
3808 objects/mbyte.o: mbyte.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3809 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3810 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3811 proto.h globals.h
3790 objects/memfile.o: memfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3812 objects/memfile.o: memfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3791 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3813 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3792 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3814 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3793 proto.h globals.h 3815 proto.h globals.h
3794 objects/memline.o: memline.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3816 objects/memline.o: memline.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3814 objects/mouse.o: mouse.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3836 objects/mouse.o: mouse.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3815 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3837 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3816 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3838 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3817 proto.h globals.h 3839 proto.h globals.h
3818 objects/move.o: move.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3840 objects/move.o: move.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3819 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3820 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3821 proto.h globals.h
3822 objects/mbyte.o: mbyte.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3823 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3841 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3824 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3842 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3825 proto.h globals.h 3843 proto.h globals.h
3826 objects/normal.o: normal.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3844 objects/normal.o: normal.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3827 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3845 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3873 proto.h globals.h regexp_bt.c regexp_nfa.c 3891 proto.h globals.h regexp_bt.c regexp_nfa.c
3874 objects/register.o: register.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3892 objects/register.o: register.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3875 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3893 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3876 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3894 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3877 proto.h globals.h 3895 proto.h globals.h
3896 objects/screen.o: screen.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3897 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3898 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3899 proto.h globals.h
3878 objects/scriptfile.o: scriptfile.c vim.h protodef.h auto/config.h feature.h \ 3900 objects/scriptfile.o: scriptfile.c vim.h protodef.h auto/config.h feature.h \
3879 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3901 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3880 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3881 proto.h globals.h
3882 objects/screen.o: screen.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3883 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3884 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3902 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3885 proto.h globals.h 3903 proto.h globals.h
3886 objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3904 objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3887 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3905 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3888 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3906 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3959 proto.h globals.h 3977 proto.h globals.h
3960 objects/version.o: version.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3978 objects/version.o: version.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3961 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3979 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3962 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3980 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3963 proto.h globals.h version.h 3981 proto.h globals.h version.h
3982 objects/vim9compile.o: vim9compile.c vim.h protodef.h auto/config.h feature.h \
3983 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3984 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3985 proto.h globals.h vim9.h
3986 objects/vim9execute.o: vim9execute.c vim.h protodef.h auto/config.h feature.h \
3987 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3988 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3989 proto.h globals.h vim9.h
3990 objects/vim9script.o: vim9script.c vim.h protodef.h auto/config.h feature.h \
3991 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3992 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3993 proto.h globals.h vim9.h
3964 objects/viminfo.o: viminfo.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3994 objects/viminfo.o: viminfo.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3965 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 3995 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
3966 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 3996 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
3967 proto.h globals.h version.h 3997 proto.h globals.h version.h
3968 objects/window.o: window.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 3998 objects/window.o: window.c vim.h protodef.h auto/config.h feature.h os_unix.h \