[ jEdit-commits ] SF.net SVN: jedit:[16080] jEdit/trunk

[<va...@us...>]

Revision: 16080
          http://jedit.svn.sourceforge.net/jedit/?rev=16080&view=rev
Author:   vanza
Date:     2009-08-27 05:19:03 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Apply patch #2827234 (fix bug #2808363): fix perl syntax highlighting hanging in some cases.

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/modes/perl.xml

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2009-08-26 23:42:55 UTC (rev 16079)
+++ jEdit/trunk/doc/CHANGES.txt	2009-08-27 05:19:03 UTC (rev 16080)
@@ -2,8 +2,9 @@
 
 {{{ Version 4.3pre18
 
-Thanks to Bj\xF6rn "Vampire" Kautler, Shlomy Reinstein, Alan Ezust 
-Matthieu Casanova and Denis Dzenskevich for contributing to this release.
+Thanks to Bj\xF6rn "Vampire" Kautler, Shlomy Reinstein, Alan Ezust
+Matthieu Casanova, Denis Dzenskevich and Dennis Sheil for contributing to this
+release.
 
 {{{ Bug Fixes
 - When using the quick syntax edition, if the operation is cancelled, do not
@@ -51,9 +52,9 @@
 
 - # 2838679 - Support Cygwin xsltproc in build.xml for docs generation
    (Sebastian Schuberth).
-   
+
 - Minor refactoring of Mode class to allow plugins to determine the mode of a
-  file without having to necessarily read the first line of the file.  This 
+  file without having to necessarily read the first line of the file.  This
   allows huge performance gains in plugins like TaskList that need to determine
   the mode of a large number of files that are not yet opened in jEdit.
   (Dale Anson)
@@ -61,9 +62,12 @@
 - Fixed #2834900: DockingLayoutManager recursion when handling EditBus msgs.
   Prevented such recursions by avoiding creation of a dockable if it is already
   being created. (Shlomy Reinstein)
-  
+
 - Fixed syntax highlight when a " appear in a javadoc comment in java mode
   (#2818095) (Denis Dzenskevich)
+
+- Fixed #2808363 (patch #2827234): fix perl highlighting hanging on some
+  operators. (Dennis Sheil)
 }}}
 {{{ Miscellaneous
 

Modified: jEdit/trunk/modes/perl.xml
===================================================================
--- jEdit/trunk/modes/perl.xml	2009-08-26 23:42:55 UTC (rev 16079)
+++ jEdit/trunk/modes/perl.xml	2009-08-27 05:19:03 UTC (rev 16080)
@@ -262,14 +262,14 @@
 
 		<!-- tr/// transliteration -->
 		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="tr"
-            AT_WORD_START="TRUE">tr\s*\{.*?[^\\]\}\s*\{(?:.*?[^\\])*\}[cds]*</SEQ_REGEXP>
+            AT_WORD_START="TRUE">tr\s*\{.*?[^\\]\}\s*\{(?:.*?[^\\])*?\}[cds]*</SEQ_REGEXP>
 
 		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="tr"
             AT_WORD_START="TRUE">tr([^\p{Alnum}\p{Space}\}])(?:.*?)\1(?:.*?)\1[cds]*</SEQ_REGEXP>
 
 		<!-- y/// translation -->
 		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="y"
-            AT_WORD_START="TRUE">y\s*\{.*?[^\\]\}\s*\{(?:.*?[^\\])*\}[cds]*</SEQ_REGEXP>
+            AT_WORD_START="TRUE">y\s*\{.*?[^\\]\}\s*\{(?:.*?[^\\])*?\}[cds]*</SEQ_REGEXP>
 
 		<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="y"
             AT_WORD_START="TRUE">y([^\p{Alnum}\p{Space}\}_])(?:.*?)\1(?:.*?)\1[cds]*</SEQ_REGEXP>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.