Merge branch 'master' of http://github.com/RichardHitt/hexchat
This commit is contained in:
commit
ccc82895ed
|
@ -454,8 +454,8 @@ re_email (void)
|
||||||
#define NICKDIG "0-9"
|
#define NICKDIG "0-9"
|
||||||
/* Note for NICKSPE: \\\\ boils down to a single \ */
|
/* Note for NICKSPE: \\\\ boils down to a single \ */
|
||||||
#define NICKSPE "\\[\\]\\\\`_^{|}"
|
#define NICKSPE "\\[\\]\\\\`_^{|}"
|
||||||
#define NICK0 "[" NICKPRE "]?[" NICKLET NICKDIG "]"
|
#define NICK0 "[" NICKPRE "]?[" NICKLET NICKSPE "]"
|
||||||
#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]+"
|
#define NICK1 "[" NICKHYP NICKLET NICKDIG NICKSPE "]*"
|
||||||
#define NICK NICK0 NICK1
|
#define NICK NICK0 NICK1
|
||||||
|
|
||||||
static GRegex *
|
static GRegex *
|
||||||
|
|
|
@ -2311,7 +2311,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
|
||||||
menu_nickmenu (sess, even, word + (ispunct (*word)? 1: 0), FALSE);
|
menu_nickmenu (sess, even, word + (ispunct (*word)? 1: 0), FALSE);
|
||||||
break;
|
break;
|
||||||
case WORD_CHANNEL:
|
case WORD_CHANNEL:
|
||||||
menu_chanmenu (sess, even, word + (ispunct (*word)? 1: 0));
|
menu_chanmenu (sess, even, word);
|
||||||
break;
|
break;
|
||||||
case WORD_EMAIL:
|
case WORD_EMAIL:
|
||||||
word[end] = 0;
|
word[end] = 0;
|
||||||
|
|
Loading…
Reference in New Issue