aboutsummaryrefslogtreecommitdiffstats
path: root/menu.c
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2013-04-08 12:56:59 +0000
committerTatsuya Kinoshita <tats@debian.org>2013-04-08 12:56:59 +0000
commitfa5bc4b95d1ea172e465ee4186724130cbe16414 (patch)
tree65d67bec6c1b212301c4745e4c99e18bd1109931 /menu.c
parentMerge branch 'feature/sgrmouse' (diff)
parentOne more patch for siteconf from [w3m-dev 04464] (diff)
downloadw3m-fa5bc4b95d1ea172e465ee4186724130cbe16414.tar.gz
w3m-fa5bc4b95d1ea172e465ee4186724130cbe16414.zip
Merge branch 'feature/siteconf'
Diffstat (limited to '')
-rw-r--r--menu.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/menu.c b/menu.c
index 774b1bd..0f66583 100644
--- a/menu.c
+++ b/menu.c
@@ -1365,9 +1365,7 @@ initSelectMenu(void)
break;
default:
Strcat_char(str, ' ');
- p = parsedURL2Str(&buf->currentURL)->ptr;
- if (DecodeURL)
- p = url_unquote_conv(p, 0);
+ p = url_decode2(parsedURL2Str(&buf->currentURL)->ptr, NULL);
Strcat_charp(str, p);
break;
}
@@ -1513,9 +1511,7 @@ initSelTabMenu(void)
case SCM_MISSING:
break;
default:
- p = parsedURL2Str(&buf->currentURL)->ptr;
- if (DecodeURL)
- p = url_unquote_conv(p, 0);
+ p = url_decode2(parsedURL2Str(&buf->currentURL)->ptr, NULL);
Strcat_charp(str, p);
break;
}
@@ -1845,10 +1841,8 @@ link_menu(Buffer *buf)
Strcat_charp(str, " ");
if (!l->url)
p = "";
- else if (DecodeURL)
- p = url_unquote_conv(l->url, buf->document_charset);
else
- p = l->url;
+ p = url_decode2(l->url, buf);
Strcat_charp(str, p);
label[i] = str->ptr;
if (len < str->length)