Author: js Date: 2008-10-05 12:21:41 +0200 (Sun, 05 Oct 2008) New Revision: 10481

Modified: branches/osx_newbuildsys/src/gajim.py Log: Fix #4375.

Modified: branches/osx_newbuildsys/src/gajim.py =================================================================== --- branches/osx_newbuildsys/src/gajim.py 2008-10-05 10:21:35 UTC (rev 10480) +++ branches/osx_newbuildsys/src/gajim.py 2008-10-05 10:21:41 UTC (rev 10481) @@ -2460,7 +2460,7 @@ emoticons_pattern = '|' + \ '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ '(?:' + emoticons_pattern[:-1] + ')' + \ - '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' + '(?:(?![\w]' + emoticons_pattern_postmatch[:-1] + '))'

# because emoticons match later (in the string) they need to be after # basic matches that may occur earlier