diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | main.c | 6 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2002-09-29 Hiroaki Shimotsu <shim@d5.bs1.fc.nec.co.jp> + + * [w3m-dev 03323] EDITOR + * main.c (MAIN): use not_null() + 2002-09-29 AIDA Shinra <aida-s@jcom.home.ne.jp> * Re: [w3m-dev 03320] Re: Passwords @@ -3840,4 +3845,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.431 2002/09/28 16:30:07 ukai Exp $ +$Id: ChangeLog,v 1.432 2002/09/28 16:32:48 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.113 2002/09/24 17:06:04 ukai Exp $ */ +/* $Id: main.c,v 1.114 2002/09/28 16:32:49 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -444,9 +444,9 @@ MAIN(int argc, char **argv, char **envp) set_no_proxy(p); } - if (Editor == NULL && (p = getenv("EDITOR")) != NULL) + if (!non_null(Editor) && (p = getenv("EDITOR")) != NULL) Editor = p; - if (Mailer == NULL && (p = getenv("MAILER")) != NULL) + if (!non_null(Mailer) && (p = getenv("MAILER")) != NULL) Mailer = p; /* argument search 2 */ |