SF.net SVN: geany:[4750] trunk

Wed Mar 10 13:52:42 UTC 2010

Revision: 4750
          http://geany.svn.sourceforge.net/geany/?rev=4750&view=rev
Author:   ntrel
Date:     2010-03-10 13:52:41 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
Warn about some GNU extensions for regular expressions & clarify
some points.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt

Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2010-03-10 00:55:21 UTC (rev 4749)
+++ trunk/ChangeLog	2010-03-10 13:52:41 UTC (rev 4750)
@@ -1,8 +1,15 @@
+2010-03-10  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+   Warn about some GNU extensions for regular expressions & clarify
+   some points.
+
+
 2010-03-10  Lex Trotman  <elextr.at.gmail.dot.com>
 
- * src/build.c, src/project.c
-   Fix crash due to NULL in project build preferences ( thanks to 
-   Wolfgang Ocker )
+ * src/build.c, src/project.c:
+   Fix crash due to NULL in project build preferences (thanks to
+   Wolfgang Ocker).
 
 
 2010-03-09  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2010-03-10 00:55:21 UTC (rev 4749)
+++ trunk/doc/geany.html	2010-03-10 13:52:41 UTC (rev 4750)
@@ -1642,7 +1642,14 @@
 below.</p>
 <div class="note">
 <p class="first admonition-title">Note</p>
-<p class="last">Searching backwards with regular expressions is not supported.</p>
+<ol class="last arabic simple">
+<li>The <em>Use escape sequences</em> dialog option always applies for regular
+expressions.</li>
+<li>Searching backwards with regular expressions is not supported.</li>
+<li>\b, \d, \s, \w are GNU extensions and may not be available
+on non-GNU POSIX systems unless you built Geany with the
+<tt class="docutils literal"><span class="pre">--enable-gnu-regex</span></tt> option (this is always used on Windows).</li>
+</ol>
 </div>
 <p><strong>In a regular expression, the following characters are interpreted:</strong></p>
 <table border="1" class="docutils">
@@ -1661,10 +1668,13 @@
 <td>This marks the end of a tagged region.</td>
 </tr>
 <tr><td>\n</td>
-<td>Where n is 1 through 9 refers to the first through ninth tagged
-region when replacing. For example, if the search string was
-Fred([1-9])XXX and the replace string was Sam\1YYY, when applied
-to Fred2XXX this would generate Sam2YYY.</td>
+<td><p class="first">Where n is 1 through 9 refers to the first through ninth tagged
+region when searching or replacing.</p>
+<p>Searching for (Wiki)\1 matches WikiWiki.</p>
+<p class="last">If the search string was Fred([1-9])XXX and the
+replace string was Sam\1YYY, when applied to Fred2XXX this
+would generate Sam2YYY.</p>
+</td>
 </tr>
 <tr><td>\0</td>
 <td>When replacing, the whole matching text.</td>
@@ -1691,10 +1701,6 @@
 and not as the start of a character set. Use \\ for a literal
 backslash.</td>
 </tr>
-<tr><td>\uHHHH</td>
-<td>A backslash followed by u and one, two or four hexa digits,
-becomes the character whose Unicode is equal to these digits.</td>
-</tr>
 <tr><td>[...]</td>
 <td><p class="first">Matches one of the characters in the set. If the first
 character in the set is ^, it matches the characters NOT in
@@ -5949,7 +5955,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-03-09 17:17 UTC.
+Generated on: 2010-03-10 13:48 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2010-03-10 00:55:21 UTC (rev 4749)
+++ trunk/doc/geany.txt	2010-03-10 13:52:41 UTC (rev 4750)
@@ -1293,7 +1293,12 @@
 below.
 
 .. note::
-    Searching backwards with regular expressions is not supported.
+    1. The *Use escape sequences* dialog option always applies for regular
+       expressions.
+    2. Searching backwards with regular expressions is not supported.
+    3. \\b, \\d, \\s, \\w are GNU extensions and may not be available
+       on non-GNU POSIX systems unless you built Geany with the
+       ``--enable-gnu-regex`` option (this is always used on Windows).
 
 **In a regular expression, the following characters are interpreted:**
 
@@ -1305,10 +1310,14 @@
 )       This marks the end of a tagged region.
 
 \\n     Where n is 1 through 9 refers to the first through ninth tagged
-        region when replacing. For example, if the search string was
-        Fred([1-9])XXX and the replace string was Sam\\1YYY, when applied
-        to Fred2XXX this would generate Sam2YYY.
+        region when searching or replacing.
 
+        Searching for (Wiki)\\1 matches WikiWiki.
+
+        If the search string was Fred([1-9])XXX and the
+        replace string was Sam\\1YYY, when applied to Fred2XXX this
+        would generate Sam2YYY.
+
 \\0     When replacing, the whole matching text.
 
 \\b     This matches a word boundary.
@@ -1328,9 +1337,6 @@
         and not as the start of a character set. Use \\\\ for a literal
         backslash.
 
-\\uHHHH A backslash followed by u and one, two or four hexa digits,
-        becomes the character whose Unicode is equal to these digits.
-
 [...]   Matches one of the characters in the set. If the first
         character in the set is ^, it matches the characters NOT in
         the set, i.e. complements the set. A shorthand S-E (start


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

