Cosmetics

Interpret empty femcmd as a directive to dump error messages to stdout and make default femcmd empty.

malc committed 6 years ago

Commit 60425651 parent 16798f32 files · +7 −5Browse files

Unified · Split

2 files

genconfstr.sh +1 −1
main.ml +6 −4

genconfstr.sh+1−1

@@ -111,7 +111,7 @@ g beyecolumns "columncount option" None · 110 unmodified lines
111	111	s selcmd '(match platform with \|Plinux\|Pbsd -> "LC_CTYPE=UTF-8 xclip -i"\|Pmacos -> "LC_CTYPE=UTF-8 pbcopy"\|Punknown -> "cat")'
112	112	s pastecmd '(match platform with \|Plinux\|Pbsd -> "LC_CTYPE=UTF-8 xclip -o"\|Pmacos -> "LC_CTYPE=UTF-8 pbpaste"\|Punknown -> "echo")'
113	113	s paxcmd '"cat"'
114		−s femcmd '"cat"'
	114	+s femcmd E.s
115	115	s passcmd E.s
116	116	s savecmd E.s
117	117	b updatecurs true

@@ -5233,10 +5233,12 @@ let () = · 5232 unmodified lines
5233	5233	(match Buffer.length state.errmsgs with
5234	5234	\| 0 -> ()
5235	5235	\| n ->
5236		− pipef ~closew:false "eflush"
5237		− (fun w ->
5238		− match Unix.write w (Buffer.to_bytes state.errmsgs) 0 n with
5239		− \| exception _ \| _ -> ()) conf.femcmd);
	5236	+ if nonemptystr conf.femcmd
	5237	+ then pipef ~closew:false "eflush"
	5238	+ (fun w ->
	5239	+ match Unix.write w (Buffer.to_bytes state.errmsgs) 0 n with
	5240	+ \| exception _ \| _ -> ()) conf.femcmd
	5241	+ else print_endline @@ Buffer.contents state.errmsgs);
5240	5242	Config.save leavebirdseye;
5241	5243	if Ffi.hasunsavedchanges ()
5242	5244	then save ()