gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-24 00:15:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge default.

Browse Source 
--HG--
branch : mode-refactoring
extra : close : 1
This commit is contained in:
Kris Maglione
2010-10-11 02:50:23 -04:00
parent d7ff35c565 4efc6a3972
commit 6850148ed8
8 changed files with 149 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/dactyl.js
View File

@@ -1994,7 +1994,7 @@ const Dactyl = Module("dactyl", {
dactyl.execute(init);
else {
if (rcFile) {
io.source(rcFile.path, true);
io.source(rcFile.path, false);
services.get("environment").set("MY_" + config.idName + "RC", rcFile.path);
}
else
@@ -2022,17 +2022,7 @@ const Dactyl = Module("dactyl", {
// all gui options to their default values, if they have not been
// set before by any RC file
for (let option in values(options.needInit))
// FIXME:
// 'encoding' option should not be set at this timing.
// Probably a wrong value is set into the option,
// if current page's encoding is not UTF-8.
try {
if (option.name != "encoding");
option.value = option.value;
}
catch (e) {
dactyl.reportError(e);
}
option.initValue();
if (dactyl.commandLineOptions.postCommands)
dactyl.commandLineOptions.postCommands.forEach(function (cmd) {