copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Non alpha-numeric characters on the edges of an emoticon will still allow for icon expansion. 

Thanks again, Norman!
This commit is contained in:
Travis Shirk 2005-11-13 21:13:27 +00:00
parent b816a7a46b
commit a433b2d58c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gajim.py
View File

@ -1062,14 +1062,14 @@ class Interface:
basic_pattern = links + mail + formatting basic_pattern = links + mail + formatting
self.basic_pattern_re = sre.compile(basic_pattern, sre.IGNORECASE) self.basic_pattern_re = sre.compile(basic_pattern, sre.IGNORECASE)
emoticons_pattern = '(?<!\S)(?:' emoticons_pattern = '(?<!\w)(?:'
# sort keys by length so :qwe emot is checked before :q # sort keys by length so :qwe emot is checked before :q
keys = self.emoticons.keys() keys = self.emoticons.keys()
keys.sort(self.on_emoticon_sort) keys.sort(self.on_emoticon_sort)
for emoticon in keys: # travel thru emoticons list for emoticon in keys: # travel thru emoticons list
emoticon_escaped = sre.escape(emoticon) # espace regexp metachars emoticon_escaped = sre.escape(emoticon) # espace regexp metachars
emoticons_pattern += emoticon_escaped + '|' # | means or in regexp emoticons_pattern += emoticon_escaped + '|' # | means or in regexp
emoticons_pattern += ')(?!\S)|' emoticons_pattern += ')(?!\w)|'
emot_and_basic_pattern = emoticons_pattern + basic_pattern emot_and_basic_pattern = emoticons_pattern + basic_pattern
self.emot_and_basic_re = sre.compile(emot_and_basic_pattern, sre.IGNORECASE) self.emot_and_basic_re = sre.compile(emot_and_basic_pattern, sre.IGNORECASE)