diff --git a/content/find.js b/content/find.js index a295e3ae..8cef1d13 100644 --- a/content/find.js +++ b/content/find.js @@ -67,11 +67,11 @@ liberator.Search = function () //{{{ // set searchString, searchPattern, caseSensitive, linksOnly function processUserPattern(pattern) { - // strip off pattern terminator and offset - if (backwards) - pattern = pattern.replace(/\?.*/, ""); - else - pattern = pattern.replace(/\/.*/, ""); + //// strip off pattern terminator and offset + //if (backwards) + // pattern = pattern.replace(/\?.*/, ""); + //else + // pattern = pattern.replace(/\/.*/, ""); searchPattern = pattern; @@ -292,7 +292,8 @@ liberator.Search = function () //{{{ this.find(command, backwards); lastSearchBackwards = backwards; - lastSearchPattern = command.replace(backwards ? /\?.*/ : /\/.*/, ""); // XXX + //lastSearchPattern = command.replace(backwards ? /\?.*/ : /\/.*/, ""); // XXX + lastSearchPattern = command; lastSearchString = searchString; // TODO: move to find() when reverse incremental searching is kludged in diff --git a/locale/en-US/buffer.txt b/locale/en-US/buffer.txt index 08a8e0ac..82db51ab 100644 --- a/locale/en-US/buffer.txt +++ b/locale/en-US/buffer.txt @@ -12,7 +12,7 @@ List mappings how to scroll the window. section:Jumping{nbsp}to{nbsp}Elements[jumping] -|gi| +|gi| + ||[count]gi|| ________________________________________________________________________________ Focus last used input field. If there is no last input field, it focuses the diff --git a/locale/en-US/developer.txt b/locale/en-US/developer.txt index 59abe30f..982dd71b 100644 --- a/locale/en-US/developer.txt +++ b/locale/en-US/developer.txt @@ -17,7 +17,7 @@ like for help::help[various.html#:help]. ||:h[elp] {subject}|| + |||| ____________________________________________________________________________ -Open help window. +Open help window. The default section is shown unless {subject} is specified. If you need help for a specific topic, try [c]:help overview[c]. ____________________________________________________________________________ diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt index a5b6f322..f5d1c8ae 100644 --- a/locale/en-US/intro.txt +++ b/locale/en-US/intro.txt @@ -14,11 +14,11 @@ text editor. It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in. |warning| + -Warning: -To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden. + -If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + +Warning: +To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden. + +If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + If you don't like Vimperator at all, you can uninstall it by typing -[c]:addons[c] and remove/disable it. + +[c]:addons[c] and remove/disable it. + If you like it, but can't remember the shortcuts, press [m]F1[m] or [c]:help[c] to get this help window back. diff --git a/locale/en-US/options.txt b/locale/en-US/options.txt index a14e4c6b..f1757d59 100644 --- a/locale/en-US/options.txt +++ b/locale/en-US/options.txt @@ -107,7 +107,7 @@ ________________________________________________________________________________ |:set-!| ||:se[t]! {preference}={value}|| + ________________________________________________________________________________ -Change any Firefox {preference} (those in the about:config window). You can also +Change any Firefox {preference} (those in the about:config window). You can also reset/delete those preferences with [c]:set! {preference}&[c]. ________________________________________________________________________________ @@ -435,7 +435,7 @@ ____ // 'pvh' // Default height for preview window // number (default: 10) -// +// // Value must be between 1 and 50. If the value is too high, completions may cover the command-line. Close the preview window with :pclose. // NOTE: Option currently disabled // 'previewheight' @@ -452,7 +452,7 @@ ____ |\'scr'| |\'scroll'| ||'scroll' 'scr'|| number (default 0) ____ -Number of lines to scroll with C-u and C-d commands. +Number of lines to scroll with C-u and C-d commands. The number of lines scrolled defaults to half the window size. When a {count} is specified to the or commands this is used to set the value of 'scroll' and also used for the current command. The value can be reset to half the window height with :set scroll=0. ____ diff --git a/locale/en-US/repeat.txt b/locale/en-US/repeat.txt index 044030d4..53e9d0f6 100644 --- a/locale/en-US/repeat.txt +++ b/locale/en-US/repeat.txt @@ -9,25 +9,40 @@ section:Macros[macros] |q| ||q {arg}|| + ____________________________________________________________________________ - Record a key sequence into a macro. Available macros are {0-9a-zA-Z} (uppercase to append). Type 'q' to stop recording. ____________________________________________________________________________ + +|:macros| + +||:mac[ros] [regex]|| +________________________________________________________________________________ +List recorded macros matching the optional regular expression. If no regex is +given, list all. +________________________________________________________________________________ + + +|:delmac| |:delmacros| +||:delmac[ros] [regex]|| + +________________________________________________________________________________ +Delete recorded macros matching a regular expression. +________________________________________________________________________________ + + |@| |@@| |:play| ||[count]@ {arg}|| + ||[count]@@|| + -||:play {arg}|| + +||:pl[ay] {arg}|| + ____________________________________________________________________________ -Plays the contents of macro {0-9a-z}. +Plays the contents of macro {0-9a-z}. @@ replays a previous executed macro. :play {arg} plays a recorded macro. ____________________________________________________________________________ -section:Profiling[profiling] +section:Profiling[profile,profiling] :time ... diff --git a/locale/en-US/various.txt b/locale/en-US/various.txt index 9f00f1c0..4c93859b 100644 --- a/locale/en-US/various.txt +++ b/locale/en-US/various.txt @@ -27,7 +27,7 @@ section:Online{nbsp}Help[online-help] ||:h[elp] {subject}|| + |||| ________________________________________________________________________________ -Open help window. +Open help window. The default section is shown unless {subject} is specified. If you need help for a specific topic, try [c]:help overview[c]. ____________________________________________________________________________ @@ -97,7 +97,7 @@ cursor and can move around. If you want to select text in this mode, press ________________________________________________________________________________ -|| +|| |||| ________________________________________________________________________________ Stop loading the current web page. @@ -198,7 +198,7 @@ external editor must be able to download and open files from a remote URL. ________________________________________________________________________________ -|gh| +|gh| ||gh|| ________________________________________________________________________________ Go home. Opens the homepage in the current tab. @@ -241,14 +241,14 @@ Works like [m]P[m], but inverts the 'activate' option. ________________________________________________________________________________ -|g^| |g0| +|g^| |g0| ||g0|| ________________________________________________________________________________ Go to the first tab. TODO: Unify with :tabfirst. ________________________________________________________________________________ -|g$| +|g$| ||g$|| ________________________________________________________________________________ Go to the last tab. TODO: Unify with :tablast. @@ -334,7 +334,7 @@ Whether the new buffer is activated, depends on the 'activate' option. ________________________________________________________________________________ -|r| +|r| ||r|| ________________________________________________________________________________ Force reloading of the current page. @@ -479,7 +479,7 @@ Scroll to the absolute left of the document. Unlike in Vim, [m]0[m] and [m]^[m] ________________________________________________________________________________ -|$| +|$| ||$|| ________________________________________________________________________________ Scroll to the absolute right of the document @@ -727,29 +727,14 @@ opposite direction. ________________________________________________________________________________ -|q| + -||q {arg}|| -________________________________________________________________________________ -Record a keysequence into a macro. Available macros are {0-9a-zA-Z} (uppercase -to append).type 'q' to stop recording. -________________________________________________________________________________ - - -|@| -||[count]@ {arg}|| -________________________________________________________________________________ -Execute the contents of macro {0-9a-z}. @@ repeats the previous @{0-9a-z} -________________________________________________________________________________ - - -|\*| +|\*| ||\*|| ________________________________________________________________________________ Search forward for the next word under the cursor. ________________________________________________________________________________ -|\#| +|\#| ||\#|| ________________________________________________________________________________ Search backward for the previous word under the cursor. @@ -784,7 +769,7 @@ the left after removing the current tab. ________________________________________________________________________________ -|:beep| +|:beep| ||:beep|| ________________________________________________________________________________ Play a system beep. @@ -855,7 +840,7 @@ key on a string to complete the URL which you want to delete. The following options WILL be interpreted in the future: -* [!] a special version to delete ALL bookmarks +* [!] a special version to delete ALL bookmarks ________________________________________________________________________________ @@ -866,7 +851,7 @@ Change the current directory. [c]:cd -[c] changes to the last directory. ________________________________________________________________________________ -|:pw| |:pwd| +|:pw| |:pwd| ||:pw[d]|| ________________________________________________________________________________ Print the current directory name. @@ -1055,7 +1040,7 @@ for Insert mode only. ________________________________________________________________________________ -|:una| |:unabbreviate| +|:una| |:unabbreviate| ||:una[bbreviate] {lhs}|| ________________________________________________________________________________ Remove an abbreviation. @@ -1078,21 +1063,21 @@ Insert mode only. ________________________________________________________________________________ -|:abc| |:abclear| +|:abc| |:abclear| ||:abc[lear]|| ________________________________________________________________________________ Remove all abbreviations. ________________________________________________________________________________ -|:cabc| |:cabclear| +|:cabc| |:cabclear| ||:cabc[lear]|| ________________________________________________________________________________ Remove all abbreviations for Command-line mode. ________________________________________________________________________________ -|:iabc| |:iabclear| +|:iabc| |:iabclear| ||:iabc[lear]|| ________________________________________________________________________________ Remove all abbreviations for Insert mode. @@ -1114,28 +1099,6 @@ Add {cmd} to the list of commands Vimperator will execute on {event}: ________________________________________________________________________________ -|:macros| + -||:mac[ros] [regex]|| -________________________________________________________________________________ -List recorded macros matching the optional regular expression. If no regex is -given, list all. -________________________________________________________________________________ - - -|:delmac| |:delmacros| -||:delmac[ros] [regex]|| + -________________________________________________________________________________ -Delete recorded macros matching a regular expression. -________________________________________________________________________________ - - -|:pl| |:play| -||:pl[ay] || -________________________________________________________________________________ -Play a macro. -________________________________________________________________________________ - - |:map| ||:map {lhs} {rhs}|| + ||:map {lhs}|| + @@ -1193,7 +1156,7 @@ by [c]:imap[c] or [c]:inoremap[c] are cleared. ________________________________________________________________________________ -|:ma| |:mark| +|:ma| |:mark| ||:ma[rk] {a-zA-Z}|| ________________________________________________________________________________ Mark current location within the web page. @@ -1271,7 +1234,7 @@ Show various page information. See :help 'pageinfo' for available options. ________________________________________________________________________________ -|:pc| |:pclose| +|:pc| |:pclose| ||:pc[lose]|| ________________________________________________________________________________ Close preview window on bottom of screen. @@ -1350,7 +1313,7 @@ directory, skipping the Save as... prompt ________________________________________________________________________________ -|:sbcl| |:sbclose| +|:sbcl| |:sbclose| ||:sbcl[ose]|| ________________________________________________________________________________ Close the sidebar window. @@ -1399,7 +1362,7 @@ specified, errors are not printed. ________________________________________________________________________________ -|:st| |:stop| +|:st| |:stop| ||:st[op]|| ________________________________________________________________________________ Stop loading. Stop loading current web page. @@ -1418,7 +1381,7 @@ support it, currently: ________________________________________________________________________________ -|:tabl| |:tablast| +|:tabl| |:tablast| ||:tabl[ast]|| ________________________________________________________________________________ Switch to the last tab. @@ -1444,7 +1407,7 @@ selected and {count} is not specified. ________________________________________________________________________________ -|:tabo| |:tabonly| +|:tabo| |:tabonly| ||:tabo[nly]|| ________________________________________________________________________________ Close all other tabs. @@ -1459,7 +1422,7 @@ first tab to the last tab. ________________________________________________________________________________ -|:tabfir| |:tabfirst| |:tabr| |:tabrewind| +|:tabfir| |:tabfirst| |:tabr| |:tabrewind| ||:tabr[ewind]|| + ||:tabfir[st]|| Switch to the first tab. @@ -1504,21 +1467,21 @@ Deletes the variable {name}. Several variable names can be given. ________________________________________________________________________________ -|:unm| |:unmap| +|:unm| |:unmap| ||:unm[ap] {lhs}|| ________________________________________________________________________________ Remove the mapping of {lhs}. ________________________________________________________________________________ -|:cunm| |:cunmap| +|:cunm| |:cunmap| ||:cunm[ap] {lhs}|| ________________________________________________________________________________ Remove the mapping of {lhs} (in command-line mode). ________________________________________________________________________________ -|:iunm| |:iunmap| +|:iunm| |:iunmap| ||:iunm[ap] {lhs}|| ________________________________________________________________________________ Remove the mapping of {lhs} (in insert mode). @@ -1541,7 +1504,7 @@ external editor. ________________________________________________________________________________ -|:wc| |:wclose| |:winc| |:winclose| +|:wc| |:wclose| |:winc| |:winclose| ||:winc[ose] [url] [, url]|| + ________________________________________________________________________________ Close window.