gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 15:17:58 +01:00
Code Issues Projects Releases Wiki Activity

Fix serialization of commands with embedded new lines in their args but no heredoc support.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-16 19:16:47 -04:00
parent c96375d7ee
commit 89950aa226
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/content/commands.js
View File

@@ -409,7 +409,9 @@ const Commands = Module("commands", {
let str = args.literalArg; let str = args.literalArg;
if (str) if (str)
res.push(/\n/.test(str) ? "<<EOF\n" + str.replace(/\n$/, "") + "\nEOF" : str); res.push(!/\n/.test(str) ? str :
this.hereDoc ? "<<EOF\n" + str.replace(/\n$/, "") + "\nEOF"
: str.replace(/\n/, "\n" + res[0].replace(/./g, " ").replace(/.$/, "\\")));
return res.join(" "); return res.join(" ");
}, },

2
common/content/io.js
View File

@@ -528,7 +528,7 @@ lookup:
"E189: " + filename.quote() + " exists (add ! to override)"); "E189: " + filename.quote() + " exists (add ! to override)");
// TODO: Use a set/specifiable list here: // TODO: Use a set/specifiable list here:
let lines = [cmd.serialize().map(commands.commandToString) for (cmd in commands) if (cmd.serialize)]; let lines = [cmd.serialize().map(commands.commandToString, cmd) for (cmd in commands) if (cmd.serialize)];
lines = array.flatten(lines); lines = array.flatten(lines);
lines.unshift('"' + dactyl.version + "\n"); lines.unshift('"' + dactyl.version + "\n");