aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linein.c5
-rw-r--r--main.c4
-rw-r--r--search.c22
3 files changed, 16 insertions, 15 deletions
diff --git a/linein.c b/linein.c
index 967670d..2dd56d4 100644
--- a/linein.c
+++ b/linein.c
@@ -1,4 +1,4 @@
-/* $Id: linein.c,v 1.19 2002/01/16 15:37:06 ukai Exp $ */
+/* $Id: linein.c,v 1.20 2002/01/16 19:05:36 ukai Exp $ */
#include "fm.h"
#include "local.h"
#include "myctype.h"
@@ -229,8 +229,7 @@ inputLineHistSearch(char *prompt, char *def_str, int flag, Hist *hist,
cm_disp_next = -1;
}
else if (!i_quote && c < 0x20) { /* Control code */
- if (incrfunc == NULL
- || (c = incrfunc((int)c, strBuf)) < 0x20)
+ if (incrfunc == NULL || (c = incrfunc((int)c, strBuf)) < 0x20)
(*InputKeymap[(int)c]) (c);
if (incrfunc)
incrfunc(-1, strBuf);
diff --git a/main.c b/main.c
index 1115e35..e0ee67e 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.63 2002/01/16 19:02:15 ukai Exp $ */
+/* $Id: main.c,v 1.64 2002/01/16 19:05:37 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -1444,7 +1444,7 @@ dispincsrch(int ch, Str buf)
return -1;
}
else
- return 020; /* _prev completion for C-s C-s */
+ return 020; /* _prev completion for C-s C-s */
}
else if (*str) {
RESTORE_BUFPOSITION(&sbuf);
diff --git a/search.c b/search.c
index d77701b..f4a6004 100644
--- a/search.c
+++ b/search.c
@@ -1,4 +1,4 @@
-/* $Id: search.c,v 1.10 2002/01/16 19:02:16 ukai Exp $ */
+/* $Id: search.c,v 1.11 2002/01/16 19:05:37 ukai Exp $ */
#include "fm.h"
#include "regex.h"
#include <errno.h>
@@ -6,8 +6,8 @@
static void
set_mark(Line *l, int pos, int epos)
{
- for (; pos < epos && pos < l->len; pos++)
- l->propBuf[pos] |= PE_MARK;
+ for (; pos < epos && pos < l->len; pos++)
+ l->propBuf[pos] |= PE_MARK;
}
#ifdef USE_MIGEMO
@@ -53,13 +53,13 @@ open_migemo(char *migemo_command)
migemor = fdopen(fdr[0], "r");
migemow = fdopen(fdw[1], "w");
return 1;
-err2:
+ err2:
close(fdw[0]);
close(fdw[1]);
-err1:
+ err1:
close(fdr[0]);
close(fdr[1]);
-err0:
+ err0:
use_migemo = 0;
return 0;
}
@@ -72,11 +72,13 @@ migemostr(char *str)
if (open_migemo(migemo_command) == 0)
return str;
fprintf(migemow, "%s\n", str);
-again:
+ again:
if (fflush(migemow) != 0) {
switch (errno) {
- case EINTR: goto again;
- default: goto err;
+ case EINTR:
+ goto again;
+ default:
+ goto err;
}
}
tmp = Strfgets(migemor);
@@ -84,7 +86,7 @@ again:
if (tmp->length == 0)
goto err;
return tmp->ptr;
-err:
+ err:
/* XXX: backend migemo is not working? */
init_migemo();
use_migemo = 0;