diff options
author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-01-21 15:56:12 +0000 |
---|---|---|
committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-01-21 15:56:12 +0000 |
commit | 004f4abe6e6e139f94aea16c6569ecada95f4fb8 (patch) | |
tree | 60eb441a378ed2769ef484421168bc8eb1c668e4 /main.c | |
parent | [w3m-dev 02876] w3mmail.cgi.in backport from w3mmee (diff) | |
download | w3m-004f4abe6e6e139f94aea16c6569ecada95f4fb8.tar.gz w3m-004f4abe6e6e139f94aea16c6569ecada95f4fb8.zip |
[w3m-dev 02877] some fixes for urimethodmap
* config.h.dist (RC_DIR): remove tailing /
* configure (mailer): if use_w3mmailer = y, don't ask mailer
* configure (RC_DIR): remove tailing /
* fm.h (Mailer): ifndef USE_W3MMAILER
* main.c (MAIN): ifndef USE_W3MMAILER getenv("MAILER")
* rc.c ("mailer"): ifndef USE_W3MMAILER
* regex.c (newRegex0): \ escape kanji chars
* url.c (searchURIMethods): need escape for -
* scripts/w3mmail.cgi.in: move $url, $qurl
* scripts/w3mmail.cgi.in: url_unquote $to
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.66 2002/01/17 15:05:43 ukai Exp $ */ +/* $Id: main.c,v 1.67 2002/01/21 15:56:13 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -439,8 +439,10 @@ MAIN(int argc, char **argv, char **envp) if (Editor == NULL && (p = getenv("EDITOR")) != NULL) Editor = p; +#ifndef USE_W3MMAILER if (Mailer == NULL && (p = getenv("MAILER")) != NULL) Mailer = p; +#endif /* argument search 2 */ i = 1; @@ -4780,7 +4782,7 @@ void w3m_exit(int i) { #ifdef USE_MIGEMO - init_migemo(); /* close pipe to migemo */ + init_migemo(); /* close pipe to migemo */ #endif deleteFiles(); #ifdef USE_SSL |