Merge branch 'master' of https://github.com/burntsushi/ripgrep

Author: aswild

Cargo.lock

@@ -431,3 +431,4 @@ The following is a list of known translations of ripgrep's documentation. These
 are unofficially maintained and may not be up to date.
 
 * [Chinese](https://github.com/chinanf-boy/ripgrep-zh#%E6%9B%B4%E6%96%B0-)
+* [Spanish](https://github.com/UltiRequiem/traducciones/tree/master/ripgrep)

README.md

@@ -1213,7 +1213,7 @@ between supported regex engines depending on the features used in a pattern on
 a best effort basis.
 
 Note that the 'pcre2' engine is an optional ripgrep feature. If PCRE2 wasn't
-including in your build of ripgrep, then using this flag will result in ripgrep
+included in your build of ripgrep, then using this flag will result in ripgrep
 printing an error message and exiting.
 
 This overrides previous uses of --pcre2 and --auto-hybrid-regex flags.
@@ -1452,6 +1452,10 @@ Search hidden files and directories. By default, hidden files and directories
 are skipped. Note that if a hidden file or a directory is whitelisted in an
 ignore file, then it will be searched even if this flag isn't provided.
 
+A file or directory is considered hidden if its base name starts with a dot
+character ('.'). On operating systems which support a `hidden` file attribute,
+like Windows, files with this attribute are also considered hidden.
+
 This flag can be disabled with --no-hidden.
 "
     );
@@ -1990,6 +1994,9 @@ fn flag_no_ignore_dot(args: &mut Vec<RGArg>) {
         "\
 Don't respect .ignore files.
 
+This does *not* affect whether ripgrep will ignore files and directories
+whose names begin with a dot. For that, see --hidden.
+
 This flag can be disabled with the --ignore-dot flag.
 "
     );

crates/core/app.rs

@@ -325,9 +325,10 @@ impl<W: WriteColor> SearchWorker<W> {
         } else {
             self.config.binary_implicit.clone()
         };
-        self.searcher.set_binary_detection(bin);
-
         let path = subject.path();
+        log::trace!("{}: binary detection: {:?}", path.display(), bin);
+
+        self.searcher.set_binary_detection(bin);
         if subject.is_stdin() {
             self.search_reader(path, io::stdin().lock())
         } else if self.should_preprocess(path) {

crates/core/search.rs

@@ -140,6 +140,7 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ("md", &["*.markdown", "*.md", "*.mdown", "*.mkdn"]),
     ("meson", &["meson.build", "meson_options.txt"]),
     ("minified", &["*.min.html", "*.min.css", "*.min.js"]),
+    ("mint", &["*.mint"]),
     ("mk", &["mkfile"]),
     ("ml", &["*.ml"]),
     ("msbuild", &[