A regular expression list that defines which plugins are loaded at
@@ -937,7 +937,7 @@
omit in your
:set loadplugins= !foo|bar ,\.(js|vimp)$
+ :set loadplugins= !foo|bar ,\.(js|&dactyl.fileExt;)$
That will load all plugins but foo and bar.
diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml index 73761785..f99bdf20 100644 --- a/common/locale/en-US/starting.xml +++ b/common/locale/en-US/starting.xml @@ -112,9 +112,9 @@
All directories in
Load a color scheme. name is found by searching the
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm index e500e7b9..82f0a1b4 100644 --- a/common/modules/highlight.jsm +++ b/common/modules/highlight.jsm @@ -238,7 +238,7 @@ const Highlights = Module("Highlight", { if (scheme == "default") highlight.clear(); else - dactyl.assert(modules.io.sourceFromRuntimePath(["colors/" + scheme + ".vimp"]), + dactyl.assert(modules.io.sourceFromRuntimePath(["colors/" + scheme + "." + modules.config.fileExtension]), "E185: Cannot find color scheme " + scheme); modules.autocommands.trigger("ColorScheme", { name: scheme }); }, @@ -313,13 +313,14 @@ const Highlights = Module("Highlight", { }, completion: function (dactyl, modules) { const completion = modules.completion; + const config = modules.config; completion.colorScheme = function colorScheme(context) { context.title = ["Color Scheme", "Runtime Path"]; - context.keys = { text: function (f) f.leafName.replace(/\.vimp$/, ""), description: ".parent.path" }; + context.keys = { text: function (f) f.leafName.replace(RegExp("\\." + config.fileExtension + "$"), ""), description: ".parent.path" }; context.completions = array.flatten( modules.io.getRuntimeDirectories("colors").map( function (dir) dir.readDirectory().filter( - function (file) /\.vimp$/.test(file.leafName)))); + function (file) RegExp("\\." + config.fileExtension + "$").test(file.leafName)))); }; diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index 44e5e1e6..72b48421 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -18,6 +18,7 @@ - Backtracks to the first successful match after pressing backspace. - Supports reverse incremental search. + * Command script files now use the *.penta file extension. * Multiple Ex commands may now be separated by | * Command-line is now hidden by default. Added C and M to 'guioptions'. diff --git a/pentadactyl/content/dactyl.dtd b/pentadactyl/content/dactyl.dtd index 8220a0f7..91bf6a0c 100644 --- a/pentadactyl/content/dactyl.dtd +++ b/pentadactyl/content/dactyl.dtd @@ -13,6 +13,7 @@ + diff --git a/teledactyl/content/dactyl.dtd b/teledactyl/content/dactyl.dtd index 4afd960d..afcfd48c 100644 --- a/teledactyl/content/dactyl.dtd +++ b/teledactyl/content/dactyl.dtd @@ -8,6 +8,7 @@ + diff --git a/xulmus/content/config.js b/xulmus/content/config.js index eae72d82..1dedb03b 100644 --- a/xulmus/content/config.js +++ b/xulmus/content/config.js @@ -24,7 +24,7 @@ const Config = Module("config", ConfigBase, { }, /*** required options, no checks done if they really exist, so be careful ***/ name: "Xulmus", - hostApplication: "Songbird", + host: "Songbird", /*** optional options, there are checked for existence and a fallback provided ***/ features: ["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "player"], diff --git a/xulmus/content/dactyl.dtd b/xulmus/content/dactyl.dtd index 195c57cb..3339fd05 100644 --- a/xulmus/content/dactyl.dtd +++ b/xulmus/content/dactyl.dtd @@ -8,6 +8,7 @@ +