diff options
author | Enrico Tassi <gareuselesinge@debian.org> | 2015-11-13 11:31:34 +0100 |
---|---|---|
committer | Enrico Tassi <gareuselesinge@debian.org> | 2015-11-13 11:31:34 +0100 |
commit | 2280477a96e19ba5060de2d48dcc8fd7c8079d22 (patch) | |
tree | 074182834cb406d1304aec4233718564a9c06ba1 /toplevel/search.ml | |
parent | 0aa2544d04dbd4b6ee665b551ed165e4fb02d2fa (diff) |
Imported Upstream version 8.5~beta3+dfsg
Diffstat (limited to 'toplevel/search.ml')
-rw-r--r-- | toplevel/search.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/toplevel/search.ml b/toplevel/search.ml index 59283edf..9e67eef0 100644 --- a/toplevel/search.ml +++ b/toplevel/search.ml @@ -32,7 +32,7 @@ module SearchBlacklist = let key = ["Search";"Blacklist"] let title = "Current search blacklist : " let member_message s b = - str ("Search blacklist does "^(if b then "" else "not ")^"include "^s) + str "Search blacklist does " ++ (if b then mt () else str "not ") ++ str "include " ++ str s let synchronous = true end) @@ -253,7 +253,8 @@ let interface_search flags = let regexp = try Str.regexp s with e when Errors.noncritical e -> - Errors.error ("Invalid regexp: " ^ s) + Errors.errorlabstrm "Search.interface_search" + (str "Invalid regexp: " ++ str s) in extract_flags ((regexp, b) :: name) tpe subtpe mods blacklist l | (Type_Pattern s, b) :: l -> @@ -271,7 +272,8 @@ let interface_search flags = let id = try Nametab.full_name_module qid with Not_found -> - Errors.error ("Module " ^ path ^ " not found.") + Errors.errorlabstrm "Search.interface_search" + (str "Module " ++ str path ++ str " not found.") in extract_flags name tpe subtpe ((id, b) :: mods) blacklist l | (Include_Blacklist, b) :: l -> |