diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-07-30 11:13:51 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-07-30 11:13:51 +0000 |
| commit | 18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab (patch) | |
| tree | 88966004acc26ea238b5414bd569b86aac1b569d /menu.c | |
| parent | Sort anchors by sequence number in -dump (diff) | |
| parent | Merge branch 'feature/debian-version' (diff) | |
| download | w3m-18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab.tar.gz w3m-18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab.zip | |
Merge branch 'master' into bug/sort-dump-links
Conflicts:
main.c
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -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) |