mirror of
https://github.com/irssi/irssi.git
synced 2026-08-11 04:43:34 +02:00
nicklist_find() now finds only full nicks, nicklist_find_mask() finds
nick masks. This fixes *a* and similiar emphasis where irssi tried to find nick mask *a* instead of nick *a*. Also, emphasis with highascii didn't work unless emphasis_multiword was set ON. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1143 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
db03c25952
commit
4cbabe2a83
5 changed files with 39 additions and 20 deletions
|
|
@ -63,12 +63,12 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text)
|
|||
|
||||
/* check that the beginning marker starts a word, and
|
||||
* that the matching end marker ends a word */
|
||||
if ((pos > 0 && isalnum(bgn[-1])) || !ishighalnum(bgn[1]))
|
||||
if ((pos > 0 && ishighalnum(bgn[-1])) || !ishighalnum(bgn[1]))
|
||||
continue;
|
||||
if ((end = strchr(bgn+1, *bgn)) == NULL)
|
||||
continue;
|
||||
if (!ishighalnum(end[-1]) ||
|
||||
isalnum(end[1]) || end[1] == type)
|
||||
ishighalnum(end[1]) || end[1] == type)
|
||||
continue;
|
||||
|
||||
if (IS_CHANNEL(item)) {
|
||||
|
|
@ -88,7 +88,7 @@ char *expand_emphasis(WI_ITEM_REC *item, const char *text)
|
|||
if (!settings_get_bool("emphasis_multiword")) {
|
||||
char *c;
|
||||
for (c = bgn+1; c != end; c++) {
|
||||
if (!isalnum(*c))
|
||||
if (!ishighalnum(*c))
|
||||
break;
|
||||
}
|
||||
if (c != end) continue;
|
||||
|
|
@ -316,7 +316,7 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
|
|||
|
||||
if (!nicklist_find(rec, nick))
|
||||
continue;
|
||||
|
||||
|
||||
if (ignore_check(server, nick, address, rec->name,
|
||||
reason, MSGLEVEL_QUITS)) {
|
||||
count++;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue