remove preload option

2025-12-20 23:47:58 +01:00 · 2009-04-30 08:47:48 +02:00
parent 324597c8a7
commit cb74c7f40c
10 changed files with 11 additions and 56 deletions
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -2,6 +2,7 @@ Continuous donations:
 * Daniel Bainton (web hosting)

 2009:
+* Pixel G
 * Joel Rosario
 * Alvaro Novo
 * Robert Heckel
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -1,9 +1,13 @@
 2009-XX-XX:
-    * version 2.1 (probably)
+    * version 2.1
+    * massively speed up :open completions
+    * TabMixPlus (and other tab extensions) should work much better now
+      together with vimperator unless you :set guioptions+=[nN]
+    * remove 'preload' option. You can fake it by some custom javascript in your init file
    * add 'encoding'
    * add 'hintinputs'
    * add :silent
-    * add $MY_VIMPERATORRC
+    * add $MY_VIMPERATORRC // TODO: I still don't like this --mst
    * add ' and " local marks
    * add "w" and "W" Normal mode mappings for symmetry with o/O and t/T
    * add :messclear
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -133,6 +133,8 @@ function Bookmarks() //{{{
            return root;
        }

+        // since we don't use a threaded bookmark loading (by set preload)
+        // anymore, is this loading synchronization still needed? --mst
        let loading = false;
        this.load = function load()
        {
@@ -247,15 +249,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 +265,6 @@ function Bookmarks() //{{{
            validator: Option.validateCompleter
        });

-    options.add(["preload"],
-        "Speed up first time history/bookmark completion",
-        "boolean", true);
-
    /////////////////////////////////////////////////////////////////////////////}}}
    ////////////////////// MAPPINGS ////////////////////////////////////////////////
    /////////////////////////////////////////////////////////////////////////////{{{
--- a/vimperator/contrib/vim/syntax/vimperator.vim
+++ b/vimperator/contrib/vim/syntax/vimperator.vim
@@ -57,7 +57,7 @@ syn match vimperatorOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|focusco
    \ contained nextgroup=vimperatorSetMod
 syn match vimperatorOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|linksearch\|lks\)\>!\="
    \ contained nextgroup=vimperatorSetMod
-syn match vimperatorOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|preload\|showmode\|smd\|smartcase\|scs\)\>!\="
+syn match vimperatorOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|showmode\|smd\|smartcase\|scs\)\>!\="
    \ contained nextgroup=vimperatorSetMod
 syn match vimperatorOption "\<\%(no\|inv\)\=\%(online\|visualbell\|vb\|usermode\|um\)\>!\="
    \ contained nextgroup=vimperatorSetMod
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -296,7 +296,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 +
 ||'runtimepath'|| List of directories searched for runtime files +
 ||'scroll'|| Number of lines to scroll with [m]<C-u>[m] and [m]<C-d>[m] commands +
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -600,18 +600,6 @@ Note: This option does not change the popup blocker of Firefox 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. Vimperator
-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
 ____
--- 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 ////////////////////////////////////////////////
    /////////////////////////////////////////////////////////////////////////////{{{
--- 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
--- 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 +
--- 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
 ____