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

Fix heredocs from :so

Browse Source
This commit is contained in:
Kris Maglione
2008-10-08 19:36:32 +00:00
parent c77b782498
commit c16f80c023
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
content/io.js
View File

@@ -793,7 +793,7 @@ lookup:
{ {
if (heredocEnd.test(line)) if (heredocEnd.test(line))
{ {
liberator.eval(heredoc); command.execute(args + "\n" + heredoc, special, count);
heredoc = ""; heredoc = "";
heredocEnd = null; heredocEnd = null;
} }
@@ -808,8 +808,8 @@ lookup:
if (/^\s*(".*)?$/.test(line)) if (/^\s*(".*)?$/.test(line))
continue; continue;
let [count, cmd, special, args] = liberator.commands.parseCommand(line); var [count, cmd, special, args] = liberator.commands.parseCommand(line);
let command = liberator.commands.get(cmd); var command = liberator.commands.get(cmd);
if (!command) if (!command)
{ {
@@ -837,6 +837,7 @@ lookup:
if (matches) if (matches)
{ {
args = matches[1];
heredocEnd = new RegExp("^" + matches[2] + "$", "m"); heredocEnd = new RegExp("^" + matches[2] + "$", "m");
if (matches[1]) if (matches[1])
heredoc = matches[1] + "\n"; heredoc = matches[1] + "\n";

2
content/util.js
View File

@@ -59,7 +59,7 @@ liberator.util = { //{{{
timer.cancel(); timer.cancel();
let timeout = minInterval; let timeout = minInterval;
if (now > this.doneAt) if (now > this.doneAt && this.doneAt > -1)
timeout = 0; timeout = 0;
else if (this.latest) else if (this.latest)
timeout = Math.min(minInterval, this.latest - now); timeout = Math.min(minInterval, this.latest - now);