HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert (most of) last 2 commits as Grep's --exclude-dir=.?* doesn't seem to be working as expected.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5092 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-07-06 14:20:12 +00:00
parent ab124475a6
commit 67537a9918
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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>

13
doc/geany.html
View File

@ -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 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
<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 @@ 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 &gt;= 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 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
<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>

6
doc/geany.txt
View File

@ -1244,11 +1244,7 @@ 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=.?* --exclude-dir=CVS``
.. note::
The ``.?*`` glob pattern matches all directories beginning with a
dot except the current directory ``'.'``.
Example: ``--exclude-dir=.svn --exclude-dir=CVS``
If you have an older Grep, you can try using the ``--exclude`` flag
to filter out filenames.

4
src/search.c
View File

@ -188,10 +188,8 @@ static void init_prefs(void)
"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,