From: Martin Vaeth <vaeth@mathematik.uni-wuerzburg.de>
To: zsh-workers@zsh.org
Subject: Re: [PATCH] helpfiles: Also accept 'UTF-8' as an encoding name.
Date: Fri, 15 Nov 2013 19:58:35 +0000 (UTC) [thread overview]
Message-ID: <slrnl8cv7l.d1u.vaeth@lounge.imp.fu-berlin.de> (raw)
In-Reply-To: <7AC8C1DC-EADF-4912-8A68-135B83C7DB8D@kba.biglobe.ne.jp>
Sorry for the delay; I am rather busy these days.
Jun T. <takimoto-j@kba.biglobe.ne.jp> wrote:
>
> variables LESSCHASET, LESSCHARDEF and LC_CTYPE, and your $HOME/.lesskey
Got it! LESSCHARSET=utf-8 was set here which was the culprit.
So LANG=C seems to work if all LESS* and LC_* variables
are reset. I attach the patch with the simplification
(note that also the call in the makefile must be changed).
Also, I added a check when closing the pipeline.
--- 1/Doc/Makefile.in
+++ 1/Doc/Makefile.in
@@ -188,7 +188,7 @@
runhelp: man
test x"$(runhelpdir)" = x"" || { \
test -r $(sdir)/help.txt && test -r $(sdir)/help/zmodload; \
- } || perl $(sdir_top)/Util/helpfiles $(lc_ctype) -- \
+ } || perl $(sdir_top)/Util/helpfiles \
$(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \
|| { rm -f $(sdir)/help.txt $(sdir)/help/zmodload; false; }
.PHONY: runhelp
--- 1/Util/helpfiles
+++ 1/Util/helpfiles
@@ -16,9 +16,6 @@
# If a third arg is given, the symlink is not created, but a
# list of symlinks is put into the file specified by that arg.
-# Optionally, you can pass -fLC_CTYPE as an additional first argument.
-# If do that, this LC_CTYPE is used instead of one specified by a heuristic.
-
# Example usage:
# cd ~/zsh-4.0.1 # or wherever
# mkdir Help
@@ -39,7 +36,7 @@
# now <Esc>-h works for shell builtins.
sub Usage {
- print(STDERR "Usage: helpfiles [-fLC_CTYPE] zshbuiltins.1 dest-dir [link-file]\n");
+ print(STDERR "Usage: helpfiles zshbuiltins.1 dest-dir [link-file]\n");
exit(1);
}
@@ -53,38 +50,6 @@
}
&Usage() unless(@ARGV);
-delete($ENV{'LC_ALL'});
-$ENV{'LANG'} = 'C';
-if($ARGV[0] =~ /-f(.*)/) {
- $lc_type = $1;
- shift(@ARGV);
- &Usage() unless(@ARGV);
- if($lc_type eq '') {
- $lc_type = shift(@ARGV);
- &Usage() unless(@ARGV);
- }
-} else {
- open(LOCALE, '-|', 'locale', '-a') || &Die('cannot execute locale -a');
- $lc_ctype = '';
- $choice = 0;
- while(<LOCALE>) {
- if(/en.*utf8/i) {
- $lc_ctype = $_;
- last;
- } elsif(/utf8/i) {
- $lc_ctype = $_;
- $choice = 2;
- } elsif(($choice < 1) && (/(en)|\./i)) {
- $lc_ctype = $_;
- $choice = 1;
- }
- }
- close(LOCALE);
-}
-&Info("using LC_CTYPE=$lc_ctype");
-$ENV{'LC_CTYPE'} = $lc_ctype unless($lc_ctype eq '');
-shift(@ARGV) if($ARGV[0] eq '--');
-&Usage() unless(@ARGV);
$manfile = shift(@ARGV);
&Usage() unless(@ARGV);
$destdir = shift(@ARGV);
@@ -93,8 +58,10 @@
mkdir($destdir) || &Die("$destdir is not a directory and cannot be created");
}
-delete($ENV{'MANPL'});
-delete($ENV{'MANROFFSEQ'});
+foreach (keys %ENV) {
+ delete($ENV{$_}) if(/^((LC_)|(LESS)|(MAN))/);
+}
+$ENV{'LANG'} = 'C';
$ENV{'MANWIDTH'} = '80';
$ENV{'GROFF_NO_SGR'} = ''; # We need "classical" formatting of man pages.
@@ -231,7 +198,7 @@
select STDOUT;
close OUT;
-close MANPAGE;
+close(MANPAGE) || &Die('piping from man ', $manfile, ' failed')
foreach $file (<*>) {
open (IN, $file);
next prev parent reply other threads:[~2013-11-15 19:59 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-10 8:57 Install run-help and *.zwc files system wide in build system Martin Vaeth
2013-11-10 18:13 ` Peter Stephenson
2013-11-10 22:28 ` Martin Vaeth
2013-11-11 2:30 ` Bart Schaefer
2013-11-11 9:09 ` Martin Vaeth
2013-11-11 16:42 ` Bart Schaefer
2013-11-11 22:59 ` Martin Vaeth
2013-11-12 10:11 ` Peter Stephenson
2013-11-12 17:41 ` Martin Vaeth
2013-11-12 17:48 ` Peter Stephenson
2013-11-12 21:04 ` Peter Stephenson
2013-11-12 21:42 ` Martin Vaeth
2013-11-13 9:28 ` Peter Stephenson
2013-11-13 10:10 ` Martin Vaeth
2013-11-13 11:21 ` Peter Stephenson
2013-11-13 16:06 ` Bart Schaefer
2013-11-16 12:14 ` modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system) Martin Vaeth
2013-11-17 18:30 ` Bart Schaefer
2013-11-17 19:42 ` Martin Vaeth
2013-11-17 21:01 ` Bart Schaefer
2013-11-18 7:00 ` Martin Vaeth
2013-11-18 16:11 ` Doc/Doc/help (was: modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system)) Bart Schaefer
2013-11-18 16:23 ` Peter Stephenson
2013-11-18 16:31 ` Bart Schaefer
2013-11-18 16:36 ` Peter Stephenson
2013-11-18 16:45 ` Bart Schaefer
2013-11-18 16:58 ` Peter Stephenson
2013-11-20 19:26 ` modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system) Peter Stephenson
2013-11-21 6:01 ` Bart Schaefer
2013-11-23 17:48 ` Peter Stephenson
2013-11-23 19:47 ` Helpfiles again (was Re: modify functions hierarchy (was: etc.)) Bart Schaefer
2013-11-23 21:25 ` Martin Vaeth
2013-11-24 5:06 ` Bart Schaefer
[not found] ` <20131124175649.27c2559a@pws!>
2013-11-24 12:26 ` Martin Vaeth
2013-11-24 12:31 ` Martin Vaeth
2013-11-24 17:56 ` Peter Stephenson
2013-11-25 8:18 ` Bart Schaefer
2013-11-25 14:24 ` Jun T.
2013-11-25 15:49 ` Peter Stephenson
2013-11-25 16:56 ` Bart Schaefer
2013-11-25 17:37 ` Peter Stephenson
2013-11-25 20:14 ` Phil Pennock
2013-11-26 9:24 ` Peter Stephenson
2013-12-12 22:17 ` PATCH: Util/helpfiles failing on old-fashioned unix pda
2013-12-13 9:08 ` Martin Vaeth
2013-12-13 23:46 ` Martin Vaeth
2013-12-14 0:20 ` Wayne Davison
2013-12-14 9:23 ` Martin Vaeth
2013-12-14 18:49 ` Bart Schaefer
2013-12-15 23:37 ` pda
2013-12-18 8:39 ` Martin Vaeth
2013-11-17 20:13 ` modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system) Peter Stephenson
2013-11-17 20:50 ` Bart Schaefer
2013-11-18 7:57 ` Martin Vaeth
2013-11-18 16:28 ` Bart Schaefer
2013-11-18 10:32 ` Peter Stephenson
2013-11-18 16:38 ` Bart Schaefer
2013-11-18 16:50 ` Peter Stephenson
2013-11-12 21:52 ` Install run-help and *.zwc files system wide in build system Martin Vaeth
2013-11-13 1:13 ` Bart Schaefer
2013-11-13 2:40 ` Bart Schaefer
2013-11-13 13:30 ` [PATCH] helpfiles: Also accept 'UTF-8' as an encoding name Jun T.
2013-11-13 15:37 ` Jun T.
2013-11-13 16:56 ` Martin Vaeth
2013-11-13 17:27 ` Bart Schaefer
2013-11-13 18:28 ` Martin Vaeth
2013-11-14 0:06 ` Phil Pennock
2013-11-14 7:50 ` Martin Vaeth
2013-11-14 8:18 ` Phil Pennock
2013-11-14 11:11 ` Martin Vaeth
2013-11-15 14:58 ` Jun T.
2013-11-15 17:16 ` Bart Schaefer
2013-11-15 19:58 ` Martin Vaeth [this message]
2013-11-16 5:51 ` Bart Schaefer
2013-11-16 15:17 ` Jun T.
2013-11-16 18:05 ` Bart Schaefer
2013-11-18 18:43 ` Phil Pennock
2013-11-10 22:44 ` Install run-help and *.zwc files system wide in build system Martin Vaeth
2013-11-10 18:56 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=slrnl8cv7l.d1u.vaeth@lounge.imp.fu-berlin.de \
--to=vaeth@mathematik.uni-wuerzburg.de \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).