commit d2c4d0c936a11ab85a0138962d311c3598c62bc5
parent b284c5f80f3e7e13f7c2ae395497457874f9070a
Author: ukai <ukai>
Date: Fri, 26 Apr 2002 16:06:34 +0000
[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
From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Diffstat:
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/main.c b/main.c
@@ -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