To: vim_dev@googlegroups.com Subject: Patch 7.4.2122 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2122 (after 7.4.2118) Problem: Mac: don't get +clipboard in huge build. Solution: Move #define down below including featureh.h Files: src/vim.h *** ../vim-7.4.2121/src/vim.h 2016-07-29 21:01:06.933549301 +0200 --- src/vim.h 2016-07-30 14:07:14.706581775 +0200 *************** *** 98,109 **** # ifndef HAVE_CONFIG_H # define UNIX # endif - # if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) - # define FEAT_CLIPBOARD - # endif - # if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) - # define FEAT_MOUSE - # endif #endif #if defined(MACOS_X) || defined(MACOS_CLASSIC) # define MACOS --- 98,103 ---- *************** *** 180,186 **** #endif ! #include "feature.h" /* #defines for optionals and features */ /* +x11 is only enabled when it's both available and wanted. */ #if defined(HAVE_X11) && defined(WANT_X11) --- 174,193 ---- #endif ! /* ! * #defines for optionals and features ! * Also defines FEAT_TINY, FEAT_SMALL, etc. when FEAT_HUGE is defined. ! */ ! #include "feature.h" ! ! #if defined(MACOS_X_UNIX) ! # if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) ! # define FEAT_CLIPBOARD ! # endif ! # if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) ! # define FEAT_MOUSE ! # endif ! #endif /* +x11 is only enabled when it's both available and wanted. */ #if defined(HAVE_X11) && defined(WANT_X11) *** ../vim-7.4.2121/src/version.c 2016-07-29 22:50:31.855971823 +0200 --- src/version.c 2016-07-30 14:09:47.777190819 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2122, /**/ -- So when I saw the post to comp.editors, I rushed over to the FTP site to grab it. So I yank apart the tarball, light x candles, where x= the vim version multiplied by the md5sum of the source divided by the MAC of my NIC (8A3FA78155A8A1D346C3C4A), put on black robes, dim the lights, wave a dead chicken over the hard drive, and summon the power of GNU GCC with the magic words "make config ; make!". [Jason Spence, compiling Vim 5.0] /// 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 ///