From 6a24638eee1596c6de74057b3b05a90612c3d0e7 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 9 Dec 2002 15:32:16 +0000 Subject: * file.c (loadGeneralFile): missing `{', fix indent for SCM_UNKNOWN * main.c (set_buffer_environ): unused variables `prev_col' From: Fumitoshi UKAI --- ChangeLog | 7 ++++++- file.c | 6 +++--- main.c | 9 +++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 083e752..201203f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-12-10 Fumitoshi UKAI + + * file.c (loadGeneralFile): missing `{', fix indent for SCM_UNKNOWN + * main.c (set_buffer_environ): unused variables `prev_col' + 2002-12-10 Hironori SAKAMOTO * [w3m-dev 03543] External URI loader (Debian closes: Bug#169962) @@ -5601,4 +5606,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.602 2002/12/09 15:27:43 ukai Exp $ +$Id: ChangeLog,v 1.603 2002/12/09 15:32:16 ukai Exp $ diff --git a/file.c b/file.c index 7a91332..21c7134 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.154 2002/12/09 15:27:44 ukai Exp $ */ +/* $Id: file.c,v 1.155 2002/12/09 15:32:18 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -1572,8 +1572,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer, tmp = searchURIMethods(&pu); if (tmp != NULL) b = loadGeneralFile(tmp->ptr, current, referer, flag, request); - if (b != NULL && b != NO_BUFFER) - copyParsedURL(&b->currentURL, &pu); + if (b != NULL && b != NO_BUFFER) { + copyParsedURL(&b->currentURL, &pu); return b; } #endif diff --git a/main.c b/main.c index 5643aa2..bb6c58f 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.161 2002/12/09 15:21:13 ukai Exp $ */ +/* $Id: main.c,v 1.162 2002/12/09 15:32:18 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -5364,7 +5364,7 @@ set_buffer_environ(Buffer *buf) { static Buffer *prev_buf = NULL; static Line *prev_line = NULL; - static short prev_col = -1, prev_pos = -1; + static short prev_pos = -1; Line *l; if (buf == NULL) @@ -5405,9 +5405,10 @@ set_buffer_environ(Buffer *buf) else set_environ("W3M_CURRENT_FORM", ""); set_environ("W3M_CURRENT_LINE", Sprintf("%d", - l->real_linenumber)->ptr); + l->real_linenumber)->ptr); set_environ("W3M_CURRENT_COLUMN", Sprintf("%d", - buf->currentColumn + buf->cursorX + 1)->ptr); + buf->currentColumn + + buf->cursorX + 1)->ptr); } else if (!l) { set_environ("W3M_CURRENT_WORD", ""); -- cgit v1.2.3