mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
ba4217f718
a/elvis-2.2_0-x86_64-5.txz: Rebuilt.
Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz: Upgraded.
a/nvi-1.81.6-x86_64-1.txz: Added.
This is an implementation of the classic ex/vi text editor written by Keith
Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
take over the ex/vi symlinks if they aren't already pointing to a different
choice. Note that the removal of vi/ex symlinks from the elvis and vim
packages might cause your ex/vi symlinks to point to this after all the ex/vi
packages have been upgraded. You can set them to your preferences using
pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz: Rebuilt.
Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz: Upgraded.
Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz: Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.4.11-noarch-1.txz: Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz: Upgraded.
n/ethtool-5.4-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
29 lines
917 B
Diff
29 lines
917 B
Diff
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 15search_word.dpatch by Al Viro <viro@ZenIV.linux.org.uk>
|
|
##
|
|
## DP: Fix {^A} command. (End-of-word was not included in search
|
|
## DP: regexp leading to false positives.)
|
|
|
|
@DPATCH@
|
|
--- nvi-1.81.6.orig/vi/v_search.c 2007-11-18 11:41:42.000000000 -0500
|
|
+++ nvi-1.81.6/vi/v_search.c 2009-03-05 15:37:37.000000000 -0500
|
|
@@ -322,16 +322,17 @@
|
|
v_searchw(SCR *sp, VICMD *vp)
|
|
{
|
|
size_t blen, len;
|
|
+ size_t olen = STRLEN(VIP(sp)->keyw);
|
|
int rval;
|
|
CHAR_T *bp, *p;
|
|
|
|
- len = VIP(sp)->klen + RE_WSTART_LEN + RE_WSTOP_LEN;
|
|
+ len = olen + RE_WSTART_LEN + RE_WSTOP_LEN;
|
|
GET_SPACE_RETW(sp, bp, blen, len);
|
|
MEMCPY(bp, RE_WSTART, RE_WSTART_LEN);
|
|
p = bp + RE_WSTART_LEN;
|
|
- MEMCPY(p, VIP(sp)->keyw, VIP(sp)->klen);
|
|
- p += VIP(sp)->klen;
|
|
+ MEMCPY(p, VIP(sp)->keyw, olen);
|
|
+ p += olen;
|
|
MEMCPY(p, RE_WSTOP, RE_WSTOP_LEN);
|
|
|
|
rval = v_search(sp, vp, bp, len, SEARCH_SET, FORWARD);
|