diff -Nru xapian-omega-1.4.4/aclocal.m4 xapian-omega-1.4.5/aclocal.m4
--- xapian-omega-1.4.4/aclocal.m4	2017-04-24 02:19:48.000000000 +0000
+++ xapian-omega-1.4.5/aclocal.m4	2017-10-16 02:32:50.000000000 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@
 [am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -332,7 +332,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -408,7 +408,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -605,7 +605,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -626,7 +626,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -648,7 +648,7 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -683,7 +683,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -733,7 +733,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -772,7 +772,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -801,7 +801,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -848,7 +848,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -867,7 +867,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -948,7 +948,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +1008,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1036,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1055,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru xapian-omega-1.4.4/atomparse.h xapian-omega-1.4.5/atomparse.h
--- xapian-omega-1.4.4/atomparse.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/atomparse.h	2017-10-16 02:32:24.000000000 +0000
@@ -28,6 +28,7 @@
     enum { OTHER, TITLE, AUTHOR, KEYWORDS, TEXT } state;
     bool in_entry, is_ignored;
     string type;
+
   public:
     AtomParser() : state(OTHER), in_entry(false), is_ignored(false) { }
     void process_text(const string &text);
diff -Nru xapian-omega-1.4.4/atomparsetest.cc xapian-omega-1.4.5/atomparsetest.cc
--- xapian-omega-1.4.4/atomparsetest.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/atomparsetest.cc	2017-10-16 02:32:24.000000000 +0000
@@ -72,19 +72,23 @@
 	AtomParser p;
 	p.parse(tests[i].html);
 	if (tests[i].dump != p.dump) {
-	    cout << "DUMP " << i << ": [" << p.dump << "] != [" << tests[i].dump << "]" << endl;
+	    cout << "DUMP " << i << ": [" << p.dump << "] != [" << tests[i].dump
+		 << "]" << endl;
 	    exit(1);
 	}
 	if (tests[i].title != p.title) {
-	    cout << "TITLE " << i << ": [" << p.title << "] != [" << tests[i].title << "]" << endl;
+	    cout << "TITLE " << i << ": [" << p.title << "] != ["
+		 << tests[i].title << "]" << endl;
 	    exit(1);
 	}
 	if (tests[i].keywords != p.keywords) {
-	    cout << "KEYWORDS " << i << ": [" << p.keywords << "] != [" << tests[i].keywords << "]" << endl;
+	    cout << "KEYWORDS " << i << ": [" << p.keywords << "] != ["
+		 << tests[i].keywords << "]" << endl;
 	    exit(1);
 	}
 	if (tests[i].author != p.author) {
-	    cout << "AUTHOR " << i << ": [" << p.author << "] != [" << tests[i].author << "]" << endl;
+	    cout << "AUTHOR " << i << ": [" << p.author << "] != ["
+		 << tests[i].author << "]" << endl;
 	    exit(1);
 	}
     }
diff -Nru xapian-omega-1.4.4/compile xapian-omega-1.4.5/compile
--- xapian-omega-1.4.4/compile	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/compile	2017-10-16 02:32:51.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -342,6 +343,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru xapian-omega-1.4.4/config.guess xapian-omega-1.4.5/config.guess
--- xapian-omega-1.4.4/config.guess	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/config.guess	2017-10-16 02:32:51.000000000 +0000
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-03-05'
+timestamp='2017-09-26'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -259,6 +259,9 @@
     *:Sortix:*:*)
 	echo ${UNAME_MACHINE}-unknown-sortix
 	exit ;;
+    *:Redox:*:*)
+	echo ${UNAME_MACHINE}-unknown-redox
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -315,15 +318,6 @@
 	exitcode=$?
 	trap '' 0
 	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit ;;
@@ -855,10 +849,6 @@
     *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
@@ -874,27 +864,12 @@
 		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -1304,14 +1279,21 @@
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
 	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
 			i386) UNAME_PROCESSOR=x86_64 ;;
 			powerpc) UNAME_PROCESSOR=powerpc64 ;;
 		    esac
 		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_PPC >/dev/null
+		then
+		    UNAME_PROCESSOR=powerpc
+		fi
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1335,16 +1317,16 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
+    NEO-*:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-*:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSX-?:NONSTOP_KERNEL:*:*)
+    NSX-*:NONSTOP_KERNEL:*:*)
 	echo nsx-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     *:NonStop-UX:*:*)
@@ -1418,16 +1400,28 @@
 	exit ;;
 esac
 
+echo "$0: unable to guess system type" >&2
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
+esac
+
 cat >&2 <<EOF
-$0: unable to guess system type
 
 This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1459,7 +1453,7 @@
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff -Nru xapian-omega-1.4.4/config.sub xapian-omega-1.4.5/config.sub
--- xapian-omega-1.4.4/config.sub	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/config.sub	2017-10-16 02:32:51.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-04-02'
+timestamp='2017-09-26'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -229,9 +229,6 @@
 	-ptx*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
 		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
 	-psos*)
 		os=-psos
 		;;
@@ -1259,6 +1256,9 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	x64)
+		basic_machine=x86_64-pc
+		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@@ -1366,8 +1366,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+	# First match some system type aliases that might get confused
+	# with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@@ -1387,9 +1387,9 @@
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# First accept the basic system types.
+	# Now accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
+	# Each alternative MUST end in a * to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1829,7 +1829,7 @@
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff -Nru xapian-omega-1.4.4/configure xapian-omega-1.4.5/configure
--- xapian-omega-1.4.4/configure	2017-04-24 02:19:49.000000000 +0000
+++ xapian-omega-1.4.5/configure	2017-10-16 02:32:50.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xapian-omega 1.4.4.
+# Generated by GNU Autoconf 2.69 for xapian-omega 1.4.5.
 #
 # Report bugs to <https://xapian.org/bugs>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='xapian-omega'
 PACKAGE_TARNAME='xapian-omega'
-PACKAGE_VERSION='1.4.4'
-PACKAGE_STRING='xapian-omega 1.4.4'
+PACKAGE_VERSION='1.4.5'
+PACKAGE_STRING='xapian-omega 1.4.5'
 PACKAGE_BUGREPORT='https://xapian.org/bugs'
 PACKAGE_URL=''
 
@@ -1361,7 +1361,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xapian-omega 1.4.4 to adapt to many kinds of systems.
+\`configure' configures xapian-omega 1.4.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1431,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xapian-omega 1.4.4:";;
+     short | recursive ) echo "Configuration of xapian-omega 1.4.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1556,7 +1556,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xapian-omega configure 1.4.4
+xapian-omega configure 1.4.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2240,7 +2240,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xapian-omega $as_me 1.4.4, which was
+It was created by xapian-omega $as_me 1.4.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3104,7 +3104,7 @@
 
 # Define the identity of the package.
  PACKAGE='xapian-omega'
- VERSION='1.4.4'
+ VERSION='1.4.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18844,7 +18844,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xapian-omega $as_me 1.4.4, which was
+This file was extended by xapian-omega $as_me 1.4.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18910,7 +18910,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xapian-omega config.status 1.4.4
+xapian-omega config.status 1.4.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru xapian-omega-1.4.4/configure.ac xapian-omega-1.4.5/configure.ac
--- xapian-omega-1.4.4/configure.ac	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/configure.ac	2017-10-16 02:32:24.000000000 +0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-m4_define([project_version], [1.4.4])
+m4_define([project_version], [1.4.5])
 AC_INIT([xapian-omega], project_version, [https://xapian.org/bugs])
 AC_PREREQ([2.63])
 AM_INIT_AUTOMAKE([1.11 -Wportability subdir-objects tar-ustar no-dist-gzip dist-xz])
diff -Nru xapian-omega-1.4.4/date.h xapian-omega-1.4.5/date.h
--- xapian-omega-1.4.4/date.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/date.h	2017-10-16 02:32:24.000000000 +0000
@@ -23,8 +23,8 @@
 #include <xapian.h>
 #include <string>
 
-Xapian::Query date_range_filter(const std::string & date_start,
-			  const std::string & date_end,
-			  const std::string & date_span);
+Xapian::Query date_range_filter(const std::string& date_start,
+				const std::string& date_end,
+				const std::string& date_span);
 
 #endif // OMEGA_INCLUDED_DATE_H
diff -Nru xapian-omega-1.4.4/datetime.cc xapian-omega-1.4.5/datetime.cc
--- xapian-omega-1.4.4/datetime.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/datetime.cc	2017-10-16 02:32:24.000000000 +0000
@@ -108,4 +108,3 @@
 
     return timegm(&t);
 }
-
diff -Nru xapian-omega-1.4.4/debian/changelog xapian-omega-1.4.5/debian/changelog
--- xapian-omega-1.4.4/debian/changelog	2017-07-01 07:09:38.000000000 +0000
+++ xapian-omega-1.4.5/debian/changelog	2017-11-01 01:24:19.000000000 +0000
@@ -1,3 +1,9 @@
+xapian-omega (1.4.5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Olly Betts <olly@survex.com>  Wed, 01 Nov 2017 14:24:19 +1300
+
 xapian-omega (1.4.4-2) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru xapian-omega-1.4.4/depcomp xapian-omega-1.4.5/depcomp
--- xapian-omega-1.4.4/depcomp	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/depcomp	2017-10-16 02:32:51.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru xapian-omega-1.4.4/docs/cgiparams.html xapian-omega-1.4.5/docs/cgiparams.html
--- xapian-omega-1.4.4/docs/cgiparams.html	2017-04-24 02:22:21.000000000 +0000
+++ xapian-omega-1.4.5/docs/cgiparams.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>CGI parameters to Omega</title>
 <style type="text/css">
 
diff -Nru xapian-omega-1.4.4/docs/encodings.html xapian-omega-1.4.5/docs/encodings.html
--- xapian-omega-1.4.4/docs/encodings.html	2017-04-24 02:22:21.000000000 +0000
+++ xapian-omega-1.4.5/docs/encodings.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Character Encodings</title>
 <style type="text/css">
 
diff -Nru xapian-omega-1.4.4/docs/index.html xapian-omega-1.4.5/docs/index.html
--- xapian-omega-1.4.4/docs/index.html	2017-04-24 02:22:21.000000000 +0000
+++ xapian-omega-1.4.5/docs/index.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Omega Documentation</title>
 <style type="text/css">
 
diff -Nru xapian-omega-1.4.4/docs/Makefile.in xapian-omega-1.4.5/docs/Makefile.in
--- xapian-omega-1.4.4/docs/Makefile.in	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/docs/Makefile.in	2017-10-16 02:32:51.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru xapian-omega-1.4.4/docs/omegascript.html xapian-omega-1.4.5/docs/omegascript.html
--- xapian-omega-1.4.4/docs/omegascript.html	2017-04-24 02:22:22.000000000 +0000
+++ xapian-omega-1.4.5/docs/omegascript.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>OmegaScript</title>
 <style type="text/css">
 
@@ -503,7 +503,8 @@
 <dt>$error</dt>
 <dd>error message (e.g. if a database wouldn't open, or the query couldn't
 be parsed, or a Xapian exception has been thrown) or empty if there
-wasn't an error.</dd>
+wasn't an error.  You can set the error message yourself by using
+<tt class="docutils literal">$seterror</tt>.</dd>
 <dt>$field{NAME[,DOCID]}</dt>
 <dd><p class="first">lookup field <tt class="docutils literal">NAME</tt> in document <tt class="docutils literal">DOCID</tt>.  If <tt class="docutils literal">DOCID</tt> is omitted
 then the current hit is used (which only works inside <tt class="docutils literal">$hitlist</tt>).</p>
@@ -546,7 +547,7 @@
 <dd>name of current format (as set by CGI parameter``FMT``, or the default)</dd>
 <dt>$freq{term}</dt>
 <dd>frequency of a term</dd>
-<dt>$highlight{TEXT,LIST,[OPEN,[CLOSE]]}</dt>
+<dt>$highlight{TEXT,LIST[,OPEN[,CLOSE]]}</dt>
 <dd>html escape string (&lt;&gt;&amp;, etc) and highlight any terms from <tt class="docutils literal">LIST</tt>
 that appear in <tt class="docutils literal">TEXT</tt> by enclosing them in <tt class="docutils literal">OPEN</tt> and <tt class="docutils literal">CLOSE</tt>.
 If <tt class="docutils literal">OPEN</tt> is specified, but close is omitted, <tt class="docutils literal">CLOSE</tt> defaults to
@@ -555,8 +556,8 @@
 <tt class="docutils literal">&lt;b <span class="pre">style=&quot;color:XXXXX;background-color:#YYYYYY&quot;&gt;</span></tt> (where <tt class="docutils literal">YYYYYY</tt>
 cycles through <tt class="docutils literal">ffff66</tt> <tt class="docutils literal">99ff99</tt> <tt class="docutils literal">99ffff</tt> <tt class="docutils literal">ff66ff</tt> <tt class="docutils literal">ff9999</tt>
 <tt class="docutils literal">990000</tt> <tt class="docutils literal">009900</tt> <tt class="docutils literal">996600</tt> <tt class="docutils literal">006699</tt> <tt class="docutils literal">990099</tt> and <tt class="docutils literal">XXXXX</tt>
-is <tt class="docutils literal">black</tt> is <tt class="docutils literal">YYYYYY</tt> contains an <tt class="docutils literal">f</tt>, and otherwise <tt class="docutils literal">white</tt>)
-and <tt class="docutils literal">CLOSE</tt> is <tt class="docutils literal">&lt;/b&gt;</tt>.</dd>
+is <tt class="docutils literal">black</tt> if <tt class="docutils literal">YYYYYY</tt> contains an <tt class="docutils literal">f</tt>, and otherwise <tt class="docutils literal">white</tt>)
+and <tt class="docutils literal">CLOSE</tt> is set to <tt class="docutils literal">&lt;/b&gt;</tt>.</dd>
 <dt>$hit</dt>
 <dd>MSet index of current doc (first document in MSet is 0, so if
 you want to number the hits 1, 2, 3, ... use <tt class="docutils literal"><span class="pre">$add{$hit,1}</span></tt>).</dd>
@@ -652,7 +653,7 @@
 to get rid of them.</p>
 </dd>
 <dt>$match{REGEX,STRING[,OPTIONS]}</dt>
-<dd><p class="first">peform a regex match using Perl-compatible regular expressions. Returns
+<dd><p class="first">perform a regex match using Perl-compatible regular expressions. Returns
 true if a match is found, else it returns an empty string.</p>
 <p>The optional OPTIONS argument can contain zero or more of the letters
 <tt class="docutils literal">imsx</tt>, which have the same meanings as the corresponding Perl regexp
@@ -806,7 +807,8 @@
 <li>flag_partial</li>
 <li>flag_phrase</li>
 <li>flag_pure_not</li>
-<li>flag_spelling_correction</li>
+<li>flag_spelling_correction (see <tt class="docutils literal">$suggestion</tt> for suggested
+correction)</li>
 <li>flag_synonym</li>
 <li>flag_wildcard</li>
 </ul>
@@ -822,6 +824,13 @@
 <p class="last">Similarly, <tt class="docutils literal">XFOO:stemmer</tt> specifies the stemmer to use for field
 <tt class="docutils literal">XFOO</tt>, with <tt class="docutils literal">stemmer</tt> providing a default.</p>
 </dd>
+<dt>$seterror{ERROR_MESSAGE}</dt>
+<dd><p class="first">set error message for the current execution, which can also be looked
+up using <tt class="docutils literal">$error</tt>.</p>
+<p>Using <tt class="docutils literal">$seterror</tt> error early in template prevents running the query.</p>
+<p class="last">For example, <tt class="docutils literal">$seterror</tt> can be used when the user enters a wrong
+parameter in the search.</p>
+</dd>
 <dt>$setrelevant{docids}</dt>
 <dd>add documents into the RSet</dd>
 <dt>$setmap{MAP,NAME1,VALUE1,...}</dt>
@@ -921,10 +930,10 @@
 &quot;STRING&quot; whether N is positive, negative or zero.</p>
 </dd>
 <dt>$suggestion</dt>
-<dd>if <tt class="docutils literal">$set{spelling,true}</tt> was done before the query was parsed, then
-<tt class="docutils literal">$suggestion</tt> will return any suggested spelling corrected version
-of the query string.  If there are no spelling corrections, it will
-return an empty string.</dd>
+<dd>if <tt class="docutils literal">$set{flag_spelling_correction,true}</tt> was done before the query
+was parsed, then <tt class="docutils literal">$suggestion</tt> will return any suggested spelling
+corrected version of the query string.  If there are no spelling
+corrections, it will return an empty string.</dd>
 <dt>$terms[{PREFIX}]</dt>
 <dd>list of query terms matching the current hit.  The ability to specify a
 prefix was added in Omega 1.3.5.  If no prefix is specified (i.e.
diff -Nru xapian-omega-1.4.4/docs/omegascript.rst xapian-omega-1.4.5/docs/omegascript.rst
--- xapian-omega-1.4.4/docs/omegascript.rst	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/docs/omegascript.rst	2017-10-16 02:32:24.000000000 +0000
@@ -173,7 +173,8 @@
 $error
 	error message (e.g. if a database wouldn't open, or the query couldn't
         be parsed, or a Xapian exception has been thrown) or empty if there
-	wasn't an error.
+	wasn't an error.  You can set the error message yourself by using
+        ``$seterror``.
 
 $field{NAME[,DOCID]}
 	lookup field ``NAME`` in document ``DOCID``.  If ``DOCID`` is omitted
@@ -221,7 +222,7 @@
 $freq{term}
 	frequency of a term
 
-$highlight{TEXT,LIST,[OPEN,[CLOSE]]}
+$highlight{TEXT,LIST[,OPEN[,CLOSE]]}
 	html escape string (<>&, etc) and highlight any terms from ``LIST``
         that appear in ``TEXT`` by enclosing them in ``OPEN`` and ``CLOSE``.
         If ``OPEN`` is specified, but close is omitted, ``CLOSE`` defaults to
@@ -230,8 +231,8 @@
 	``<b style="color:XXXXX;background-color:#YYYYYY">`` (where ``YYYYYY``
         cycles through ``ffff66`` ``99ff99`` ``99ffff`` ``ff66ff`` ``ff9999``
         ``990000`` ``009900`` ``996600`` ``006699`` ``990099`` and ``XXXXX``
-        is ``black`` is ``YYYYYY`` contains an ``f``, and otherwise ``white``)
-        and ``CLOSE`` is ``</b>``.
+        is ``black`` if ``YYYYYY`` contains an ``f``, and otherwise ``white``)
+        and ``CLOSE`` is set to ``</b>``.
 
 $hit
 	MSet index of current doc (first document in MSet is 0, so if
@@ -344,7 +345,7 @@
 	to get rid of them.
 
 $match{REGEX,STRING[,OPTIONS]}
-	peform a regex match using Perl-compatible regular expressions. Returns
+	perform a regex match using Perl-compatible regular expressions. Returns
 	true if a match is found, else it returns an empty string.
 
 	The optional OPTIONS argument can contain zero or more of the letters
@@ -524,7 +525,8 @@
 	* flag_partial
 	* flag_phrase
 	* flag_pure_not
-	* flag_spelling_correction
+	* flag_spelling_correction (see ``$suggestion`` for suggested
+	  correction)
 	* flag_synonym
 	* flag_wildcard
 
@@ -542,6 +544,15 @@
 	Similarly, ``XFOO:stemmer`` specifies the stemmer to use for field
 	``XFOO``, with ``stemmer`` providing a default.
 
+$seterror{ERROR_MESSAGE}
+	set error message for the current execution, which can also be looked
+	up using ``$error``.
+
+	Using ``$seterror`` error early in template prevents running the query.
+
+	For example, ``$seterror`` can be used when the user enters a wrong
+	parameter in the search.
+
 $setrelevant{docids}
 	add documents into the RSet
 
@@ -649,10 +660,10 @@
 	"STRING" whether N is positive, negative or zero.
 
 $suggestion
-	if ``$set{spelling,true}`` was done before the query was parsed, then
-	``$suggestion`` will return any suggested spelling corrected version
-	of the query string.  If there are no spelling corrections, it will
-	return an empty string.
+        if ``$set{flag_spelling_correction,true}`` was done before the query
+        was parsed, then ``$suggestion`` will return any suggested spelling
+        corrected version of the query string.  If there are no spelling
+        corrections, it will return an empty string.
 
 $terms[{PREFIX}]
         list of query terms matching the current hit.  The ability to specify a
diff -Nru xapian-omega-1.4.4/docs/overview.html xapian-omega-1.4.5/docs/overview.html
--- xapian-omega-1.4.4/docs/overview.html	2017-04-24 02:22:22.000000000 +0000
+++ xapian-omega-1.4.5/docs/overview.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Omega overview</title>
 <style type="text/css">
 
diff -Nru xapian-omega-1.4.4/docs/quickstart.html xapian-omega-1.4.5/docs/quickstart.html
--- xapian-omega-1.4.4/docs/quickstart.html	2017-04-24 02:22:21.000000000 +0000
+++ xapian-omega-1.4.5/docs/quickstart.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Basic instructions</title>
 <style type="text/css">
 
diff -Nru xapian-omega-1.4.4/docs/scriptindex.html xapian-omega-1.4.5/docs/scriptindex.html
--- xapian-omega-1.4.4/docs/scriptindex.html	2017-04-24 02:22:21.000000000 +0000
+++ xapian-omega-1.4.5/docs/scriptindex.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Index scripts</title>
 <style type="text/css">
 
@@ -432,7 +432,9 @@
 replaced (or deleted if the new record is otherwise empty).  You should
 also index the field as a boolean field using the same prefix so that
 the old record can be found.  In Omega, Q is reserved for use as the
-prefix of a unique term.</dd>
+prefix of a unique term.  You can use <tt class="docutils literal">unique</tt> at most once in each
+index script (this is only enforced since Omega 1.4.5, but older
+versions didn't handle multiple instances usefully).</dd>
 <dt>value=VALUESLOT</dt>
 <dd>add as a Xapian document value in slot VALUESLOT.  Values can be used
 for collapsing equivalent documents, sorting the MSet, etc.  If you
diff -Nru xapian-omega-1.4.4/docs/scriptindex.rst xapian-omega-1.4.5/docs/scriptindex.rst
--- xapian-omega-1.4.4/docs/scriptindex.rst	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/docs/scriptindex.rst	2017-10-16 02:32:24.000000000 +0000
@@ -83,7 +83,9 @@
 	replaced (or deleted if the new record is otherwise empty).  You should
 	also index the field as a boolean field using the same prefix so that
 	the old record can be found.  In Omega, Q is reserved for use as the
-	prefix of a unique term.
+	prefix of a unique term.  You can use ``unique`` at most once in each
+        index script (this is only enforced since Omega 1.4.5, but older
+        versions didn't handle multiple instances usefully).
 
 value=VALUESLOT
 	add as a Xapian document value in slot VALUESLOT.  Values can be used
diff -Nru xapian-omega-1.4.4/docs/termprefixes.html xapian-omega-1.4.5/docs/termprefixes.html
--- xapian-omega-1.4.4/docs/termprefixes.html	2017-04-24 02:22:21.000000000 +0000
+++ xapian-omega-1.4.5/docs/termprefixes.html	2017-10-16 02:34:40.000000000 +0000
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Term Prefixes</title>
 <style type="text/css">
 
diff -Nru xapian-omega-1.4.4/extra/omegascript.vim xapian-omega-1.4.5/extra/omegascript.vim
--- xapian-omega-1.4.4/extra/omegascript.vim	2017-04-24 02:21:54.000000000 +0000
+++ xapian-omega-1.4.5/extra/omegascript.vim	2017-10-16 02:34:27.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:	OmegaScript
 " Maintainer:	Xapian developers <xapian-discuss@lists.xapian.org>
 " URL:		https://xapian.org/
-" Version:	1.4.4
+" Version:	1.4.5
 
 " To install: place this file in ~/.vim/syntax/omegascript.vim
 " and then create or add the following lines, without the "'s commenting
@@ -52,7 +52,7 @@
 syn region omegaScriptComment matchgroup=omegaScriptCommentStart start="${" end="}" contains=omegaScriptCommentBracePair,omegaScriptComment keepend extend
 
 " All keywords which can take parameters
-syn keyword omegaScriptKW contained add addfilter allterms and cgi cgilist chr contains csv date def div emptydocs env eq field filesize filterterms find freq ge gt highlight hitlist hostname html htmlstrip httpheader if include json jsonarray le length list log lookup lower lt map match max min mod mul muldiv ne nice not opt or ord pack prettyterm prettyurl query range record relevant set setmap setrelevant slice snippet split sub substr terms topterms transform truncate uniq unpack unstem upper url value
+syn keyword omegaScriptKW contained add addfilter allterms and cgi cgilist chr contains csv date def div emptydocs env eq field filesize filterterms find freq ge gt highlight hitlist hostname html htmlstrip httpheader if include json jsonarray le length list log lookup lower lt map match max min mod mul muldiv ne nice not opt or ord pack prettyterm prettyurl query range record relevant set seterror setmap setrelevant slice snippet split sub substr terms topterms transform truncate uniq unpack unstem upper url value
 
 " All keywords which can take no parameters
 syn keyword omegaScriptCommandKW contained add allterms cgiparams collapsed dbname dbsize defaultop emptydocs error filters fmt hit hitsperpage id last lastpage msize msizeexact msizelower msizeupper now percentage query querydescription queryterms record relevant relevants score setrelevant stoplist suggestion terms thispage time topdoc topterms version weight
diff -Nru xapian-omega-1.4.4/failed.h xapian-omega-1.4.5/failed.h
--- xapian-omega-1.4.4/failed.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/failed.h	2017-10-16 02:32:24.000000000 +0000
@@ -71,8 +71,8 @@
 
     void clear() {
 	for (auto i = db.metadata_keys_begin("U");
-		  i != db.metadata_keys_end("U");
-		  ++i) {
+	     i != db.metadata_keys_end("U");
+	     ++i) {
 	    db.set_metadata(*i, std::string());
 	}
     }
diff -Nru xapian-omega-1.4.4/install-sh xapian-omega-1.4.5/install-sh
--- xapian-omega-1.4.4/install-sh	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/install-sh	2017-10-16 02:32:51.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru xapian-omega-1.4.4/jsonescape.h xapian-omega-1.4.5/jsonescape.h
--- xapian-omega-1.4.4/jsonescape.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/jsonescape.h	2017-10-16 02:32:24.000000000 +0000
@@ -1,5 +1,4 @@
-
-/* @file jsonescape.h
+/** @file jsonescape.h
  * @brief JSON escape a string
  */
 /* Copyright (C) 2013 Olly Betts
diff -Nru xapian-omega-1.4.4/Makefile.in xapian-omega-1.4.5/Makefile.in
--- xapian-omega-1.4.4/Makefile.in	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/Makefile.in	2017-10-16 02:32:51.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1784,7 +1784,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -1809,7 +1809,7 @@
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -1827,7 +1827,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -1837,7 +1837,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff -Nru xapian-omega-1.4.4/md5.h xapian-omega-1.4.5/md5.h
--- xapian-omega-1.4.4/md5.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/md5.h	2017-10-16 02:32:24.000000000 +0000
@@ -15,8 +15,8 @@
  * will fill a supplied 16-byte array with the digest.
  */
 
-#ifndef MD5_H
-#define MD5_H
+#ifndef OMEGA_INCLUDED_MD5_H
+#define OMEGA_INCLUDED_MD5_H
 
 /* Minor tweaks for use from Omega:
  *
@@ -25,6 +25,7 @@
  * + MD5Transform is an internal helper so prototype moved to md5.cc.
  * + Removed MD5_CTX.
  * + Changed MD5Context.in to uint32_t instead of unsigned char.
+ * + Added "OMEGA_INCLUDED_" prefix to header guard macro.
  */
 
 // To get uint32_t:
@@ -42,4 +43,4 @@
 	       unsigned len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 
-#endif /* !MD5_H */
+#endif /* OMEGA_INCLUDED_MD5_H */
diff -Nru xapian-omega-1.4.4/missing xapian-omega-1.4.5/missing
--- xapian-omega-1.4.4/missing	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/missing	2017-10-16 02:32:51.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru xapian-omega-1.4.4/myhtmlparse.h xapian-omega-1.4.5/myhtmlparse.h
--- xapian-omega-1.4.4/myhtmlparse.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/myhtmlparse.h	2017-10-16 02:32:24.000000000 +0000
@@ -50,16 +50,16 @@
 	void parse_html(const string &text, const string &charset_,
 			bool charset_from_meta_);
 	void ignore_metarobots() { ignoring_metarobots = true; }
-	MyHtmlParser() :
-		pending_space(0),
-		in_script_tag(false),
-		in_style_tag(false),
-		indexing_allowed(true),
-		ignoring_metarobots(false),
-		charset_from_meta(false),
-		description_as_sample(false),
-		created(time_t(-1)),
-		target(&dump) { }
+	MyHtmlParser()
+	    : pending_space(0),
+	      in_script_tag(false),
+	      in_style_tag(false),
+	      indexing_allowed(true),
+	      ignoring_metarobots(false),
+	      charset_from_meta(false),
+	      description_as_sample(false),
+	      created(time_t(-1)),
+	      target(&dump) { }
 
 	void reset() {
 	    pending_space = 0;
diff -Nru xapian-omega-1.4.4/NEWS xapian-omega-1.4.5/NEWS
--- xapian-omega-1.4.4/NEWS	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/NEWS	2017-10-16 02:32:24.000000000 +0000
@@ -1,3 +1,49 @@
+Omega 1.4.5 (2017-10-16):
+
+documentation:
+
+* Direct users towards $set{flag_spelling_correction,true} rather than the
+  deprecated $set{spelling,true} (which is slated for removal in 1.5.0).
+
+* Fix typo in docs.
+
+indexers:
+
+* omindex:
+
+  + Check file size before calling libmagic to get the mime type, since
+    reading the file size is a much cheaper check and we can skip the
+    libmagic test if the file is empty or larger than the specified
+    maximum size.  Patch from caiyulun.
+
+* scriptindex:
+
+  + Reject index scripts with multiple "unique" actions.  We don't handle this
+    case sensibly, and it doesn't seem like it really has a use, so better to
+    give an error for people who do this inadvertently.
+
+omega:
+
+* New $seterror command to set the error message.  Implemented by Gaurav Arora.
+
+* Make $highlight more efficient.  Patch from Vivek Pal.
+
+templates:
+
+* query: Use $prettyurl for the URL shown at the end of each match (previously
+  we only used it on the URL shown as a fallback when the document has no
+  title).  Split off from changes by Vivek Pal in
+  https://github.com/xapian/xapian/pull/161
+
+testsuite:
+
+* omegatest: Tell faketime to freeze the clock - previously the clock ran on
+  from the specified fake time, and on a slow and/or heavily loaded machine a
+  test taking more than a second might fail due to this.
+
+* Start adding feature tests for scriptindex (so far, checking that specifying
+  multiple 'unique' actions results in an error).
+
 Omega 1.4.4 (2017-04-19):
 
 indexers:
@@ -63,7 +109,7 @@
 
   + Recognise application/x-rpm as alternative type since libmagic reports this
     rather than application/x-redhat-package-manager.
-    
+
   + Use official MIME type application/vnd.debian.binary-package for debian
     packages.  We used to map .deb and .udeb to application/x-debian-package,
     but in 2014 (after we added that support for .deb) an official type was
diff -Nru xapian-omega-1.4.4/omega.cc xapian-omega-1.4.5/omega.cc
--- xapian-omega-1.4.4/omega.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/omega.cc	2017-10-16 02:32:24.000000000 +0000
@@ -114,7 +114,7 @@
     option["stemmer"] = DEFAULT_STEM_LANGUAGE;
 
     // FIXME: set cout to linebuffered not stdout.  Or just flush regularly...
-    //setvbuf(stdout, NULL, _IOLBF, 0);
+    // setvbuf(stdout, NULL, _IOLBF, 0);
 
     const char * method = getenv("REQUEST_METHOD");
     if (method == NULL) {
diff -Nru xapian-omega-1.4.4/omegatest xapian-omega-1.4.5/omegatest
--- xapian-omega-1.4.4/omegatest	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/omegatest	2017-10-16 02:32:24.000000000 +0000
@@ -244,10 +244,10 @@
 
 # If faketime is available and works, test cases where the output depends on
 # "now".
-if [ "`faketime '1980-12-08' date +%Y 2>&1`" = 1980 ] ; then
+if [ "`faketime -f '1980-12-08 00:00:00' date +%Y 2>&1`" = 1980 ] ; then
     TZ=UTC
     export TZ
-    FAKETIME=faketime
+    FAKETIME='faketime -f'
     FAKE_NOW='2015-11-28 06:07:08'
     qtestcase 'VALUE_RANGE 0 20151127060709 20151128060708' DATEVALUE=0 SPAN=1
 
@@ -392,7 +392,7 @@
 testcase 'Discover-List||' 'Search Type=Discover-List'
 
 printf '$cgiparams' > "$TEST_TEMPLATE"
-# We can't test the "no cgi parmeters" case via testcase, as it passes a
+# We can't test the "no cgi parameters" case via testcase, as it passes a
 # "dummy" parameter if there aren't any real ones.
 #testcase ""
 testcase "" =1
@@ -402,6 +402,44 @@
 testcase "${tab}abc" =1 abc=1
 testcase "${tab}abc${tab}def" =1 abc=1 def=7
 
+# Feature tests for $highlight{}.
+printf '$highlight{$cgi{text},$cgi{list}}' > "$TEST_TEMPLATE"
+testcase 'A <b style="color:black;background-color:#ffff66">list</b> of <b style="color:black;background-color:#99ff99">words</b>' list="list${tab}words" text="A list of words"
+
+printf '$highlight{$cgi{text},$cgi{list},$cgi{open}}' > "$TEST_TEMPLATE"
+testcase 'A list of <b>words</b>' list="words" text="A list of words" open="<b>"
+testcase 'A list of <span>words</span>' list="words" text="A list of words" open="<span>"
+
+printf '$highlight{$cgi{text},$cgi{list},$cgi{open},$cgi{close}}' > "$TEST_TEMPLATE"
+testcase 'A list of <b>words</b>' list="words" text="A list of words" open="<b>" close="</b>"
+testcase 'A *list* of *words*' list="words${tab}list" text="A list of words" open="*" close="*"
+
+# Test setting seterror and mset size, should not run the query after setting error.
+printf '$if{$cgi{ERR},$seterror{$cgi{ERR}}}$msize$if{$error,!$error!}' > "$TEST_TEMPLATE"
+testcase '1' P=text
+testcase '0!boo!' P=text ERR=boo
+
+# Test arguments inside seterror are evaluated
+printf '$set{error,sample error}$seterror{$opt{error}}$msize$if{$error,!$error!}' > "$TEST_TEMPLATE"
+testcase '0!sample error!' P=text
+
+# Test error message doesn't get sent through HTML entity encoding.
+printf '$seterror{{ "error": true, "error_message": "Parameter cannot be > 9" }}$if{$error,$error}' > "$TEST_TEMPLATE"
+testcase '{ "error": true, "error_message": "Parameter cannot be > 9" }' P=text
+
+# Test msize when error set after running query, should not affect running of query.
+printf '$last$if{$cgi{ERR},$seterror{$cgi{ERR}}}$msize$if{$error,!$error!}' > "$TEST_TEMPLATE"
+testcase '11' P=text
+testcase '11!boo!' P=text ERR=boo
+
+# Feature tests of scriptindex.
+printf 'uuid : boolean=Q unique=Q\nguid : boolean=G unique=G' > "$TEST_INDEXSCRIPT"
+rm -rf "$TEST_DB"
+if $SCRIPTINDEX "$TEST_DB" "$TEST_INDEXSCRIPT" > /dev/null < /dev/null ; then
+    echo "scriptindex didn't reject 'unique' action being used more than once"
+    failed=`expr $failed + 1`
+fi
+
 rm "$OMEGA_CONFIG_FILE" "$TEST_INDEXSCRIPT" "$TEST_TEMPLATE"
 rm -rf "$TEST_DB"
 if [ "$failed" = 0 ] ; then
diff -Nru xapian-omega-1.4.4/omindex.1 xapian-omega-1.4.5/omindex.1
--- xapian-omega-1.4.4/omindex.1	2017-04-24 02:22:13.000000000 +0000
+++ xapian-omega-1.4.5/omindex.1	2017-10-16 02:34:36.000000000 +0000
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH OMINDEX "1" "April 2017" "xapian-omega 1.4.4" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.5.
+.TH OMINDEX "1" "October 2017" "xapian-omega 1.4.5" "User Commands"
 .SH NAME
 omindex \- Index static website data via the filesystem
 .SH SYNOPSIS
diff -Nru xapian-omega-1.4.4/omindex.cc xapian-omega-1.4.5/omindex.cc
--- xapian-omega-1.4.4/omindex.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/omindex.cc	2017-10-16 02:32:24.000000000 +0000
@@ -93,14 +93,7 @@
 	urlterm = hash_long_term(urlterm, MAX_SAFE_TERM_LENGTH);
 
     string mimetype = mimetype_from_ext(mime_map, ext);
-    if (mimetype.empty()) {
-	mimetype = d.get_magic_mimetype();
-	if (mimetype.empty()) {
-	    skip(urlterm, file.substr(root.size()), "Unknown extension and unrecognised format",
-		 d.get_size(), d.get_mtime(), SKIP_SHOW_FILENAME);
-	    return;
-	}
-    } else if (mimetype == "ignore") {
+    if (mimetype == "ignore") {
 	return;
     } else if (mimetype == "skip") {
 	// Ignore mimetype, skipped mimetype should not be quietly ignored.
@@ -111,13 +104,7 @@
 	return;
     }
 
-    if (verbose)
-	cout << "Indexing \"" << file.substr(root.size()) << "\" as "
-	     << mimetype << " ... ";
-
-    // Only check the file size if we recognise the extension to avoid a call
-    // to stat()/lstat() for files we definitely can't handle when readdir()
-    // tells us the file type.
+    // Check the file size.
     off_t size = d.get_size();
     if (size == 0) {
 	skip(urlterm, file.substr(root.size()), "Zero-sized file",
@@ -133,6 +120,21 @@
 	return;
     }
 
+    // If we didn't get the mime type from the extension, call libmagic to get
+    // it.
+    if (mimetype.empty()) {
+	mimetype = d.get_magic_mimetype();
+	if (mimetype.empty()) {
+	    skip(urlterm, file.substr(root.size()), "Unknown extension and unrecognised format",
+		 d.get_size(), d.get_mtime(), SKIP_SHOW_FILENAME);
+	    return;
+	}
+    }
+
+    if (verbose)
+	cout << "Indexing \"" << file.substr(root.size()) << "\" as "
+	     << mimetype << " ... ";
+
     Xapian::Document new_doc;
 
     // Use `file` as the basis, as we don't want URL encoding in these terms,
diff -Nru xapian-omega-1.4.4/omindex-list.1 xapian-omega-1.4.5/omindex-list.1
--- xapian-omega-1.4.4/omindex-list.1	2017-04-24 02:22:12.000000000 +0000
+++ xapian-omega-1.4.5/omindex-list.1	2017-10-16 02:34:35.000000000 +0000
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH OMINDEX-LIST "1" "April 2017" "xapian-omega 1.4.4" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.5.
+.TH OMINDEX-LIST "1" "October 2017" "xapian-omega 1.4.5" "User Commands"
 .SH NAME
 omindex-list \- List URLs of documents indexed by omindex
 .SH SYNOPSIS
diff -Nru xapian-omega-1.4.4/query.cc xapian-omega-1.4.5/query.cc
--- xapian-omega-1.4.4/query.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/query.cc	2017-10-16 02:32:24.000000000 +0000
@@ -29,6 +29,7 @@
 #include <iostream>
 #include <map>
 #include <set>
+#include <unordered_map>
 #include <vector>
 
 #include <cassert>
@@ -651,25 +652,38 @@
     return res;
 }
 
-// FIXME split list into hash or map and use that rather than linear lookup?
-static int word_in_list(const string& word, const string& list)
-{
-    string::size_type split = 0, split2;
-    int count = 0;
-    while ((split2 = list.find('\t', split)) != string::npos) {
-	if (word.size() == split2 - split) {
-	    if (memcmp(word.data(), list.data() + split, word.size()) == 0)
-		return count;
-	}
-	split = split2 + 1;
-	++count;
-    }
-    if (word.size() == list.size() - split) {
-	if (memcmp(word.data(), list.data() + split, word.size()) == 0)
-	    return count;
+class WordList {
+    static string prev_list;
+    static unordered_map<string, int> word_to_occurrence;
+  public:
+    void build_word_map(const string& list) {
+	// Don't build map again if passed list of terms is same as before.
+	if (prev_list == list) return;
+	word_to_occurrence.clear();
+	string::size_type split = 0, split2;
+	int word_index = 0;
+	string word;
+	while ((split2 = list.find('\t', split)) != string::npos) {
+	    word = list.substr(split, split2 - split);
+	    if (word_to_occurrence.emplace(make_pair(word, word_index)).second)
+		++word_index;
+	    split = split2 + 1;
+	}
+	word = list.substr(split, list.size() - split);
+	if (word_to_occurrence.emplace(make_pair(word, word_index)).second)
+	    ++word_index;
+	prev_list = list;
+    }
+
+    int word_in_list(const string& word) {
+	auto it = word_to_occurrence.find(word);
+	if (it == word_to_occurrence.end()) return -1;
+	return it->second;
     }
-    return -1;
-}
+};
+
+string WordList::prev_list;
+unordered_map<string, int> WordList::word_to_occurrence;
 
 // Not a character in an identifier
 inline static bool
@@ -752,11 +766,13 @@
 	}
 	j = term_end;
 	term = Xapian::Unicode::tolower(term);
-	int match = word_in_list(term, list);
+	WordList w;
+	w.build_word_map(list);
+	int match = w.word_in_list(term);
 	if (match == -1) {
 	    string stem = "Z";
 	    stem += (*stemmer)(term);
-	    match = word_in_list(stem, list);
+	    match = w.word_in_list(stem);
 	}
 	if (match >= 0) {
 	    res += html_escape(string(l, first.raw() - l));
@@ -969,6 +985,7 @@
 CMD_relevants,
 CMD_score,
 CMD_set,
+CMD_seterror,
 CMD_setmap,
 CMD_setrelevant,
 CMD_slice,
@@ -1100,6 +1117,7 @@
 T(relevants,	   0, 0, N, Q), // return list of relevant documents
 T(score,	   0, 0, N, 0), // score (0-10) of current hit
 T(set,		   2, 2, N, 0), // set option value
+T(seterror,	   1, 1, N, 0), // set error_msg, setting it early stops query execution
 T(setmap,	   1, N, N, 0), // set map of option values
 T(setrelevant,	   0, 1, N, Q), // set rset
 T(slice,	   2, 2, N, 0), // slice a list using a second list
@@ -1992,6 +2010,9 @@
 	    case CMD_set:
 		option[args[0]] = args[1];
 		break;
+	    case CMD_seterror:
+		error_msg = args[0];
+		break;
 	    case CMD_setmap: {
 		string base = args[0] + ',';
 		if (args.size() % 2 != 1)
diff -Nru xapian-omega-1.4.4/query.h xapian-omega-1.4.5/query.h
--- xapian-omega-1.4.4/query.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/query.h	2017-10-16 02:32:24.000000000 +0000
@@ -1,7 +1,7 @@
 /** @file query.h
  * @brief: Omega functions for running queries, etc.
- *
- * Copyright (C) 2007,2011,2016 Olly Betts
+ */
+/* Copyright (C) 2007,2011,2016 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru xapian-omega-1.4.4/runfilter.cc xapian-omega-1.4.5/runfilter.cc
--- xapian-omega-1.4.4/runfilter.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/runfilter.cc	2017-10-16 02:32:24.000000000 +0000
@@ -1,7 +1,7 @@
 /** @file runfilter.cc
  * @brief Run an external filter and capture its output in a std::string.
- *
- * Copyright (C) 2003,2006,2007,2009,2010,2011,2013,2015 Olly Betts
+ */
+/* Copyright (C) 2003,2006,2007,2009,2010,2011,2013,2015 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru xapian-omega-1.4.4/scriptindex.1 xapian-omega-1.4.5/scriptindex.1
--- xapian-omega-1.4.4/scriptindex.1	2017-04-24 02:22:14.000000000 +0000
+++ xapian-omega-1.4.5/scriptindex.1	2017-10-16 02:34:36.000000000 +0000
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH SCRIPTINDEX "1" "April 2017" "xapian-omega 1.4.4" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.5.
+.TH SCRIPTINDEX "1" "October 2017" "xapian-omega 1.4.5" "User Commands"
 .SH NAME
 scriptindex \- index arbitrary data as described by an index script
 .SH SYNOPSIS
diff -Nru xapian-omega-1.4.4/scriptindex.cc xapian-omega-1.4.5/scriptindex.cc
--- xapian-omega-1.4.4/scriptindex.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/scriptindex.cc	2017-10-16 02:32:24.000000000 +0000
@@ -3,7 +3,7 @@
  * Copyright 1999,2000,2001 BrightStation PLC
  * Copyright 2001 Sam Liddicott
  * Copyright 2001,2002 Ananova Ltd
- * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2014,2015 Olly Betts
+ * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2014,2015,2017 Olly Betts
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -155,6 +155,7 @@
     }
     string line;
     size_t line_no = 0;
+    bool had_unique = false;
     while (getline(script, line)) {
 	++line_no;
 	vector<string> fields;
@@ -332,6 +333,13 @@
 			actions.push_back(Action(code, val));
 			break;
 		    case Action::UNIQUE:
+			if (had_unique) {
+			    cout << filename << ':' << line_no
+				<< ": Index action 'unique' used more than "
+				   "once" << endl;
+			    exit(1);
+			}
+			had_unique = true;
 			if (boolmap.find(val) == boolmap.end())
 			    boolmap[val] = Action::UNIQUE;
 			actions.push_back(Action(code, val));
diff -Nru xapian-omega-1.4.4/svgparse.h xapian-omega-1.4.5/svgparse.h
--- xapian-omega-1.4.4/svgparse.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/svgparse.h	2017-10-16 02:32:24.000000000 +0000
@@ -26,6 +26,7 @@
 class SvgParser : public HtmlParser {
     enum { OTHER, TEXT, METADATA, TITLE, KEYWORDS, AUTHOR } state;
     string dc_tag;
+
   public:
     SvgParser() : state(OTHER) { }
     void process_text(const string &text);
diff -Nru xapian-omega-1.4.4/templates/query xapian-omega-1.4.5/templates/query
--- xapian-omega-1.4.4/templates/query	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/templates/query	2017-10-16 02:32:24.000000000 +0000
@@ -108,7 +108,7 @@
 </td>
 <td><b><a href="$html{$field{url}}">$html{$or{$field{caption},$field{title},$prettyurl{$field{url}},Untitled}}</a></b><br>
 <small>$snippet{$field{sample}}</small><br>
-<a href="$html{$field{url}}">$html{$field{url}}</a><br>
+<a href="$html{$field{url}}">$html{$prettyurl{$field{url}}}</a><br>
 <small>
 matching:
 <i>$list{$map{$terms,$html{$prettyterm{$_}}},</i>$. <i>,</i> and <i>}</i></small>${for lynx:}<p></td></tr>}
diff -Nru xapian-omega-1.4.4/test-driver xapian-omega-1.4.5/test-driver
--- xapian-omega-1.4.4/test-driver	2017-04-24 02:19:50.000000000 +0000
+++ xapian-omega-1.4.5/test-driver	2017-10-16 02:32:51.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -143,6 +143,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru xapian-omega-1.4.4/tmpdir.cc xapian-omega-1.4.5/tmpdir.cc
--- xapian-omega-1.4.4/tmpdir.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/tmpdir.cc	2017-10-16 02:32:24.000000000 +0000
@@ -1,7 +1,7 @@
 /** @file tmpdir.cc
  * @brief create a temporary directory securely
- *
- * Copyright (C) 2007,2011,2016 Olly Betts
+ */
+/* Copyright (C) 2007,2011,2016 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru xapian-omega-1.4.4/tmpdir.h xapian-omega-1.4.5/tmpdir.h
--- xapian-omega-1.4.4/tmpdir.h	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/tmpdir.h	2017-10-16 02:32:24.000000000 +0000
@@ -1,7 +1,7 @@
 /** @file tmpdir.h
  * @brief create a temporary directory securely
- *
- * Copyright (C) 2011,2014 Olly Betts
+ */
+/* Copyright (C) 2011,2014 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef XAPIAN_OMEGA_INCLUDED_TMPDIR_H
-#define XAPIAN_OMEGA_INCLUDED_TMPDIR_H
+#ifndef OMEGA_INCLUDED_TMPDIR_H
+#define OMEGA_INCLUDED_TMPDIR_H
 
 #include <string>
 
@@ -67,4 +67,4 @@
  */
 void remove_tmpdir();
 
-#endif // XAPIAN_OMEGA_INCLUDED_TMPDIR_H
+#endif // OMEGA_INCLUDED_TMPDIR_H
diff -Nru xapian-omega-1.4.4/utf8convert.cc xapian-omega-1.4.5/utf8convert.cc
--- xapian-omega-1.4.4/utf8convert.cc	2017-04-24 02:19:20.000000000 +0000
+++ xapian-omega-1.4.5/utf8convert.cc	2017-10-16 02:32:24.000000000 +0000
@@ -1,6 +1,6 @@
 /* utf8convert.cc: convert a string to UTF-8 encoding.
  *
- * Copyright (C) 2006,2007,2008,2010,2013 Olly Betts
+ * Copyright (C) 2006,2007,2008,2010,2013,2017 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -170,10 +170,10 @@
 	size_t start = 0;
 	for (string::const_iterator i = text.begin(); i != text.end(); ++i) {
 	    static const unsigned cp1252_to_unicode[32] = {
-		0x20ac,    129, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
-		0x02c6, 0x2030, 0x0160, 0x2039, 0x0152,    141, 0x017d,    143,
-		   144, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
-		0x02dc, 0x2122, 0x0161, 0x203a, 0x0153,    157, 0x017e, 0x0178
+		0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
+		0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f,
+		0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
+		0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178
 	    };
 	    unsigned ch = static_cast<unsigned char>(*i);
 	    if (ch - 128 < sizeof(cp1252_to_unicode) / sizeof(*cp1252_to_unicode))
diff -Nru xapian-omega-1.4.4/xapian-omega.spec xapian-omega-1.4.5/xapian-omega.spec
--- xapian-omega-1.4.4/xapian-omega.spec	2017-04-24 02:20:12.000000000 +0000
+++ xapian-omega-1.4.5/xapian-omega.spec	2017-10-16 02:33:15.000000000 +0000
@@ -5,7 +5,7 @@
 
 Summary: A CGI search frontend and indexers built on Xapian
 Name: xapian-omega
-Version: 1.4.4
+Version: 1.4.5
 Release: 1
 License: GPL
 Vendor: xapian.org