Merge branch 'master' of http://github.com/RichardHitt/hexchat

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 *

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;