SF.net SVN: geany:[5091] trunk

[ntrel at users.sourceforge.net]

Revision: 5091
          http://geany.svn.sourceforge.net/geany/?rev=5091&view=rev
Author:   ntrel
Date:     2010-07-06 14:01:26 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
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).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/search.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-07-06 13:54:49 UTC (rev 5090)
+++ trunk/ChangeLog	2010-07-06 14:01:26 UTC (rev 5091)
@@ -3,6 +3,10 @@
  * 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).
 
 
 2010-07-05  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2010-07-06 13:54:49 UTC (rev 5090)
+++ trunk/src/search.c	2010-07-06 14:01:26 UTC (rev 5091)
@@ -188,8 +188,10 @@
 		"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", "", "entry_extra");
+		"fif_extra_options", "--exclude-dir=.?*", "entry_extra");
+	/* defaults to off so non-GNU/older Grep works */
 	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,
@@ -1441,6 +1443,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.