diff options
| author | Richard Hitt <rbh00@msi.rbh00.pacbell.net> | 2013-01-08 12:58:05 -0800 |
|---|---|---|
| committer | Richard Hitt <rbh00@msi.rbh00.pacbell.net> | 2013-01-08 12:58:05 -0800 |
| commit | ccc82895edfd1a0c0e7f8d4c18dc2dac720881e8 (patch) | |
| tree | 466909e43c7c02e743a8dedf02170e48b9d8aa80 | |
| parent | 5ec9d8534e43bb6c64c2e7fc7a7f6ee6247bdc0c (diff) | |
| parent | 4bf2fbe092fbe791b5ea0268b07ae3aaaa7a5870 (diff) | |
Merge branch 'master' of http://github.com/RichardHitt/hexchat
| -rw-r--r-- | src/common/url.c | 4 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/url.c b/src/common/url.c index c93bc0f6..0ee09988 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -454,8 +454,8 @@ re_email (void) #define NICKDIG "0-9" /* Note for NICKSPE: \\\\ boils down to a single \ */ #define NICKSPE "\\[\\]\\\\`_^{|}" -#define NICK0 "[" NICKPRE "]?[" NICKLET NICKDIG "]" -#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]+" +#define NICK0 "[" NICKPRE "]?[" NICKLET NICKSPE "]" +#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*" #define NICK NICK0 NICK1 static GRegex * 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; |