diff options
-rw-r--r-- | meta-oe/recipes-support/vim/vim_8.1.0347.bb | 7 | ||||
-rw-r--r-- | meta-xfce/recipes-support/vim/vim_%.bbappend | 1 | ||||
-rw-r--r-- | meta-xfce/recipes-support/vim/vim_xfce.inc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/vim/vim_8.1.0347.bb b/meta-oe/recipes-support/vim/vim_8.1.0347.bb index 2a3d14a2ce..1c41caaf10 100644 --- a/meta-oe/recipes-support/vim/vim_8.1.0347.bb +++ b/meta-oe/recipes-support/vim/vim_8.1.0347.bb @@ -80,6 +80,13 @@ do_install() { # we use --with-features=big as default mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN} + + if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then + # The mouse being autoenabled is just annoying in xfce4-terminal (mouse + # drag make vim go into visual mode and there is no right click menu), + # delete the block. + sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc + fi } PARALLEL_MAKEINST = "" diff --git a/meta-xfce/recipes-support/vim/vim_%.bbappend b/meta-xfce/recipes-support/vim/vim_%.bbappend deleted file mode 100644 index 7b449630e9..0000000000 --- a/meta-xfce/recipes-support/vim/vim_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${BPN}_xfce.inc', '', d)} diff --git a/meta-xfce/recipes-support/vim/vim_xfce.inc b/meta-xfce/recipes-support/vim/vim_xfce.inc deleted file mode 100644 index 25403e6cb5..0000000000 --- a/meta-xfce/recipes-support/vim/vim_xfce.inc +++ /dev/null @@ -1,6 +0,0 @@ -do_install_append() { - # The mouse being autoenabled is just annoying in xfce4-terminal (mouse - # drag make vim go into visual mode and there is no right click menu), - # delete the block. - sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc -} |