Merge branch 'master' of ../cvs/exec

RealDeuce · Apr 27, 2020 · 41de0a7 · 41de0a7
2 parents f0548f6 + 2b2f85f
commit 41de0a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/exec/logonlist.js b/exec/logonlist.js
@@ -1,14 +1,8 @@
-// $Id: logonlist.js,v 1.7 2020/04/22 19:56:38 rswindell Exp $
+// $Id: logonlist.js,v 1.8 2020/04/27 08:16:46 rswindell Exp $
 
 // Logon List module (replaces old hard-coded logon.lst)
 
 // Install with 'jsexec logonlist install'
-// ... also, for all command shells (exec/*.src files), replace:
-//     userlist_logons
-// with:
-//     exec_bin logonlist
-//
-// ... and then run 'jsexec update'
 
 "use strict";
 

diff --git a/exec/msglist.js b/exec/msglist.js
@@ -1,4 +1,4 @@
-// $Id: msglist.js,v 1.9 2020/04/24 08:08:23 rswindell Exp $
+// $Id: msglist.js,v 1.10 2020/04/27 08:11:33 rswindell Exp $
 // vi: tabstop=4
 
 // Message Listing Module
@@ -399,12 +399,12 @@ function view_msg(msgbase, msg, lines, total_msgs, grp_name, sub_name)
 	while(!js.terminated) {
 		if(show_hdr) {
 			console.home();
-//			console.status |= CON_CR_CLREOL;
+			console.status |= CON_CR_CLREOL;
 			bbs.show_msg_header(msg
 				, property_value(msg, 'subject')
 				, property_value(msg, 'from')
 				, msg.forward_path || msg.to_list || msg.to);
-//			console.status &= ~CON_CR_CLREOL;
+			console.status &= ~CON_CR_CLREOL;
 			hdr_len = console.line_counter;
 			if(console.term_supports(USER_ANSI))
 				show_hdr = false;
@@ -1154,7 +1154,7 @@ function list_msgs(msgbase, list, current, preview, grp_name, sub_name)
 			{
 				console.clearline();
 				console.print("\x01n\x01y\x01hFind: ");
-				var search = console.getstr(60,K_LINE|K_UPPER|K_NOCRLF);
+				var search = console.getstr(60,K_LINE|K_UPPER|K_NOCRLF|K_TRIM);
 				console.clearline(LIGHTGRAY);
 				if(search && search.length) {
 					console.print("Searching \x01i...\x01n");