branch: externals/xeft commit e7722e479ea89be20663792eeef5099272c9a97e Author: Yuan Fu <caso...@gmail.com> Commit: Yuan Fu <caso...@gmail.com>
Move the nonexcept qualifier to the correct place * xeft-module.cc (reindex_file): (query_term): --- xeft-module.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xeft-module.cc b/xeft-module.cc index f99bb62c22..36752304de 100644 --- a/xeft-module.cc +++ b/xeft-module.cc @@ -64,7 +64,6 @@ class xeft_cannot_open_file: public exception {}; static bool reindex_file (string path, string dbpath, string lang = "en", bool force = false) - EMACS_NOEXCEPT { // Check for mtime. struct stat st; @@ -148,7 +147,7 @@ reindex_file static vector<string> query_term (string term, string dbpath, int offset, int page_size, - string lang = "en") EMACS_NOEXCEPT + string lang = "en") { // See reindex_file for the reason for caching the database object. if (dbpath != cached_dbpath) @@ -323,7 +322,7 @@ NILP (emacs_env *env, emacs_value val) typedef emacs_value (*emacs_subr) (emacs_env *env, ptrdiff_t nargs, emacs_value *args, - void *data); + void *data) EMACS_NOEXCEPT; static void define_function