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

Don't source the user RC file twice when 'exrc' is set.

Browse Source 
When started from $HOME, the 'exrc' file and the user RC file are the
same file.
This commit is contained in:
Doug Kearns
2009-03-14 18:10:44 +11:00
parent 9de03780e4
commit b23c928922
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/liberator.js
View File

@@ -1291,12 +1291,12 @@ const liberator = (function () //{{{
setTimeout(function () {
let init = services.get("environment").get(config.name.toUpperCase() + "_INIT");
let rcFile = io.getRCFile("~");
if (init)
liberator.execute(init);
else
{
let rcFile = io.getRCFile("~");
if (rcFile)
io.source(rcFile.path, true);
else
@@ -1306,7 +1306,7 @@ const liberator = (function () //{{{
if (options["exrc"])
{
let localRCFile = io.getRCFile(io.getCurrentDirectory().path);
if (localRCFile)
if (localRCFile && !localRCFile.equals(rcFile))
io.source(localRCFile.path, true);
}