From cff0e16925e7edbd25b8b9d6d4fbdf03e0e60c01 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Fri, 9 Dec 2011 17:32:28 +0100 Subject: [PATCH] "." is no longer an alias for "cur" Don't fear more typing, as "cur" will soon be cut down to "c", likewise the other predefined sequences. --- sbr/m_convert.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sbr/m_convert.c b/sbr/m_convert.c index a67305b..05533f6 100644 --- a/sbr/m_convert.c +++ b/sbr/m_convert.c @@ -185,7 +185,7 @@ single: if (first > mp->hghmsg || first < mp->lowmsg || !(does_exist(mp, first))) { - if (!strcmp(name, "cur") || !strcmp(name, ".")) + if (!strcmp(name, "cur")) advise(NULL, "no %s message", name); else advise(NULL, "message %d doesn't exist", first); @@ -231,9 +231,7 @@ single: ** first ** last ** cur -** . (same as cur) */ - static int m_conv(struct msgs *mp, char *str, int call) { @@ -261,11 +259,9 @@ m_conv(struct msgs *mp, char *str, int call) #ifdef LOCALE /* doesn't enforce lower case */ - for (bp = buf; (isalpha(*cp) || *cp == '.') - && (bp - buf < sizeof(buf) - 1); ) + for (bp = buf; isalpha(*cp) && (bp - buf < sizeof(buf) - 1); ) #else - for (bp = buf; ((*cp >= 'a' && *cp <= 'z') || *cp == '.') - && (bp - buf < sizeof(buf) - 1); ) + for (bp = buf; islower(*cp) && (bp - buf < sizeof(buf) - 1); ) #endif /* LOCALE */ { *bp++ = *cp++; @@ -282,7 +278,7 @@ m_conv(struct msgs *mp, char *str, int call) return (mp->hghmsg || !(mp->msgflags & ALLOW_NEW) ? mp->hghmsg : BADMSG); } - if (!strcmp(buf, "cur") || !strcmp(buf, ".")) + if (!strcmp(buf, "cur")) return (mp->curmsg > 0 ? mp->curmsg : BADMSG); if (!strcmp(buf, "prev")) { -- 1.7.10.4