diff options
Diffstat (limited to 'common/content')
| -rw-r--r-- | common/content/buffer.js | 2 | ||||
| -rw-r--r-- | common/content/editor.js | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/content/buffer.js b/common/content/buffer.js index ad4ce71b..46fb9988 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -961,7 +961,7 @@ const Buffer = Module("buffer", { let doc = buffer.focusedFrame.document; if (isArray(url)) { - if (options.get("editor").has("l")) + if (options.get("editor").has("line")) this.viewSourceExternally(url[0] || doc, url[1]); else window.openDialog("chrome://global/content/viewSource.xul", diff --git a/common/content/editor.js b/common/content/editor.js index 61bcf06e..c79c89c5 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -242,7 +242,7 @@ const Editor = Module("editor", { }, editFileExternally: function (path, line, column) { - let args = options.get("editor").format({ f: path, l: line, c: column }); + let args = options.get("editor").format({ file: path, line: line, column: column }); dactyl.assert(args.length >= 1, "No editor specified"); @@ -772,19 +772,19 @@ const Editor = Module("editor", { options: function () { options.add(["editor"], "The external text editor", - "string", "gvim -f +%l %f", { + "string", "gvim -f +<line> <file>", { format: function (obj, value) { let args = commands.parseArgs(value || this.value, { argCount: "*", allowUnknownOptions: true }) - .map(util.compileFormat).filter(function (fmt) fmt.valid(obj)) + .map(util.compileMacro).filter(function (fmt) fmt.valid(obj)) .map(function (fmt) fmt(obj)); - if (obj["f"] && !this.has("f")) - args.push(obj["f"]); + if (obj["file"] && !this.has("file")) + args.push(obj["file"]); return args; }, - has: function (key) set.has(util.compileFormat(this.value).seen, key), + has: function (key) set.has(util.compileMacro(this.value).seen, key), validator: function (value) { this.format({}, value); - return Object.keys(util.compileFormat(value).seen).every(function (k) "cfl".indexOf(k) >= 0) + return Object.keys(util.compileMacro(value).seen).every(function (k) ["column", "file", "line"].indexOf(k) >= 0) } }); |