diff options
author | Tatsuya Kinoshita <tats@debian.org> | 2016-03-13 09:30:32 +0000 |
---|---|---|
committer | Tatsuya Kinoshita <tats@debian.org> | 2016-03-13 11:06:18 +0000 |
commit | 06181fceffb21e9b592e45649c943741055152ae (patch) | |
tree | fa7f41c7c352ba411997245cf739b7db08afd8cd | |
parent | Update ChangeLog (diff) | |
download | w3m-06181fceffb21e9b592e45649c943741055152ae.tar.gz w3m-06181fceffb21e9b592e45649c943741055152ae.zip |
Add extbrowser4, extbrowser5, ..., and extbrowser9
Diffstat (limited to '')
-rw-r--r-- | doc-jp/MANUAL.html | 4 | ||||
-rw-r--r-- | doc/MANUAL.html | 4 | ||||
-rw-r--r-- | fm.h | 6 | ||||
-rw-r--r-- | main.c | 18 | ||||
-rw-r--r-- | rc.c | 24 |
5 files changed, 49 insertions, 7 deletions
diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html index a8623e2..32c2973 100644 --- a/doc-jp/MANUAL.html +++ b/doc-jp/MANUAL.html @@ -205,9 +205,9 @@ HTML文書を表示しているときには,次のような表示になります. <TR><TD>F<TD><FRAMESET>を含む文書を表示しているときに,<FRAME> タグの指す複数の文書を1つの文書に変換して表示します. <TR><TD>M<TD>現在見ているページを,外部ブラウザを使って表示します. -2M, 3M で2番目と3番目のブラウザを使います. +2M, 3M, 9M で2番目,3番目,9番目のブラウザを使います. <TR><TD>ESC M<TD>現在のリンク先を,外部ブラウザを使って表示します. -2ESC M, 3ESC M で2番目と3番目のブラウザを使います. +2ESC M, 3ESC M, 9ESC M で2番目,3番目,9番目のブラウザを使います. </table> <H3>ファイルとURL関係の操作</H3> diff --git a/doc/MANUAL.html b/doc/MANUAL.html index 8353f33..300e370 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -204,9 +204,9 @@ bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>. <TR><TD>C-h<TD>View history of URL <TR><TD>F<TD>Render frame <TR><TD>M<TD>Browse current document using external browser -(use 2M and 3M to invoke second and third browser) +(use 2M, 3M, ..., and 9M to invoke second, third, ..., and ninth browser) <TR><TD>ESC M<TD>Browse link using external browser -(use 2ESC M and 3ESC M to invoke second and third browser) +(use 2ESC M, 3ESC M, ..., and 9ESC M to invoke second, third, ..., and ninth browser) </table> <H3>File/Stream operation</H3> @@ -994,6 +994,12 @@ global int MailtoOptions init(MAILTO_OPTIONS_IGNORE); global char *ExtBrowser init(DEF_EXT_BROWSER); global char *ExtBrowser2 init(NULL); global char *ExtBrowser3 init(NULL); +global char *ExtBrowser4 init(NULL); +global char *ExtBrowser5 init(NULL); +global char *ExtBrowser6 init(NULL); +global char *ExtBrowser7 init(NULL); +global char *ExtBrowser8 init(NULL); +global char *ExtBrowser9 init(NULL); global int BackgroundExtViewer init(TRUE); global int disable_secret_security_check init(FALSE); global char *passwd_file init(PASSWD_FILE); @@ -5134,6 +5134,24 @@ invoke_browser(char *url) case 3: browser = ExtBrowser3; break; + case 4: + browser = ExtBrowser4; + break; + case 5: + browser = ExtBrowser5; + break; + case 6: + browser = ExtBrowser6; + break; + case 7: + browser = ExtBrowser7; + break; + case 8: + browser = ExtBrowser8; + break; + case 9: + browser = ExtBrowser9; + break; } if (browser == NULL || *browser == '\0') { browser = inputStr("Browse command: ", NULL); @@ -143,9 +143,15 @@ static int OptionEncode = FALSE; #define CMT_EDITOR N_("Editor") #define CMT_MAILER N_("Mailer") #define CMT_MAILTO_OPTIONS N_("How to call Mailer for mailto URLs with options") -#define CMT_EXTBRZ N_("External Browser") -#define CMT_EXTBRZ2 N_("Second External Browser") -#define CMT_EXTBRZ3 N_("Third External Browser") +#define CMT_EXTBRZ N_("External browser") +#define CMT_EXTBRZ2 N_("Second external browser") +#define CMT_EXTBRZ3 N_("Third external browser") +#define CMT_EXTBRZ4 N_("Fourth external browser") +#define CMT_EXTBRZ5 N_("Fifth external browser") +#define CMT_EXTBRZ6 N_("Sixth external browser") +#define CMT_EXTBRZ7 N_("Seventh external browser") +#define CMT_EXTBRZ8 N_("Eighth external browser") +#define CMT_EXTBRZ9 N_("Ninth external browser") #define CMT_DISABLE_SECRET_SECURITY_CHECK N_("Disable secret file security check") #define CMT_PASSWDFILE N_("Password file") #define CMT_PRE_FORM_FILE N_("File for setting form on loading") @@ -567,6 +573,18 @@ struct param_ptr params6[] = { NULL}, {"extbrowser3", P_STRING, PI_TEXT, (void *)&ExtBrowser3, CMT_EXTBRZ3, NULL}, + {"extbrowser4", P_STRING, PI_TEXT, (void *)&ExtBrowser4, CMT_EXTBRZ4, + NULL}, + {"extbrowser5", P_STRING, PI_TEXT, (void *)&ExtBrowser5, CMT_EXTBRZ5, + NULL}, + {"extbrowser6", P_STRING, PI_TEXT, (void *)&ExtBrowser6, CMT_EXTBRZ6, + NULL}, + {"extbrowser7", P_STRING, PI_TEXT, (void *)&ExtBrowser7, CMT_EXTBRZ7, + NULL}, + {"extbrowser8", P_STRING, PI_TEXT, (void *)&ExtBrowser8, CMT_EXTBRZ8, + NULL}, + {"extbrowser9", P_STRING, PI_TEXT, (void *)&ExtBrowser9, CMT_EXTBRZ9, + NULL}, {"bgextviewer", P_INT, PI_ONOFF, (void *)&BackgroundExtViewer, CMT_BGEXTVIEW, NULL}, {"use_lessopen", P_INT, PI_ONOFF, (void *)&use_lessopen, CMT_USE_LESSOPEN, |