Renamed --ignored to --skipped

beyondgrep · Jun 14, 2007 · edf9546 · edf9546
1 parent 4484844
commit edf9546
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Ack.pm b/Ack.pm
@@ -38,7 +38,7 @@ BEGIN {
         elisp       => [qw( el )],
         haskell     => [qw( hs lhs )],
         html        => [qw( htm html shtml )],
-        ignored     => q{Files, but not directories, normally ignored by ack (default: off)},
+        skipped     => q{Files, but not directories, normally skipped by ack (default: off)},
         lisp        => [qw( lisp )],
         java        => [qw( java properties )],
         js          => [qw( js )],
@@ -107,7 +107,7 @@ F<foo.pod> could be "perl" or "parrot".
 The filetype will be C<undef> if we can't determine it.  This could
 be if the file doesn't exist, or it can't be read.
 
-It will be 'ignored' if it's something that ack should always ignore,
+It will be 'skipped' if it's something that ack should always ignore,
 even under -a.
 
 =cut
@@ -117,7 +117,7 @@ use constant TEXT => 'text';
 sub filetypes {
     my $filename = shift;
 
-    return 'ignored' unless is_searchable( $filename );
+    return 'skipped' unless is_searchable( $filename );
 
     return ('make',TEXT) if $filename =~ m{$path_sep?Makefile$}io;
 

diff --git a/Changes b/Changes
@@ -11,8 +11,8 @@ NEXT
     Added a filetype of "--text", which matches any text file.  This
     is off by default, just as --binary is.
 
-    Added a filetype of "--ignored", which matches any file that
-    ack ignores, like core dumps and backup files.  It will NOT
+    Added a filetype of "--skipped", which matches any file that
+    ack skips, like core dumps and backup files.  It will NOT
     include files that are in ignored directories like blib/ and
     .svn/
 

diff --git a/ack-help-types.txt b/ack-help-types.txt
@@ -16,7 +16,6 @@ Note that some extensions may appear in multiple types.  For example,
     --[no]elisp     .el
     --[no]haskell   .hs .lhs
     --[no]html      .htm .html .shtml
-    --[no]ignored   Files, but not directories, normally ignored by ack (default: off)
     --[no]java      .java .properties
     --[no]js        .js
     --[no]jsp       .jsp .jspx .jhtm .jhtml
@@ -31,6 +30,7 @@ Note that some extensions may appear in multiple types.  For example,
     --[no]ruby      .rb .rhtml .rjs .rxml
     --[no]scheme    .scm
     --[no]shell     .sh .bash .csh .ksh .zsh
+    --[no]skipped   Files, but not directories, normally skipped by ack (default: off)
     --[no]sql       .sql .ctl
     --[no]tcl       .tcl
     --[no]tex       .tex .cls .sty

diff --git a/ack-standalone b/ack-standalone
@@ -906,7 +906,7 @@ BEGIN {
         elisp       => [qw( el )],
         haskell     => [qw( hs lhs )],
         html        => [qw( htm html shtml )],
-        ignored     => q{Files, but not directories, normally ignored by ack (default: off)},
+        skipped     => q{Files, but not directories, normally skipped by ack (default: off)},
         lisp        => [qw( lisp )],
         java        => [qw( java properties )],
         js          => [qw( js )],
@@ -958,7 +958,7 @@ use constant TEXT => 'text';
 sub filetypes {
     my $filename = shift;
 
-    return 'ignored' unless is_searchable( $filename );
+    return 'skipped' unless is_searchable( $filename );
 
     return ('make',TEXT) if $filename =~ m{$path_sep?Makefile$}io;
 

diff --git a/t/filetypes.t b/t/filetypes.t
@@ -28,14 +28,14 @@ ok(  is_filetype( '/tmp/wango/foo.handler.pod', 'perl' ), '/tmp/wango/foo.handle
 ok(  is_filetype( '/tmp/blongo/makefile', 'make' ), '/tmp/blongo/makefile is a makefile' );
 ok(  is_filetype( 'Makefile', 'make' ), 'Makefile is a makefile' );
 
-is(App::Ack::filetypes('foo.pod~'), 'ignored',
-    'correctly ignore backup file');
+is(App::Ack::filetypes('foo.pod~'), 'skipped',
+    'correctly skip backup file');
 
-is(App::Ack::filetypes('#some.pod#'), 'ignored',
-    'correctly ignore files starting and ending with hash mark');
+is(App::Ack::filetypes('#some.pod#'), 'skipped',
+    'correctly skip files starting and ending with hash mark');
 
-is(App::Ack::filetypes('core.987654321'), 'ignored',
-    'correctly ignore files named core.NNNN');
+is(App::Ack::filetypes('core.987654321'), 'skipped',
+    'correctly skip files named core.NNNN');
 
 MATCH_VIA_CONTENT: {
     my %lookups = (