diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | main.c | 17 | 
2 files changed, 11 insertions, 15 deletions
| @@ -1,3 +1,10 @@ +2002-04-27  Kiyokazu SUTO <suto@ks-and-ks.ne.jp> + +	* [w3m-dev 03185] Re: cmd_mark in main.c, rev 1.60 broke unmark? +	* main.c (cmd_mark): deleted +		(_mark): xor PE_MARK +		(reMark): or PE_MARK +  2002-04-27  Fumitoshi UKAI  <ukai@debian.or.jp>  	* scripts/.cvsignore: add xface2xpm @@ -3395,4 +3402,4 @@  	* release-0-2-1  	* import w3m-0.2.1 -$Id: ChangeLog,v 1.376 2002/04/26 16:00:58 ukai Exp $ +$Id: ChangeLog,v 1.377 2002/04/26 16:06:34 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.98 2002/04/24 18:29:35 ukai Exp $ */ +/* $Id: main.c,v 1.99 2002/04/26 16:06:34 ukai Exp $ */  #define MAINPROGRAM  #include "fm.h"  #include <signal.h> @@ -70,9 +70,6 @@ static void cmd_loadfile(char *path);  static void cmd_loadURL(char *url, ParsedURL *current, char *referer);  static void cmd_loadBuffer(Buffer *buf, int prop, int linkid);  static void keyPressEventProc(int c); -#ifdef USE_MARK -static void cmd_mark(Lineprop *p); -#endif				/* USE_MARK */  int show_params_p = 0;  void show_params(FILE * fp); @@ -2432,18 +2429,10 @@ _mark(void)      if (Currentbuf->firstLine == NULL)  	return;      l = Currentbuf->currentLine; -    cmd_mark(&l->propBuf[Currentbuf->pos]); +    l->propBuf[Currentbuf->pos] ^= PE_MARK;      redrawLine(Currentbuf, l, l->linenumber - Currentbuf->topLine->linenumber);  } -static void -cmd_mark(Lineprop *p) -{ -    if (!use_mark) -	return; -    *p |= PE_MARK; -} -  /* Go to next mark */  void  nextMk(void) @@ -2537,7 +2526,7 @@ reMark(void)  	for (;;) {  	    if (regexMatch(p, &l->lineBuf[l->len] - p, p == l->lineBuf) == 1) {  		matchedPosition(&p1, &p2); -		cmd_mark(l->propBuf + (p1 - l->lineBuf)); +		l->propBuf[p1 - l->lineBuf] |= PE_MARK;  		p = p2;  	    }  	    else | 
