To: vim_dev@googlegroups.com
Subject: Patch 8.2.0667
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0667
Problem:    Cannot install Haiku version from source.
Solution:   Update Makefile and rdef file. (Emir Sari, closes #6013)
Files:      Filelist, READMEdir/README_haiku.txt, runtime/doc/os_haiku.txt,
            src/Makefile, src/os_haiku.rdef.in, src/os_haiku.rdef


*** ../vim-8.2.0666/Filelist	2020-04-29 21:03:51.115170232 +0200
--- Filelist	2020-04-30 19:48:46.898670068 +0200
***************
*** 610,616 ****
  SRC_HAIKU =	\
  		README_haiku.txt \
  		src/os_haiku.h \
! 		src/os_haiku.rdef \
  		src/gui_haiku.cc \
  		src/gui_haiku.h \
  		src/proto/gui_haiku.pro \
--- 610,616 ----
  SRC_HAIKU =	\
  		README_haiku.txt \
  		src/os_haiku.h \
! 		src/os_haiku.rdef.in \
  		src/gui_haiku.cc \
  		src/gui_haiku.h \
  		src/proto/gui_haiku.pro \
*** ../vim-8.2.0666/READMEdir/README_haiku.txt	2020-04-23 15:41:21.867364624 +0200
--- READMEdir/README_haiku.txt	2020-04-30 19:48:46.898670068 +0200
***************
*** 10,13 ****
  - Open a Terminal and type "pkgman install vim", then follow instructions.
  
  If you prefer to install Vim from source, follow the instructions on
! "runtime/doc/os_haiku.txt", "Compiling Haiku" section.
--- 10,13 ----
  - Open a Terminal and type "pkgman install vim", then follow instructions.
  
  If you prefer to install Vim from source, follow the instructions on
! "runtime/doc/os_haiku.txt", "Compiling Vim" section.
*** ../vim-8.2.0666/runtime/doc/os_haiku.txt	2020-04-23 15:41:21.867364624 +0200
--- runtime/doc/os_haiku.txt	2020-04-30 19:50:08.634340923 +0200
***************
*** 1,4 ****
! *os_haiku.txt*	For Vim version 8.2.  Last change: 2020 Mar 19
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *os_haiku.txt*	For Vim version 8.2.  Last change: 2020 Apr 30
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 46,56 ****
  
  Haiku uses "ncurses6" as its terminal library, therefore you need to have
  "ncurses6_devel" package installed from HaikuDepot in order to configure
! the Haiku build.
  
  Now you should use "make" to compile Vim, then "make install" to install it.
  For seamless integration into Haiku, the GUI-less vim binary should be
! additionally installed over the GUI version. Typical build commands are: >
  
    ./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY` \
      --datarootdir=`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY` \
--- 46,56 ----
  
  Haiku uses "ncurses6" as its terminal library, therefore you need to have
  "ncurses6_devel" package installed from HaikuDepot in order to configure
! the Haiku build.  Just append "--with-tlib=ncurses6" to ./configure command
  
  Now you should use "make" to compile Vim, then "make install" to install it.
  For seamless integration into Haiku, the GUI-less vim binary should be
! additionally installed over the GUI version.  Typical build commands are:
  
    ./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY` \
      --datarootdir=`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY` \
***************
*** 70,94 ****
  
  Normally Vim starts with the GUI if you start it as gvim or vim -g.  The vim
  version with GUI tries to determine if it was started from the Tracker instead
! of the Terminal, and if so, uses the GUI anyway. However, the current detection
  scheme is fooled if you use the command "vim - </dev/null".
  
  Stuff that does not work yet:
  
! - Mouse up events are not generated when outside the window. This may be a bug in
!   Haiku. You can notice this when selecting text and moving the cursor outside
!   the window, then letting go of the mouse button.  Another way is when you
!   drag the scrollbar and do the same thing.  Because Vim still thinks you are
!   still playing with the scrollbar it won't change it itself. I provided a
!   workaround which kicks in when the window is activated or deactivated (so it
!   works best with focus- follows-mouse turned on).
  - The cursor does not flash.
  
  
  4. The $VIM directory					*haiku-vimdir*
  
  $VIM is the symbolic name for the place where Vim's support files are stored.
! The default value for $VIM is set at compile time and can be determined with >
  
    :version
  
--- 70,97 ----
  
  Normally Vim starts with the GUI if you start it as gvim or vim -g.  The vim
  version with GUI tries to determine if it was started from the Tracker instead
! of the Terminal, and if so, uses the GUI anyway.  However, the current detection
  scheme is fooled if you use the command "vim - </dev/null".
  
  Stuff that does not work yet:
  
! - Mouse up events are not generated when outside the window.  You can notice
!   this when selecting text and moving the cursor outside the window, then
!   letting go of the mouse button.  Another way is when you drag the scrollbar
!   and do the same thing.  Because Vim still thinks you are still playing with
!   the scrollbar it won't change it itself.  There is a workaround which kicks
!   in when the window is activated or deactivated (so it works best with focus-
!   follows-mouse turned on).
  - The cursor does not flash.
+ - Built-in terminal is not available in GUI, and does not work reliably on
+   console version as well; e.g. it is not possible to exit using the 'exit'
+   command.  If you need to use it, enable at your own risk.
  
  
  4. The $VIM directory					*haiku-vimdir*
  
  $VIM is the symbolic name for the place where Vim's support files are stored.
! The default value for $VIM is set at compile time and can be determined with:
  
    :version
  
***************
*** 116,122 ****
  You can drop files and directories on either the Vim icon (starts a new Vim
  session, unless you use the File Types application to set Vim to be "Single
  Launch") or on the Vim window (starts editing the files).  Dropping a folder
! sets Vim's current working directory. |:cd| |:pwd| If you drop files or
  folders with either SHIFT key pressed, Vim changes directory to the folder
  that contains the first item dropped.  When starting Vim, there is no need to
  press shift: Vim behaves as if you do.
--- 119,125 ----
  You can drop files and directories on either the Vim icon (starts a new Vim
  session, unless you use the File Types application to set Vim to be "Single
  Launch") or on the Vim window (starts editing the files).  Dropping a folder
! sets Vim's current working directory |:cd| |:pwd|.  If you drop files or
  folders with either SHIFT key pressed, Vim changes directory to the folder
  that contains the first item dropped.  When starting Vim, there is no need to
  press shift: Vim behaves as if you do.
***************
*** 163,169 ****
  
  If the font you specify is unavailable, you get the system fixed font.
  
! GUI Font Selection Dialog is available at giving the >
  
    :set guifont=*
  
--- 166,172 ----
  
  If the font you specify is unavailable, you get the system fixed font.
  
! GUI Font Selection Dialog is available at giving the:
  
    :set guifont=*
  
*** ../vim-8.2.0666/src/Makefile	2020-04-29 23:11:29.086909215 +0200
--- src/Makefile	2020-04-30 19:53:16.085605791 +0200
***************
*** 2885,2891 ****
  clean celan: testclean
  	-rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
  	-rm -rf objects
! 	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h
  	-rm -f conftest* *~ auto/link.sed
  	-rm -f testdir/opt_test.vim
  	-rm -f $(UNITTEST_TARGETS)
--- 2885,2891 ----
  clean celan: testclean
  	-rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
  	-rm -rf objects
! 	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h auto/os_haiku.rdef
  	-rm -f conftest* *~ auto/link.sed
  	-rm -f testdir/opt_test.vim
  	-rm -f $(UNITTEST_TARGETS)
***************
*** 3042,3047 ****
--- 3042,3055 ----
  auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
  	CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
  
+ auto/os_haiku.rdef: os_haiku.rdef.in
+ 	@echo creating $@
+ 	@echo '/* This file is automatically created by Makefile */' >> $@
+ 	@echo '/* DO NOT EDIT!  Change Makefile only. */' >> $@
+ 	@cat $(srcdir)/os_haiku.rdef.in >> auto/os_haiku.rdef
+ 	sed -i "s|@MAJOR@|$(VIMMAJOR)|" auto/os_haiku.rdef
+ 	sed -i "s|@MINOR@|$(VIMMINOR)|" auto/os_haiku.rdef
+ 
  auto/pathdef.c: Makefile auto/config.mk
  	-@echo creating $@
  	-@echo '/* pathdef.c */' > $@
***************
*** 3384,3390 ****
  objects/os_qnx.o: os_qnx.c
  	$(CCC) -o $@ os_qnx.c
  
! objects/os_haiku.rsrc: os_haiku.rdef
  	cat $< | $(CCC) -E - | grep -v '^#' | rc -o "$@" -
  
  objects/os_macosx.o: os_macosx.m
--- 3392,3398 ----
  objects/os_qnx.o: os_qnx.c
  	$(CCC) -o $@ os_qnx.c
  
! objects/os_haiku.rsrc: auto/os_haiku.rdef
  	cat $< | $(CCC) -E - | grep -v '^#' | rc -o "$@" -
  
  objects/os_macosx.o: os_macosx.m
*** ../vim-8.2.0666/src/os_haiku.rdef.in	2020-04-30 19:52:25.381802278 +0200
--- src/os_haiku.rdef.in	2020-04-30 19:48:46.910670021 +0200
***************
*** 0 ****
--- 1,142 ----
+ /*
+  * os_haiku.rdef.in: Assets and resources file for Haiku
+  */
+ 
+ resource app_signature "application/x-vnd.Haiku-Vim-8";
+ 
+ resource app_version {
+ 	major  = @MAJOR@,
+ 	minor  = @MINOR@,
+ 
+ 	variety = B_APPV_FINAL,
+ 	internal = 0,
+ 
+ 	short_info = "VIM Editor",
+ 	long_info = "VI Improved Editor by Bram Moolenaar et al."
+ };
+ 
+ resource app_flags B_MULTIPLE_LAUNCH;
+ 
+ resource file_types message {
+ 	"types" = "text",
+ 	"types" = "text/plain",
+ 	"types" = "text/x-source-code",
+ 	"types" = "text/x-patch",
+ 	"types" = "text/html",
+ 	"types" = "text/xml",
+ 	"types" = "text/x-makefile",
+ 	"types" = "text/x-jamfile"
+ };
+ 
+ resource vector_icon {
+ 	$"6E636966050501020006023B8CFD3CB8E4BF59B63E2F604BACDB47A13E00FFFF"
+ 	$"FFFF909DA702000603BAF8BA3CE3F6BF8EB9BDA8484BC75C4AEA1200C1C7CC79"
+ 	$"D9E0E5FFC1C7CC020006020000003DC000C000000000004C000049FFFF00B3FF"
+ 	$"B3FF026C52020006023BD04F3BD04FBED4133ED4134B6000462FB00053AB53FF"
+ 	$"007F00060618FFFCFFFF63FF282528252725262726262627262B262B262C282D"
+ 	$"272D282D2B2B582B582B592D5A2C5A2D5A2F5A2F5A305ABA2659315ABA26595E"
+ 	$"2D5E2D5F2C5F2A5F2B5F2A5F275F275F265D255E255D254A254A254925482748"
+ 	$"264827482B482B482C4A2D492D4A2D4C3A3F2D3C2D3C2D3D2D3E2B3E2C3E2B3E"
+ 	$"273E273E263C253D253C250618FFFCFFFF63FF28252825272526272626262726"
+ 	$"2B262B262C282D272D282D2B2B582B582B592D5A2C5A2D5A2F5A2F5A305ABA26"
+ 	$"59315ABA26595E2D5E2D5F2C5F2A5F2B5F2A5F275F275F265D255E255D254A25"
+ 	$"4A254925482748264827482B482B482C4A2D492D4A2D4C3A3F2D3C2D3C2D3D2D"
+ 	$"3E2B3E2C3E2B3E273E273E263C253D253C250A08BEA359BE3D593C5A415AC03B"
+ 	$"59BFD559434C404C06218A88888888C83E3F02484CC1D359C16D445A49C36B59"
+ 	$"C305C3CA50C5C8C50359C49D4C5A51C69B59C635C6FA50C8F8C83359C7CD545A"
+ 	$"59C9CB59C965CA6B4DCA6B4DCA804C5A4C584C584C574CC86D4DC8D34DC86D4D"
+ 	$"C73B524C534C524C504C504C4F4CC53D4DC5A34DC53D4DC40B4B4C0608EBECC0"
+ 	$"B64AC0B64AC11C4AC13349C14848C0F847C15E47C0F847C092C01648C02C47C0"
+ 	$"1648C00149C0504ABFEA4AC0504A0A04405E5E40402222400A0A000105180015"
+ 	$"01178600040A0001051815FF01178400040A030105000A0401051001157C0004"
+ 	$"0A000100381D1F001501178600040A000100381D1F15FF01178300040A010101"
+ 	$"201D1F0A020101301D1F01157E00040A0003020304381D1F15FF01178400040A"
+ 	$"0203020304281D1F15FF"
+ };
+ 
+ resource(1, "builtin-tools") #'PNG ' array {
+ 	$"89504E470D0A1A0A0000000D494844520000022E0000001208030000004BB3A5"
+ 	$"1200000300504C5445000000800000008000808000000080800080008080C0C0"
+ 	$"C0C0DCC0A6CAF0402000602000802000A02000C02000E0200000400020400040"
+ 	$"4000604000804000A04000C04000E04000006000206000406000606000806000"
+ 	$"A06000C06000E06000008000208000408000608000808000A08000C08000E080"
+ 	$"0000A00020A00040A00060A00080A000A0A000C0A000E0A00000C00020C00040"
+ 	$"C00060C00080C000A0C000C0C000E0C00000E00020E00040E00060E00080E000"
+ 	$"A0E000C0E000E0E000000040200040400040600040800040A00040C00040E000"
+ 	$"40002040202040402040602040802040A02040C02040E0204000404020404040"
+ 	$"4040604040804040A04040C04040E04040006040206040406040606040806040"
+ 	$"A06040C06040E06040008040208040408040608040808040A08040C08040E080"
+ 	$"4000A04020A04040A04060A04080A040A0A040C0A040E0A04000C04020C04040"
+ 	$"C04060C04080C040A0C040C0C040E0C04000E04020E04040E04060E04080E040"
+ 	$"A0E040C0E040E0E040000080200080400080600080800080A00080C00080E000"
+ 	$"80002080202080402080602080802080A02080C02080E0208000408020408040"
+ 	$"4080604080804080A04080C04080E04080006080206080406080606080806080"
+ 	$"A06080C06080E06080008080208080408080608080808080A08080C08080E080"
+ 	$"8000A08020A08040A08060A08080A080A0A080C0A080E0A08000C08020C08040"
+ 	$"C08060C08080C080A0C080C0C080E0C08000E08020E08040E08060E08080E080"
+ 	$"A0E080C0E080E0E0800000C02000C04000C06000C08000C0A000C0C000C0E000"
+ 	$"C00020C02020C04020C06020C08020C0A020C0C020C0E020C00040C02040C040"
+ 	$"40C06040C08040C0A040C0C040C0E040C00060C02060C04060C06060C08060C0"
+ 	$"A060C0C060C0E060C00080C02080C04080C06080C08080C0A080C0C080C0E080"
+ 	$"C000A0C020A0C040A0C060A0C080A0C0A0A0C0C0A0C0E0A0C000C0C020C0C040"
+ 	$"C0C060C0C080C0C0A0C0C0FFFBF0A0A0A4808080FF000000FF00FFFF000000FF"
+ 	$"FF00FF00FFFFFFFFFF58D234440000000874524E53FFFFFFFFFFFFFF00DE83BD"
+ 	$"59000000097048597300000B1200000B1201D2DD7EFC0000070D494441546881"
+ 	$"DD994B6E23390C86695880F6BDCD19BCCD3AD7CA7DB4CD197C965EE7044619D0"
+ 	$"F0299192AA5C9907D018762776D12A3DA8AF7E520E64B382FFB792FF004BCD4E"
+ 	$"DF02C1DC0717347779C3FFDB8D5F43A3705900FE8838FCDB868119C3F3E32EDA"
+ 	$"BB5A1897CA916A1B566CA49DED7865B2E3E930FC6397A9AAEDE232F10409EA37"
+ 	$"5B851A70793C020BB70C1B8CB4C436057EFFF6BCACE0BD0CAF75159D21567B6D"
+ 	$"B2BB9EC73AF7E89C21013E3EF03F1A4CD339BDA77E390523594BE549EA7E55DD"
+ 	$"E8793B68FEF332D4D3BD72BFE1B2D68D19171A87861F37ADB4163A3FEB87E6A7"
+ 	$"06411B06146E37D8B60D6E9E176C121A212D81976930BAE5C231A657895D5B80"
+ 	$"8735AE6BD5068729057FCC318FB5183DC682BB8924AC4D5AB456557F9771D647"
+ 	$"066E0B378A6491FD65381017DDB2793BD2674A9F64E14950CF67DFD8941D3D5D"
+ 	$"37DA62B1BB1B9ADFE4452BA3B3C41649D58BE6B77E58065C36B3EEC26C856D7A"
+ 	$"3E2A332ECFA73E3BBD53EE955F5BB8F939B3F85B749D2DDA003A0A5E546B392D"
+ 	$"6CE11962C1FD4412D6664C01702B990E4FA5C6591F18F4CDF1913475B1597975"
+ 	$"498A4BB3B632E7EA7B5F5C2E620A83C4C0ED2AFB7BBD4268157191693455129A"
+ 	$"BF6BD329C265918F461496EAF23219E5E7B3549977BF036FE1DFEDE9ACB2E7FB"
+ 	$"819736D9B76152F8C7B6B95E5AE06DA99327C682FBF9289E04B46B306D2519AB"
+ 	$"6480361D9A8ABDC0F291ABFE8271F916D9A849D505432FEA42D3E4965E5D1C2E"
+ 	$"B486CE463247C025E54159436982B898395C26759970A9BE9386CB948FC64473"
+ 	$"A676912AC06DFA53E5A51753C0A4D08F17730E6A734C81F7C94853BC3C8AF44B"
+ 	$"79A9974B5C18EE6573795C86041E49405ACAE68CC72168AEF9FAF686BF4D5DDC"
+ 	$"74CB98902AB8D7EA70112E0ACE076B1776DEFB7EA4BBE1B2509784893799BCA4"
+ 	$"76ED71416971BBCEEA623DF1B21197DB50D2840662853E2A2E19E95C2C6883BA"
+ 	$"A4B6DB63EDB23A19C536BCBF5E5ECAF329F2D22704C221DEE670113016C540DD"
+ 	$"C18576B7B0BA202CC2CB85B410F9B085F1D5E3228F00F45880CC221891A04EA1"
+ 	$"E55B7F181705081B15F12C71A9DC41FBC454489B414F4685D0D80A4E3F3E1789"
+ 	$"9FFA1D7521509ABCC89BF439E2E28B9BA82E0D97F844AD6A17E969D09F1E3448"
+ 	$"699EA2B0100FC9793C44E7E1B02DA50BA6A3E621655179E9B858FD32D1E11C75"
+ 	$"74B567B0CB0AC55B4EA37425106AFDEC1D35F2A1692DF24224E8BBB221840117"
+ 	$"038871F9DEC385122A83AF2E914B6B06E06B17C605E70F776760B8B45A32292E"
+ 	$"76D01E710907F0E1F4B4A72ECEE3594D417103762C223D688A4B5497391F9CF0"
+ 	$"80E1622393B290C0607CF2A1BA4CB84CAE6E8A4B257929242EF4CEE078F48599"
+ 	$"E712F900417117976DC3021AA9907F084703E885BA48426D5955E432F78B880B"
+ 	$"DD8AFEFB7BB32B182EDD64844299A74CB8D0C1903ED13594A1D47DA12E34B8B7"
+ 	$"D223E28F0249C5A5056DA52EAEA7AF2FEEE88C87BEA42364DCC83D40D97059D5"
+ 	$"2E7BC9A8F62D51EBC9A8B2C0DB01C9E8E80BEB7213F880F032E18240081C1D17"
+ 	$"03E8585D72FE91BA6805E6707987515D4CE9932F598637EECCC7B8F8134D5DA9"
+ 	$"8BC7E5F1F86A56DCF13AE022EAD282C6B844010CDC15DAFD331EE5C51FA5537D"
+ 	$"3C727E704A7A3ED9B53A198DA56E0FEB949F7AA92B0072F552A463CA8C7D6156"
+ 	$"BB0C7CF00E1EE0029BA41E4D47C8E9E6D5E5089755ED62CDD6B80CF21270F9F5"
+ 	$"ABE3C2E7202970F3E8695B2CEAD28AD81D7571C9E8FEF5B5C4C59BA94B0B9AE0"
+ 	$"1204D075F478281CAF3DB9A5A3968D522DC8CB0379C1B4C4BCACBF77C9FE201D"
+ 	$"4F46D666719016846C9D720CF234C8C968E443867BDBC1C578E927A306D0212E"
+ 	$"35984D09DCC54B5CDEF770E95FB3B883B439CCD3BE7751DD61D3A3D89EBAECE0"
+ 	$"32ABCB58EA46010C1D8D70EC7A7AADDB78C1D9154E095E5D2EFAAA87AAF990CC"
+ 	$"59B9D95E1BE0546747EA6CDFBB381AD2E4E158D02ADFDE022F0E17C9A81E5703"
+ 	$"E8B07681F12EF9C85D2C71C130BAEF78F670B1435083A37DABDB1D599391952F"
+ 	$"14BA78F0E1DD7500ADE73CE1A20F00DE2B995652909F22DC7B2784C2394FE6BF"
+ 	$"01683A0237985717AC5D742297A02E1185D196B8F0BBFE374DB730A561F6F458"
+ 	$"445E3C2E8155C65501A24612D60997D55DAE3399EF1A9769C7965B2867A0E2E2"
+ 	$"A31E7759F41835B4E9C7A71120F0EA02E51017BA45FF3253665C5C19AB70BCF6"
+ 	$"642D5B2423411F8C6B97868B8D9E5BED326AB84637E032B5E94A648AED17C634"
+ 	$"CC1E178B7D5C661302A891ECBE4E07E6591FD81A9781B3A5A339E749F94BFF32"
+ 	$"75AED701A01D71099DF832450BF94900492EBA3109273CD9FE02C03909FA6024"
+ 	$"912D194D339C0EC9D6CCAD7AD166F2C485312E93671150B617B88C8D86DC731A"
+ 	$"1767E7EEF90FEC3599BB77B416E3EAE7689CF114DBE3E262B898CB34FECE845E"
+ 	$"4CFAEF79764372DC201F65AC97B792C14FE6F387DBB4F83918273C6E9B866FD9"
+ 	$"FF17F6CF36F92F1B9E631E8B8F3FBC0000000049454E44AE426082"
+ };
*** ../vim-8.2.0666/src/os_haiku.rdef	2020-02-26 16:15:31.072386953 +0100
--- src/os_haiku.rdef	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,143 ****
- /*
-  * os_haiku.rdef
-  */
- 
- resource app_signature "application/x-vnd.Haiku-Vim-8";
- 
- resource app_version {
- 	major  = @MAJOR@,
- 	middle = @MIDDLE@,
- 	minor  = @MINOR@,
- 
- 	variety = B_APPV_FINAL,
- 	internal = 0,
- 
- 	short_info = "VIM Editor",
- 	long_info = "VI Improved Editor by Bram Moolenaar et al."
- };
- 
- resource app_flags B_MULTIPLE_LAUNCH;
- 
- resource file_types message {
- 	"types" = "text",
- 	"types" = "text/plain",
- 	"types" = "text/x-source-code",
- 	"types" = "text/x-patch",
- 	"types" = "text/html",
- 	"types" = "text/xml",
- 	"types" = "text/x-makefile",
- 	"types" = "text/x-jamfile"
- };
- 
- resource vector_icon {
- 	$"6E636966050501020006023B8CFD3CB8E4BF59B63E2F604BACDB47A13E00FFFF"
- 	$"FFFF909DA702000603BAF8BA3CE3F6BF8EB9BDA8484BC75C4AEA1200C1C7CC79"
- 	$"D9E0E5FFC1C7CC020006020000003DC000C000000000004C000049FFFF00B3FF"
- 	$"B3FF026C52020006023BD04F3BD04FBED4133ED4134B6000462FB00053AB53FF"
- 	$"007F00060618FFFCFFFF63FF282528252725262726262627262B262B262C282D"
- 	$"272D282D2B2B582B582B592D5A2C5A2D5A2F5A2F5A305ABA2659315ABA26595E"
- 	$"2D5E2D5F2C5F2A5F2B5F2A5F275F275F265D255E255D254A254A254925482748"
- 	$"264827482B482B482C4A2D492D4A2D4C3A3F2D3C2D3C2D3D2D3E2B3E2C3E2B3E"
- 	$"273E273E263C253D253C250618FFFCFFFF63FF28252825272526272626262726"
- 	$"2B262B262C282D272D282D2B2B582B582B592D5A2C5A2D5A2F5A2F5A305ABA26"
- 	$"59315ABA26595E2D5E2D5F2C5F2A5F2B5F2A5F275F275F265D255E255D254A25"
- 	$"4A254925482748264827482B482B482C4A2D492D4A2D4C3A3F2D3C2D3C2D3D2D"
- 	$"3E2B3E2C3E2B3E273E273E263C253D253C250A08BEA359BE3D593C5A415AC03B"
- 	$"59BFD559434C404C06218A88888888C83E3F02484CC1D359C16D445A49C36B59"
- 	$"C305C3CA50C5C8C50359C49D4C5A51C69B59C635C6FA50C8F8C83359C7CD545A"
- 	$"59C9CB59C965CA6B4DCA6B4DCA804C5A4C584C584C574CC86D4DC8D34DC86D4D"
- 	$"C73B524C534C524C504C504C4F4CC53D4DC5A34DC53D4DC40B4B4C0608EBECC0"
- 	$"B64AC0B64AC11C4AC13349C14848C0F847C15E47C0F847C092C01648C02C47C0"
- 	$"1648C00149C0504ABFEA4AC0504A0A04405E5E40402222400A0A000105180015"
- 	$"01178600040A0001051815FF01178400040A030105000A0401051001157C0004"
- 	$"0A000100381D1F001501178600040A000100381D1F15FF01178300040A010101"
- 	$"201D1F0A020101301D1F01157E00040A0003020304381D1F15FF01178400040A"
- 	$"0203020304281D1F15FF"
- };
- 
- resource(1, "builtin-tools") #'PNG ' array {
- 	$"89504E470D0A1A0A0000000D494844520000022E0000001208030000004BB3A5"
- 	$"1200000300504C5445000000800000008000808000000080800080008080C0C0"
- 	$"C0C0DCC0A6CAF0402000602000802000A02000C02000E0200000400020400040"
- 	$"4000604000804000A04000C04000E04000006000206000406000606000806000"
- 	$"A06000C06000E06000008000208000408000608000808000A08000C08000E080"
- 	$"0000A00020A00040A00060A00080A000A0A000C0A000E0A00000C00020C00040"
- 	$"C00060C00080C000A0C000C0C000E0C00000E00020E00040E00060E00080E000"
- 	$"A0E000C0E000E0E000000040200040400040600040800040A00040C00040E000"
- 	$"40002040202040402040602040802040A02040C02040E0204000404020404040"
- 	$"4040604040804040A04040C04040E04040006040206040406040606040806040"
- 	$"A06040C06040E06040008040208040408040608040808040A08040C08040E080"
- 	$"4000A04020A04040A04060A04080A040A0A040C0A040E0A04000C04020C04040"
- 	$"C04060C04080C040A0C040C0C040E0C04000E04020E04040E04060E04080E040"
- 	$"A0E040C0E040E0E040000080200080400080600080800080A00080C00080E000"
- 	$"80002080202080402080602080802080A02080C02080E0208000408020408040"
- 	$"4080604080804080A04080C04080E04080006080206080406080606080806080"
- 	$"A06080C06080E06080008080208080408080608080808080A08080C08080E080"
- 	$"8000A08020A08040A08060A08080A080A0A080C0A080E0A08000C08020C08040"
- 	$"C08060C08080C080A0C080C0C080E0C08000E08020E08040E08060E08080E080"
- 	$"A0E080C0E080E0E0800000C02000C04000C06000C08000C0A000C0C000C0E000"
- 	$"C00020C02020C04020C06020C08020C0A020C0C020C0E020C00040C02040C040"
- 	$"40C06040C08040C0A040C0C040C0E040C00060C02060C04060C06060C08060C0"
- 	$"A060C0C060C0E060C00080C02080C04080C06080C08080C0A080C0C080C0E080"
- 	$"C000A0C020A0C040A0C060A0C080A0C0A0A0C0C0A0C0E0A0C000C0C020C0C040"
- 	$"C0C060C0C080C0C0A0C0C0FFFBF0A0A0A4808080FF000000FF00FFFF000000FF"
- 	$"FF00FF00FFFFFFFFFF58D234440000000874524E53FFFFFFFFFFFFFF00DE83BD"
- 	$"59000000097048597300000B1200000B1201D2DD7EFC0000070D494441546881"
- 	$"DD994B6E23390C86695880F6BDCD19BCCD3AD7CA7DB4CD197C965EE7044619D0"
- 	$"F0299192AA5C9907D018762776D12A3DA8AF7E520E64B382FFB792FF004BCD4E"
- 	$"DF02C1DC0717347779C3FFDB8D5F43A3705900FE8838FCDB868119C3F3E32EDA"
- 	$"BB5A1897CA916A1B566CA49DED7865B2E3E930FC6397A9AAEDE232F10409EA37"
- 	$"5B851A70793C020BB70C1B8CB4C436057EFFF6BCACE0BD0CAF75159D21567B6D"
- 	$"B2BB9EC73AF7E89C21013E3EF03F1A4CD339BDA77E390523594BE549EA7E55DD"
- 	$"E8793B68FEF332D4D3BD72BFE1B2D68D19171A87861F37ADB4163A3FEB87E6A7"
- 	$"06411B06146E37D8B60D6E9E176C121A212D81976930BAE5C231A657895D5B80"
- 	$"8735AE6BD5068729057FCC318FB5183DC682BB8924AC4D5AB456557F9771D647"
- 	$"066E0B378A6491FD65381017DDB2793BD2674A9F64E14950CF67DFD8941D3D5D"
- 	$"37DA62B1BB1B9ADFE4452BA3B3C41649D58BE6B77E58065C36B3EEC26C856D7A"
- 	$"3E2A332ECFA73E3BBD53EE955F5BB8F939B3F85B749D2DDA003A0A5E546B392D"
- 	$"6CE11962C1FD4412D6664C01702B990E4FA5C6591F18F4CDF1913475B1597975"
- 	$"498A4BB3B632E7EA7B5F5C2E620A83C4C0ED2AFB7BBD4268157191693455129A"
- 	$"BF6BD329C265918F461496EAF23219E5E7B3549977BF036FE1DFEDE9ACB2E7FB"
- 	$"819736D9B76152F8C7B6B95E5AE06DA99327C682FBF9289E04B46B306D2519AB"
- 	$"6480361D9A8ABDC0F291ABFE8271F916D9A849D505432FEA42D3E4965E5D1C2E"
- 	$"B486CE463247C025E54159436982B898395C26759970A9BE9386CB948FC64473"
- 	$"A676912AC06DFA53E5A51753C0A4D08F17730E6A734C81F7C94853BC3C8AF44B"
- 	$"79A9974B5C18EE6573795C86041E49405ACAE68CC72168AEF9FAF686BF4D5DDC"
- 	$"74CB98902AB8D7EA70112E0ACE076B1776DEFB7EA4BBE1B2509784893799BCA4"
- 	$"76ED71416971BBCEEA623DF1B21197DB50D2840662853E2A2E19E95C2C6883BA"
- 	$"A4B6DB63EDB23A19C536BCBF5E5ECAF329F2D22704C221DEE670113016C540DD"
- 	$"C18576B7B0BA202CC2CB85B410F9B085F1D5E3228F00F45880CC221891A04EA1"
- 	$"E55B7F181705081B15F12C71A9DC41FBC454489B414F4685D0D80A4E3F3E1789"
- 	$"9FFA1D7521509ABCC89BF439E2E28B9BA82E0D97F844AD6A17E969D09F1E3448"
- 	$"699EA2B0100FC9793C44E7E1B02DA50BA6A3E621655179E9B858FD32D1E11C75"
- 	$"74B567B0CB0AC55B4EA37425106AFDEC1D35F2A1692DF24224E8BBB221840117"
- 	$"038871F9DEC385122A83AF2E914B6B06E06B17C605E70F776760B8B45A32292E"
- 	$"76D01E710907F0E1F4B4A72ECEE3594D417103762C223D688A4B5497391F9CF0"
- 	$"80E1622393B290C0607CF2A1BA4CB84CAE6E8A4B257929242EF4CEE078F48599"
- 	$"E712F900417117976DC3021AA9907F084703E885BA48426D5955E432F78B880B"
- 	$"DD8AFEFB7BB32B182EDD64844299A74CB8D0C1903ED13594A1D47DA12E34B8B7"
- 	$"D223E28F0249C5A5056DA52EAEA7AF2FEEE88C87BEA42364DCC83D40D97059D5"
- 	$"2E7BC9A8F62D51EBC9A8B2C0DB01C9E8E80BEB7213F880F032E18240081C1D17"
- 	$"03E8585D72FE91BA6805E6707987515D4CE9932F598637EECCC7B8F8134D5DA9"
- 	$"8BC7E5F1F86A56DCF13AE022EAD282C6B844010CDC15DAFD331EE5C51FA5537D"
- 	$"3C727E704A7A3ED9B53A198DA56E0FEB949F7AA92B0072F552A463CA8C7D6156"
- 	$"BB0C7CF00E1EE0029BA41E4D47C8E9E6D5E5089755ED62CDD6B80CF21270F9F5"
- 	$"ABE3C2E7202970F3E8695B2CEAD28AD81D7571C9E8FEF5B5C4C59BA94B0B9AE0"
- 	$"1204D075F478281CAF3DB9A5A3968D522DC8CB0379C1B4C4BCACBF77C9FE201D"
- 	$"4F46D666719016846C9D720CF234C8C968E443867BDBC1C578E927A306D0212E"
- 	$"35984D09DCC54B5CDEF770E95FB3B883B439CCD3BE7751DD61D3A3D89EBAECE0"
- 	$"32ABCB58EA46010C1D8D70EC7A7AADDB78C1D9154E095E5D2EFAAA87AAF990CC"
- 	$"59B9D95E1BE0546747EA6CDFBB381AD2E4E158D02ADFDE022F0E17C9A81E5703"
- 	$"E8B07681F12EF9C85D2C71C130BAEF78F670B1435083A37DABDB1D599391952F"
- 	$"14BA78F0E1DD7500ADE73CE1A20F00DE2B995652909F22DC7B2784C2394FE6BF"
- 	$"01683A0237985717AC5D742297A02E1185D196B8F0BBFE374DB730A561F6F458"
- 	$"445E3C2E8155C65501A24612D60997D55DAE3399EF1A9769C7965B2867A0E2E2"
- 	$"A31E7759F41835B4E9C7A71120F0EA02E51017BA45FF3253665C5C19AB70BCF6"
- 	$"642D5B2423411F8C6B97868B8D9E5BED326AB84637E032B5E94A648AED17C634"
- 	$"CC1E178B7D5C661302A891ECBE4E07E6591FD81A9781B3A5A339E749F94BFF32"
- 	$"75AED701A01D71099DF832450BF94900492EBA3109273CD9FE02C03909FA6024"
- 	$"912D194D339C0EC9D6CCAD7AD166F2C485312E93671150B617B88C8D86DC731A"
- 	$"1767E7EEF90FEC3599BB77B416E3EAE7689CF114DBE3E262B898CB34FECE845E"
- 	$"4CFAEF79764372DC201F65AC97B792C14FE6F387DBB4F83918273C6E9B866FD9"
- 	$"FF17F6CF36F92F1B9E631E8B8F3FBC0000000049454E44AE426082"
- };
--- 0 ----
*** ../vim-8.2.0666/src/version.c	2020-04-30 19:19:25.816908787 +0200
--- src/version.c	2020-04-30 19:52:07.937870246 +0200
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     667,
  /**/

-- 
The only backup you need is the one that you didn't have time for.
(Murphy)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///