[w3m-dev 02810]

From: Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
This commit is contained in:
Fumitoshi UKAI
2002-01-10 03:45:13 +00:00
parent d52fa78f4f
commit 3d272a74fc
3 changed files with 12 additions and 6 deletions

View File

@@ -1,3 +1,9 @@
2002-01-10 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
* [w3m-dev 02810]
* scripts/Makefile: read -r
* scripts/w3mhelp.cgi.in: fix bugs displaying "C-" only in some case
2002-01-08 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> 2002-01-08 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02794] * [w3m-dev 02794]
@@ -1789,4 +1795,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.201 2002/01/07 16:28:17 ukai Exp $ $Id: ChangeLog,v 1.202 2002/01/10 03:45:13 ukai Exp $

View File

@@ -39,7 +39,7 @@ w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab ../doc/keymap.defaul
@echo ');' >> w3mhelp-funcname.pl @echo ');' >> w3mhelp-funcname.pl
@echo '%keyfunc = (' >> w3mhelp-funcname.pl @echo '%keyfunc = (' >> w3mhelp-funcname.pl
@case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \ @case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \
while read keyword keys func rest; do \ while read -r keyword keys func rest; do \
if [ "X$$keyword" = Xkeymap ]; then \ if [ "X$$keyword" = Xkeymap ]; then \
keys=`echo "$$keys" | sed -e 's/\\\\/\\\\&/g'`; \ keys=`echo "$$keys" | sed -e 's/\\\\/\\\\&/g'`; \
echo "'$$keys', '$$func',"; \ echo "'$$keys', '$$func',"; \

View File

@@ -1,5 +1,5 @@
#!@PERL@ #!@PERL@
# $Id: w3mhelp.cgi.in,v 1.9 2001/12/25 17:29:31 ukai Exp $ # $Id: w3mhelp.cgi.in,v 1.10 2002/01/10 03:45:13 ukai Exp $
if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) { if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
$CYGPATH = 1; $CYGPATH = 1;
@@ -187,7 +187,8 @@ sub load_keymap {
sub norm_key { sub norm_key {
local($_) = @_; local($_) = @_;
s/^\^/C-/; s/\\(.)/$1/g;
s/^\^(.)/C-$1/;
s/^(C-\[|M-)/ESC-/; s/^(C-\[|M-)/ESC-/;
if (/^ESC-\[/) { if (/^ESC-\[/) {
/^ESC-\[A$/ && return "UP"; /^ESC-\[A$/ && return "UP";
@@ -197,10 +198,9 @@ sub norm_key {
s/^ESC-/\^\[/; s/^ESC-/\^\[/;
return $_; return $_;
} }
s/^(ESC-)\^/ESC-C-/; s/^ESC-\^(.)/ESC-C-$1/;
s/^(ESC-)?C-[iI]/${1}TAB/; s/^(ESC-)?C-[iI]/${1}TAB/;
s/^(ESC-)?C-\?/${1}DEL/; s/^(ESC-)?C-\?/${1}DEL/;
s/^\\//;
return $_; return $_;
} }