mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +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.
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 27support_C_locale.dpatch by <hesso@pool.math.tu-berlin.de>
|
|
##
|
|
## DP: Allow users to edit 8-bit files even under LC_CTYPE=C.
|
|
|
|
@DPATCH@
|
|
--- nvi-1.81.6.orig/common/conv.c 2007-11-18 17:41:42.000000000 +0100
|
|
+++ nvi-1.81.6/common/conv.c 2009-03-09 16:45:37.812022582 +0100
|
|
@@ -322,11 +322,16 @@
|
|
else {
|
|
setlocale(LC_ALL, "");
|
|
#ifdef USE_WIDECHAR
|
|
- sp->conv.sys2int = cs_char2int;
|
|
- sp->conv.int2sys = cs_int2char;
|
|
- sp->conv.file2int = fe_char2int;
|
|
- sp->conv.int2file = fe_int2char;
|
|
- sp->conv.input2int = ie_char2int;
|
|
+ if (!strcmp(LANGCODESET, "ANSI_X3.4-1968")) {
|
|
+ sp->conv.file2int = sp->conv.input2int = sp->conv.sys2int = raw2int;
|
|
+ sp->conv.int2sys = sp->conv.int2file = int2raw;
|
|
+ } else {
|
|
+ sp->conv.sys2int = cs_char2int;
|
|
+ sp->conv.int2sys = cs_int2char;
|
|
+ sp->conv.file2int = fe_char2int;
|
|
+ sp->conv.int2file = fe_int2char;
|
|
+ sp->conv.input2int = ie_char2int;
|
|
+ }
|
|
#endif
|
|
#ifdef USE_ICONV
|
|
o_set(sp, O_FILEENCODING, OS_STRDUP, nl_langinfo(CODESET), 0);
|