Revision: 5092 http://geany.svn.sourceforge.net/geany/?rev=5092&view=rev Author: ntrel Date: 2010-07-06 14:20:12 +0000 (Tue, 06 Jul 2010)
Log Message: ----------- Revert (most of) last 2 commits as Grep's --exclude-dir=.?* doesn't seem to be working as expected.
Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/search.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-07-06 14:01:26 UTC (rev 5091) +++ trunk/ChangeLog 2010-07-06 14:20:12 UTC (rev 5092) @@ -1,12 +1,7 @@ 2010-07-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
- * doc/geany.txt, doc/geany.html: - Fix Grep --exclude-dir example to not filter out the current - directory (oops). - * src/search.c: - Make Find in Files extra options default to --exclude-dir=.?* to - filter out hidden directories. (Still disabled by default so - non-GNU/older Grep works). + * src/search.c, doc/geany.txt, doc/geany.html: + Fix Grep --exclude-dir example.
2010-07-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-07-06 14:01:26 UTC (rev 5091) +++ trunk/doc/geany.html 2010-07-06 14:20:12 UTC (rev 5092) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-07-02" /> +<meta name="date" content="2010-07-06" /> <style type="text/css">
/* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-07-02</td></tr> +<td>2010-07-06</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.20</td></tr> </tbody> @@ -1609,12 +1609,7 @@ out version control files.</p> <p>If you have GNU Grep >= 2.5.2 you can use the <tt class="docutils literal"><span class="pre">--exclude-dir</span></tt> argument to filter out CVS and hidden directories like <tt class="docutils literal"><span class="pre">.svn</span></tt>.</p> -<p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.?*</span> <span class="pre">--exclude-dir=CVS</span></tt></p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">The <tt class="docutils literal"><span class="pre">.?*</span></tt> glob pattern matches all directories beginning with a -dot except the current directory <tt class="docutils literal"><span class="pre">'.'</span></tt>.</p> -</div> +<p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.svn</span> <span class="pre">--exclude-dir=CVS</span></tt></p> <p>If you have an older Grep, you can try using the <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> <p>SVN Example: <tt class="docutils literal"><span class="pre">--exclude=*.svn-base</span></tt></p> @@ -6140,7 +6135,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-07-06 13:50 UTC. +Generated on: 2010-07-06 14:14 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-07-06 14:01:26 UTC (rev 5091) +++ trunk/doc/geany.txt 2010-07-06 14:20:12 UTC (rev 5092) @@ -1244,12 +1244,8 @@ If you have GNU Grep >= 2.5.2 you can use the ``--exclude-dir`` argument to filter out CVS and hidden directories like ``.svn``.
-Example: ``--exclude-dir=.?* --exclude-dir=CVS`` +Example: ``--exclude-dir=.svn --exclude-dir=CVS``
-.. note:: - The ``.?*`` glob pattern matches all directories beginning with a - dot except the current directory ``'.'``. - If you have an older Grep, you can try using the ``--exclude`` flag to filter out filenames.
Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2010-07-06 14:01:26 UTC (rev 5091) +++ trunk/src/search.c 2010-07-06 14:20:12 UTC (rev 5092) @@ -188,10 +188,8 @@ "fif_invert_results", FALSE, "check_invert"); stash_group_add_toggle_button(group, &settings.fif_recursive, "fif_recursive", FALSE, "check_recursive"); - /* default ignores hidden directories */ stash_group_add_entry(group, &settings.fif_extra_options, - "fif_extra_options", "--exclude-dir=.?*", "entry_extra"); - /* defaults to off so non-GNU/older Grep works */ + "fif_extra_options", "", "entry_extra"); stash_group_add_toggle_button(group, &settings.fif_use_extra_options, "fif_use_extra_options", FALSE, "check_extra"); stash_group_add_entry(group, &settings.fif_files,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.