remove preload option

4 files changed, 1 insertions, 27 deletions

diff --git a/xulmus/content/bookmarks.js b/xulmus/content/bookmarks.js
index dfe2b127..c7beb02a 100644
--- a/xulmus/content/bookmarks.js
+++ b/xulmus/content/bookmarks.js
@@ -247,15 +247,6 @@ function Bookmarks() //{{{
     var cache = storage.newObject("bookmark-cache", Cache, false);
     storage.addObserver("bookmark-cache", bookmarkObserver, window);
 
-    liberator.registerObserver("enter", function () {
-        if (options["preload"])
-        {
-            // Forces a load, if not already loaded but wait 10sec
-            // so most tabs should be restored and the CPU should be idle again usually
-            setTimeout(function () { liberator.callFunctionInThread(null, function () cache.bookmarks); }, 10000);
-        }
-    });
-
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// OPTIONS /////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -272,10 +263,6 @@ function Bookmarks() //{{{
             validator: Option.validateCompleter
         });
 
-    options.add(["preload"],
-        "Speed up first time history/bookmark completion",
-        "boolean", true);
-
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
diff --git a/xulmus/contrib/vim/syntax/xulmus.vim b/xulmus/contrib/vim/syntax/xulmus.vim
index 3a719078..6889b25a 100644
--- a/xulmus/contrib/vim/syntax/xulmus.vim
+++ b/xulmus/contrib/vim/syntax/xulmus.vim
@@ -59,7 +59,7 @@ syn match xulmusOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|focusconten
     \ contained nextgroup=xulmusSetMod
 syn match xulmusOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|linksearch\|lks\)\>!\="
     \ contained nextgroup=xulmusSetMod
-syn match xulmusOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|preload\|showmode\|smd\|smartcase\|scs\)\>!\="
+syn match xulmusOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|showmode\|smd\|smartcase\|scs\)\>!\="
     \ contained nextgroup=xulmusSetMod
 syn match xulmusOption "\<\%(no\|inv\)\=\%(online\|visualbell\|vb\|usermode\|um\)\>!\="
     \ contained nextgroup=xulmusSetMod
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index 385db8a6..6a18cbeb 100644
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -338,7 +338,6 @@ section:Options[option-index]
 ||'online'|| Set the \'work offline' option +
 ||'pageinfo'|| Desired info on [c]:pa[geinfo][c] +
 ||'popups'|| Where to show requested popup windows +
-||'preload'|| Speed up first time history/bookmark completion +
 ||'previouspattern'|| Patterns to use when guessing the \'previous' page in a document sequence +
 ||'repeat'|| Set the playback repeat mode +
 ||'runtimepath'|| List of directories searched for runtime files +
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
index 96cff8bc..25fa0ea7 100644
--- a/xulmus/locale/en-US/options.txt
+++ b/xulmus/locale/en-US/options.txt
@@ -572,18 +572,6 @@ Note: This option does not change the popup blocker of Songbird in any way.
 ____
 
 
-|\'nopreload'| |\'preload'|
-||'preload' 'nopreload'|| boolean (default: on)
-____
-Speed up first time history/bookmark completion
-
-History access can be quite slow for a large history. Xulmus maintains a
-cache to speed it up significantly on subsequent access. In order to
-also speed up first time access, it is cached at startup if this option
-is set (recommended).
-____
-
-
 |\'previouspattern'|
 ||'previouspattern'|| stringlist
 ____