diff -Nru recoll-1.26.0/common/cstr.h recoll-1.26.1/common/cstr.h --- recoll-1.26.0/common/cstr.h 2019-09-04 06:02:25.000000000 +0000 +++ recoll-1.26.1/common/cstr.h 2019-10-25 14:36:42.000000000 +0000 @@ -79,7 +79,7 @@ DEF_CSTR(dj_keyfn, "filename"); DEF_CSTR(dj_keyauthor, "author"); DEF_CSTR(dj_keymd, "modificationdate"); -// charset and mimetype are explicitely blocked from going into the doc meta +// charset and mimetype are explicitly blocked from going into the doc meta DEF_CSTR(dj_keycharset, "charset"); DEF_CSTR(dj_keymt, "mimetype"); diff -Nru recoll-1.26.0/common/unacpp.cpp recoll-1.26.1/common/unacpp.cpp --- recoll-1.26.0/common/unacpp.cpp 2019-09-04 06:02:25.000000000 +0000 +++ recoll-1.26.1/common/unacpp.cpp 2019-10-25 14:36:42.000000000 +0000 @@ -92,7 +92,7 @@ // sharp s folds to ss but lowercases to itself, and greek final sigma // folds to sigma. So an input containing one of these characters // would wrongly detected as containing upper case. We now handle a -// few special cases explicitely, by folding them before performing +// few special cases explicitly, by folding them before performing // the lowercasing. There are actually quite a few other cases of // lowercase being transformed by casefolding, check Unicode // CaseFolding.txt for occurrences of SMALL. One more step towards diff -Nru recoll-1.26.0/configure recoll-1.26.1/configure --- recoll-1.26.0/configure 2019-10-14 13:15:01.000000000 +0000 +++ recoll-1.26.1/configure 2019-10-25 14:46:33.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Recoll 1.26.0. +# Generated by GNU Autoconf 2.69 for Recoll 1.26.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='Recoll' PACKAGE_TARNAME='recoll' -PACKAGE_VERSION='1.26.0' -PACKAGE_STRING='Recoll 1.26.0' +PACKAGE_VERSION='1.26.1' +PACKAGE_STRING='Recoll 1.26.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1410,7 +1410,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 Recoll 1.26.0 to adapt to many kinds of systems. +\`configure' configures Recoll 1.26.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1485,7 +1485,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Recoll 1.26.0:";; + short | recursive ) echo "Configuration of Recoll 1.26.1:";; esac cat <<\_ACEOF @@ -1651,7 +1651,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Recoll configure 1.26.0 +Recoll configure 1.26.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2224,7 +2224,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Recoll $as_me 1.26.0, which was +It was created by Recoll $as_me 1.26.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3093,7 +3093,7 @@ # Define the identity of the package. PACKAGE='recoll' - VERSION='1.26.0' + VERSION='1.26.1' # Some tools Automake needs. @@ -18406,7 +18406,7 @@ LIBXAPIAN=`$XAPIAN_CONFIG --libs` # The --static thing fails with older Xapians. Happily enough they don't # need it either (because there are no needed libraries (no uuid and we -# deal explicitely with libz) +# deal explicitly with libz) LIBXAPIANSTATICEXTRA=`$XAPIAN_CONFIG --static --libs 2> /dev/null` # Workaround for problem in xapian-config in some versions: wrongly lists # libstdc++.la in the lib list @@ -20057,7 +20057,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Recoll $as_me 1.26.0, which was +This file was extended by Recoll $as_me 1.26.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20123,7 +20123,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Recoll config.status 1.26.0 +Recoll config.status 1.26.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru recoll-1.26.0/configure.ac recoll-1.26.1/configure.ac --- recoll-1.26.0/configure.ac 2019-10-12 13:08:05.000000000 +0000 +++ recoll-1.26.1/configure.ac 2019-10-25 14:36:42.000000000 +0000 @@ -311,7 +311,7 @@ LIBXAPIAN=`$XAPIAN_CONFIG --libs` # The --static thing fails with older Xapians. Happily enough they don't # need it either (because there are no needed libraries (no uuid and we -# deal explicitely with libz) +# deal explicitly with libz) LIBXAPIANSTATICEXTRA=`$XAPIAN_CONFIG --static --libs 2> /dev/null` # Workaround for problem in xapian-config in some versions: wrongly lists # libstdc++.la in the lib list diff -Nru recoll-1.26.0/debian/changelog recoll-1.26.1/debian/changelog --- recoll-1.26.0/debian/changelog 2019-10-14 06:30:00.000000000 +0000 +++ recoll-1.26.1/debian/changelog 2019-10-25 14:48:00.000000000 +0000 @@ -1,3 +1,10 @@ +recoll (1.26.1-1~ppa1~xenial1) xenial; urgency=low + + * Fix the default history size, 1.26.0 disabled the search history by default + * Fix memorizing the temp file warning when changed from dialog. + + -- Jean-Francois Dockes Fri, 25 Oct 2019 16:48:00 +0200 + recoll (1.26.0-1~ppa1~xenial1) xenial; urgency=low * Windows: aspell support. diff -Nru recoll-1.26.0/doc/man/recoll.conf.5 recoll-1.26.1/doc/man/recoll.conf.5 --- recoll-1.26.0/doc/man/recoll.conf.5 2019-09-04 06:02:25.000000000 +0000 +++ recoll-1.26.1/doc/man/recoll.conf.5 2019-10-25 14:36:42.000000000 +0000 @@ -61,7 +61,7 @@ Space-separated list of files or directories to recursively index. Default to ~ (indexes $HOME). You can use symbolic links in the list, they will be followed, -independantly of the value of the followLinks variable. +independently of the value of the followLinks variable. .TP .BI "monitordirs = "string Space-separated list of files or directories to monitor for @@ -117,12 +117,12 @@ file, not in a subsection. Can contain files and directories. The database and configuration directories will automatically be added. The expressions are matched using 'fnmatch(3)' with the FNM_PATHNAME flag set by -default. This means that '/' characters must be matched explicitely. You +default. This means that '/' characters must be matched explicitly. You can set 'skippedPathsFnmPathname' to 0 to disable the use of FNM_PATHNAME (meaning that '/*/dir3' will match '/dir1/dir2/dir3'). The default value contains the usual mount point for removable media to remind you that it is a bad idea to have Recoll work on these (esp. with the monitor: media -gets indexed on mount, all data gets erased on unmount). Explicitely +gets indexed on mount, all data gets erased on unmount). Explicitly adding '/media/xxx' to the 'topdirs' variable will override this. .TP diff -Nru recoll-1.26.0/filters/rclpdf.py recoll-1.26.1/filters/rclpdf.py --- recoll-1.26.0/filters/rclpdf.py 2019-10-11 12:48:27.000000000 +0000 +++ recoll-1.26.1/filters/rclpdf.py 2019-10-25 14:36:42.000000000 +0000 @@ -454,7 +454,7 @@ prefix,nm = metanm.split(":") fullnm = "{%s}%s" % (rdfdesc.nsmap[prefix], nm) except: - fullnm = nm + fullnm = metanm text = rdfdesc.get(fullnm) # Should we set empty values ? if text: diff -Nru recoll-1.26.0/index/indexer.cpp recoll-1.26.1/index/indexer.cpp --- recoll-1.26.0/index/indexer.cpp 2019-09-04 06:02:25.000000000 +0000 +++ recoll-1.26.1/index/indexer.cpp 2019-10-25 14:36:42.000000000 +0000 @@ -74,7 +74,7 @@ // Determine if this is likely the first time that the user runs // indexing. We don't look at the xapiandb as this may have been -// explicitely removed for valid reasons, but at the indexing status +// explicitly removed for valid reasons, but at the indexing status // file, which should be unexistant-or-empty only before any indexing // has ever run bool ConfIndexer::runFirstIndexing() diff -Nru recoll-1.26.0/index/recollindex.cpp recoll-1.26.1/index/recollindex.cpp --- recoll-1.26.0/index/recollindex.cpp 2019-09-04 06:02:25.000000000 +0000 +++ recoll-1.26.1/index/recollindex.cpp 2019-10-25 14:36:42.000000000 +0000 @@ -875,7 +875,7 @@ LOGINFO("recollindex: reexecuting with -n after initial full " "pass\n"); // Note that -n will be inside the reexec when we come - // back, but the monitor will explicitely strip it before + // back, but the monitor will explicitly strip it before // starting a config change exec to ensure that we do a // purging pass in this latter case (full restart). o_reexec->reexec(); diff -Nru recoll-1.26.0/internfile/myhtmlparse.cpp recoll-1.26.1/internfile/myhtmlparse.cpp --- recoll-1.26.0/internfile/myhtmlparse.cpp 2019-09-04 06:02:25.000000000 +0000 +++ recoll-1.26.1/internfile/myhtmlparse.cpp 2019-10-25 14:36:42.000000000 +0000 @@ -254,7 +254,7 @@ } // Compress whitespace and suppress newlines -// Note that we independantly add some newlines to the output text in the +// Note that we independently add some newlines to the output text in the // tag processing code. Like this, the preview looks a bit more like what a // browser would display. // We keep whitespace inside 
 tags
diff -Nru recoll-1.26.0/Makefile.in recoll-1.26.1/Makefile.in
--- recoll-1.26.0/Makefile.in	2019-10-14 13:15:01.000000000 +0000
+++ recoll-1.26.1/Makefile.in	2019-10-25 14:46:33.000000000 +0000
@@ -2267,8 +2267,8 @@
 	-rm -f query/wasaparse.cpp
 	-rm -f query/wasaparse.hpp
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@MAKEPYTHONCHM_FALSE@@MAKEPYTHON_FALSE@@MAKEQT_FALSE@clean-local:
 @MAKEPYTHONCHM_FALSE@@MAKEPYTHON_FALSE@@MAKEQT_FALSE@install-exec-local:
+@MAKEPYTHONCHM_FALSE@@MAKEPYTHON_FALSE@@MAKEQT_FALSE@clean-local:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-librclLTLIBRARIES \
diff -Nru recoll-1.26.0/qtgui/guiutils.cpp recoll-1.26.1/qtgui/guiutils.cpp
--- recoll-1.26.0/qtgui/guiutils.cpp	2019-10-11 12:48:27.000000000 +0000
+++ recoll-1.26.1/qtgui/guiutils.cpp	2019-10-25 14:38:08.000000000 +0000
@@ -137,7 +137,7 @@
     SETTING_RW(prefs.ssearchAutoPhraseThreshPC, 
                "/Recoll/prefs/ssearchAutoPhraseThreshPC", Double, 2.0);
     SETTING_RW(prefs.respagesize, "/Recoll/prefs/reslist/pagelen", Int, 8);
-    SETTING_RW(prefs.historysize, "/Recoll/prefs/historysize", Int, 0);
+    SETTING_RW(prefs.historysize, "/Recoll/prefs/historysize", Int, -1);
     SETTING_RW(prefs.collapseDuplicates, 
                "/Recoll/prefs/reslist/collapseDuplicates", Bool, false);
     SETTING_RW(prefs.showResultsAsTable, 
@@ -306,6 +306,7 @@
     SETTING_RW(prefs.showTrayIcon, "/Recoll/prefs/showTrayIcon", Bool, false);
     SETTING_RW(prefs.closeToTray, "/Recoll/prefs/closeToTray", Bool, false);
     SETTING_RW(prefs.trayMessages, "/Recoll/prefs/trayMessages", Bool, false);
+    // See qxtconfirmationmessage. Needs to be -1 for the dialog to show.
     SETTING_RW(prefs.showTempFileWarning, "Recoll/prefs/showTempFileWarning",
                Int, -1);
 
diff -Nru recoll-1.26.0/qtgui/guiutils.h recoll-1.26.1/qtgui/guiutils.h
--- recoll-1.26.0/qtgui/guiutils.h	2019-10-11 12:48:27.000000000 +0000
+++ recoll-1.26.1/qtgui/guiutils.h	2019-10-25 14:36:42.000000000 +0000
@@ -143,6 +143,7 @@
     bool closeToTray{false};
     bool trayMessages{false};
     
+    // See qxtconfirmationmessage. Needs to be -1 for the dialog to show
     int showTempFileWarning;
     
     // Advanced search window clause list state
diff -Nru recoll-1.26.0/qtgui/rclm_view.cpp recoll-1.26.1/qtgui/rclm_view.cpp
--- recoll-1.26.0/qtgui/rclm_view.cpp	2019-10-02 16:46:40.000000000 +0000
+++ recoll-1.26.1/qtgui/rclm_view.cpp	2019-10-25 14:36:42.000000000 +0000
@@ -375,6 +375,11 @@
         confirm.setSettingsPath("Recoll/prefs");
         confirm.setOverrideSettingsKey("showTempFileWarning");
         confirm.exec();
+        // Pita: need to keep the prefs struct in sync, else the value
+        // will be clobbered on program exit.
+        QSettings settings("Recoll.org", "recoll");
+        prefs.showTempFileWarning =
+            settings.value("Recoll/prefs/showTempFileWarning").toInt();
     }
 
     // If we are not called with a page number (which would happen for a call
diff -Nru recoll-1.26.0/qtgui/ssearch_w.cpp recoll-1.26.1/qtgui/ssearch_w.cpp
--- recoll-1.26.0/qtgui/ssearch_w.cpp	2019-10-13 13:56:48.000000000 +0000
+++ recoll-1.26.1/qtgui/ssearch_w.cpp	2019-10-25 14:36:42.000000000 +0000
@@ -253,6 +253,7 @@
 // nothing was typed. So we disable the completion if a
 bool SSearch::eventFilter(QObject *target, QEvent *event)
 {
+    Q_UNUSED(target);
     LOGDEB1("SSearch::eventFilter: event\n");
     if (event->type() != QEvent::KeyPress) {
         return false;
diff -Nru recoll-1.26.0/qtgui/uiprefs.ui recoll-1.26.1/qtgui/uiprefs.ui
--- recoll-1.26.0/qtgui/uiprefs.ui	2019-10-11 12:48:27.000000000 +0000
+++ recoll-1.26.1/qtgui/uiprefs.ui	2019-10-25 14:36:42.000000000 +0000
@@ -617,7 +617,7 @@
           
            
             
-             Sort snippets by page number (default: by weigth).
+             Sort snippets by page number (default: by weight).
             
             
              false
diff -Nru recoll-1.26.0/qtgui/uiprefs_w.cpp recoll-1.26.1/qtgui/uiprefs_w.cpp
--- recoll-1.26.0/qtgui/uiprefs_w.cpp	2019-10-11 12:48:27.000000000 +0000
+++ recoll-1.26.1/qtgui/uiprefs_w.cpp	2019-10-25 14:36:42.000000000 +0000
@@ -154,6 +154,7 @@
     closeToTrayCB->setChecked(prefs.closeToTray);
     trayMessagesCB->setChecked(prefs.trayMessages);
     
+    // See qxtconfirmationmessage. Needs to be -1 for the dialog to show.
     showTempFileWarningCB->setChecked(prefs.showTempFileWarning == -1);
     anchorTamilHackCB->setChecked(settings.value("anchorSpcHack", 0).toBool());
     previewHtmlCB->setChecked(prefs.previewHtml);
diff -Nru recoll-1.26.0/utils/execmd.h recoll-1.26.1/utils/execmd.h
--- recoll-1.26.0/utils/execmd.h	2019-09-04 06:02:25.000000000 +0000
+++ recoll-1.26.1/utils/execmd.h	2019-10-25 14:36:42.000000000 +0000
@@ -266,7 +266,7 @@
  *  - Other program state: application-dependant. Any external cleanup
  *    (temp files etc.) must be performed by the application. ReExec()
  *    duplicates the atexit() function to make this easier, but the
- *    ReExec().atexit() calls must be done explicitely, this is not automatic
+ *    ReExec().atexit() calls must be done explicitly, this is not automatic
  *
  * In short, this is usable in reasonably controlled situations and if there
  * are no security issues involved, but this does not perform miracles.
diff -Nru recoll-1.26.0/utils/fstreewalk.h recoll-1.26.1/utils/fstreewalk.h
--- recoll-1.26.0/utils/fstreewalk.h	2019-09-04 06:02:25.000000000 +0000
+++ recoll-1.26.1/utils/fstreewalk.h	2019-10-25 14:36:42.000000000 +0000
@@ -117,7 +117,7 @@
     /** Set the ignored paths list */
     bool setSkippedPaths(const vector &patterns);
 
-    /** Test if path/name should be skipped. This can be used independantly of
+    /** Test if path/name should be skipped. This can be used independently of
       * an actual tree walk */
     bool inSkippedPaths(const string& path, bool ckparents = false);
     bool inSkippedNames(const string& name);
diff -Nru recoll-1.26.0/VERSION recoll-1.26.1/VERSION
--- recoll-1.26.0/VERSION	2019-10-14 13:13:51.000000000 +0000
+++ recoll-1.26.1/VERSION	2019-10-25 14:45:20.000000000 +0000
@@ -1 +1 @@
-1.26.0
+1.26.1