From 7099f43a12b5eab92068c9d6e2f4cfa6b7a68f83 Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Thu, 3 Jan 2013 11:32:45 -0800 Subject: [PATCH 1/3] Don't strip # from a WORD_CHANNEL --- src/fe-gtk/maingui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index b6fdbdfa..4947b38c 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -2311,7 +2311,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even) menu_nickmenu (sess, even, word + (ispunct (*word)? 1: 0), FALSE); break; case WORD_CHANNEL: - menu_chanmenu (sess, even, word + (ispunct (*word)? 1: 0)); + menu_chanmenu (sess, even, word); break; case WORD_EMAIL: word[end] = 0; From 44d920592d2a258500fdddd848fd0649282481e9 Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Thu, 3 Jan 2013 14:13:20 -0800 Subject: [PATCH 2/3] For NICK0 use NICKSPE, not NICKDIG --- src/common/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/url.c b/src/common/url.c index e3834a70..c21870a0 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -453,7 +453,7 @@ re_email (void) #define NICKDIG "0-9" /* Note for NICKSPE: \\\\ boils down to a single \ */ #define NICKSPE "\\[\\]\\\\`_^{|}" -#define NICK0 "[" NICKPRE "]?[" NICKLET NICKDIG "]" +#define NICK0 "[" NICKPRE "]?[" NICKLET NICKSPE "]" #define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]+" #define NICK NICK0 NICK1 From 4bf2fbe092fbe791b5ea0268b07ae3aaaa7a5870 Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Thu, 3 Jan 2013 14:24:04 -0800 Subject: [PATCH 3/3] Ywes, nicks can be as short as one character long! --- src/common/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/url.c b/src/common/url.c index c21870a0..b5af5d3a 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -454,7 +454,7 @@ re_email (void) /* Note for NICKSPE: \\\\ boils down to a single \ */ #define NICKSPE "\\[\\]\\\\`_^{|}" #define NICK0 "[" NICKPRE "]?[" NICKLET NICKSPE "]" -#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]+" +#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*" #define NICK NICK0 NICK1 static GRegex *