Revision: 5141 http://geany.svn.sourceforge.net/geany/?rev=5141&view=rev Author: ntrel Date: 2010-08-11 14:39:15 +0000 (Wed, 11 Aug 2010)
Log Message: ----------- r5089:5092
Modified Paths: -------------- branches/Geany-0_19_1/ChangeLog branches/Geany-0_19_1/doc/geany.html branches/Geany-0_19_1/doc/geany.txt branches/Geany-0_19_1/src/search.c
Modified: branches/Geany-0_19_1/ChangeLog =================================================================== --- branches/Geany-0_19_1/ChangeLog 2010-08-11 14:34:37 UTC (rev 5140) +++ branches/Geany-0_19_1/ChangeLog 2010-08-11 14:39:15 UTC (rev 5141) @@ -1,3 +1,9 @@ +2010-07-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c, doc/geany.txt, doc/geany.html: + Fix Grep --exclude-dir example. + + 2010-07-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* doc/geany.txt, doc/geany.html:
Modified: branches/Geany-0_19_1/doc/geany.html =================================================================== --- branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:34:37 UTC (rev 5140) +++ branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:39:15 UTC (rev 5141) @@ -1596,13 +1596,15 @@ <div class="section"> <h4><a class="toc-backref" href="#id65" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> <p>When using the <em>Recurse in subfolders</em> option with a directory that's -under version control, you can set the <em>Extra options</em> field to use -grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> +under version control, you can set the <em>Extra options</em> field to filter +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=.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> -<p>The --exclude argument only matches the file name part, not the path. 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> +<p>The --exclude argument only matches the file name part, not the path.</p> </div> </div> <div class="section"> @@ -6096,7 +6098,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-08-11 14:31 UTC. +Generated on: 2010-08-11 14:36 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: branches/Geany-0_19_1/doc/geany.txt =================================================================== --- branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:34:37 UTC (rev 5140) +++ branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:39:15 UTC (rev 5141) @@ -1229,18 +1229,22 @@ ```````````````````````````````````
When using the *Recurse in subfolders* option with a directory that's -under version control, you can set the *Extra options* field to use -grep's ``--exclude`` flag to filter out filenames. +under version control, you can set the *Extra options* field to filter +out version control files.
+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=.svn --exclude-dir=CVS`` + +If you have an older Grep, you can try using the ``--exclude`` flag +to filter out filenames. + SVN Example: ``--exclude=*.svn-base``
-The --exclude argument only matches the file name part, not the path. If -you have GNU Grep >= 2.5.2 you can use the ``--exclude-dir`` argument to -filter out CVS and hidden directories like ``.svn``. +The --exclude argument only matches the file name part, not the path.
-Example: ``--exclude-dir=.* --exclude-dir=CVS``
- Replace ^^^^^^^
Modified: branches/Geany-0_19_1/src/search.c =================================================================== --- branches/Geany-0_19_1/src/search.c 2010-08-11 14:34:37 UTC (rev 5140) +++ branches/Geany-0_19_1/src/search.c 2010-08-11 14:39:15 UTC (rev 5141) @@ -1447,6 +1447,7 @@ /* finally add the arguments(files to be searched) */ if (strstr(argv_prefix[1], "r")) /* recursive option set */ { + /* Use '.' so we get relative paths in the output */ argv_prefix[i++] = g_strdup("."); argv_prefix[i++] = NULL; argv = argv_prefix;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.