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

Use FORCE_SINGLELINE in a few more places

Browse Source
This commit is contained in:
Kris Maglione
2008-12-08 12:33:23 -05:00
parent ab730160bd
commit 29de1f0e8a
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/content/buffer.js
View File

@@ -476,7 +476,7 @@ function Buffer() //{{{
var aps = options.getPref("print.always_print_silent"); var aps = options.getPref("print.always_print_silent");
var spp = options.getPref("print.show_print_progress"); var spp = options.getPref("print.show_print_progress");
liberator.echo("Sending to printer..."); liberator.echomsg("Sending to printer...");
options.setPref("print.always_print_silent", args.bang); options.setPref("print.always_print_silent", args.bang);
options.setPref("print.show_print_progress", !args.bang); options.setPref("print.show_print_progress", !args.bang);
@@ -484,7 +484,7 @@ function Buffer() //{{{
options.setPref("print.always_print_silent", aps); options.setPref("print.always_print_silent", aps);
options.setPref("print.show_print_progress", spp); options.setPref("print.show_print_progress", spp);
liberator.echo("Print job sent."); liberator.echomsg("Print job sent.");
}, },
{ {
argCount: "0", argCount: "0",

6
common/content/events.js
View File

@@ -1036,7 +1036,7 @@ function Events() //{{{
break; break;
} }
else else
liberator.echo("Waiting for page to load..."); liberator.echomsg("Waiting for page to load...");
} }
modes.show(); modes.show();
@@ -1236,7 +1236,7 @@ function Events() //{{{
{ {
modes.isRecording = false; modes.isRecording = false;
liberator.log("Recorded " + currentMacro + ": " + macros.get(currentMacro), 9); liberator.log("Recorded " + currentMacro + ": " + macros.get(currentMacro), 9);
liberator.echo("Recorded macro '" + currentMacro + "'"); liberator.echomsg("Recorded macro '" + currentMacro + "'");
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
return true; return true;
@@ -1259,7 +1259,7 @@ function Events() //{{{
if (key == "<C-c>" && !event.isMacro) if (key == "<C-c>" && !event.isMacro)
{ {
events.feedingKeys = false; events.feedingKeys = false;
setTimeout(function () { liberator.echo("Canceled playback of macro '" + lastMacro + "'") }, 100); setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'") }, 100);
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
return true; return true;

8
common/content/find.js
View File

@@ -345,7 +345,7 @@ function Search() //{{{
found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND; found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
if (!found) if (!found)
setTimeout(function () { liberator.echoerr("E486: Pattern not found: " + searchPattern); }, 0); setTimeout(function () liberator.echoerr("E486: Pattern not found: " + searchPattern, commandline.FORCE_SINGLELINE), 0);
return found; return found;
}, },
@@ -364,7 +364,7 @@ function Search() //{{{
if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND) if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
{ {
liberator.echoerr("E486: Pattern not found: " + lastSearchPattern); liberator.echoerr("E486: Pattern not found: " + lastSearchPattern, commandline.FORCE_SINGLELINE);
} }
else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED) else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
{ {
@@ -373,10 +373,10 @@ function Search() //{{{
setTimeout(function () { setTimeout(function () {
if (up) if (up)
commandline.echo("search hit TOP, continuing at BOTTOM", commandline.echo("search hit TOP, continuing at BOTTOM",
commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES); commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
else else
commandline.echo("search hit BOTTOM, continuing at TOP", commandline.echo("search hit BOTTOM, continuing at TOP",
commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES); commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
}, 0); }, 0);
} }
else else

3
common/content/io.js
View File

@@ -889,8 +889,7 @@ lookup:
// should be appended to and the MOW opened // should be appended to and the MOW opened
liberator.echoerr("Error detected while processing " + file.path, liberator.echoerr("Error detected while processing " + file.path,
commandline.FORCE_MULTILINE); commandline.FORCE_MULTILINE);
commandline.echo("line " + lineNumber + ":", commandline.HL_LINENR, commandline.echomsg("line " + lineNumber + ":", commandline.HL_LINENR);
commandline.APPEND_TO_MESSAGES);
liberator.echoerr("E492: Not an editor command: " + line); liberator.echoerr("E492: Not an editor command: " + line);
} }
else else

2
common/content/ui.js
View File

@@ -1712,7 +1712,7 @@ function StatusLine() //{{{
if (value == 0) if (value == 0)
document.getElementById("status-bar").collapsed = true; document.getElementById("status-bar").collapsed = true;
else if (value == 1) else if (value == 1)
liberator.echo("show status line only with > 1 window not implemented yet"); liberator.echoerr("show status line only with > 1 window not implemented yet");
else else
document.getElementById("status-bar").collapsed = false; document.getElementById("status-bar").collapsed = false;