view etc/e/eterm.ti @ 65129:8303172e4c68

(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.

eterm|Emacs term.el terminal emulator term-protocol-version 0.96,
	colors#8,
	cols#80,
	lines#24,
	pairs#64,
	am,
	mir,
	xenl,
	bel=^G,
	bold=\E[1m,
	clear=\E[H\E[J,
	cr=\r,
	csr=\E[%i%p1%d;%p2%dr,
	cub1=\b,
	cub=\E[%p1%dD,
	cud1=\n,
	cud=\E[%p1%dB,
	cuf1=\E[C,
	cuf=\E[%p1%dC,
	cup=\E[%i%p1%d;%p2%dH,
	cuu1=\E[A,
	cuu=\E[%p1%dA,
	dch1=\E[P,
	dch=\E[%p1%dP,
	dl1=\E[M,
	dl=\E[%p1%dM,
	ed=\E[J,
	el1=\E[1K,
	el=\E[K,
	home=\E[H,
	ht=\t,
	ich=\E[%p1%d@,
	il1=\E[L,
	il=\E[%p1%dL,
	ind=\n,
	invis=\E[8m,
	kbs=^?,
	kcub1=\EOD,
	kcud1=\EOB,
	kcuf1=\EOC,
	kcuu1=\EOA,
	kdch1=\E[3~,
	kend=\E[4~,
	khome=\E[1~,
	knp=\E[6~,
	kpp=\E[5~,
	op=\E[39;49m,
	rc=\E8,
	rev=\E[7m,
	rmir=\E[4l,
	rmso=\E[27m,
	rmul=\E[24m,
	rs1=\Ec,
	sc=\E7,
	setab=\E[%p1%{40}%+%dm,
	setaf=\E[%p1%{30}%+%dm,
	sgr0=\E[m,
	smir=\E[4h,
	smul=\E[4m,
 	smso=\E[7m,
#	smcup=\E[?47h,
#	rmcup=\E[?47l,
#       rs2 may need to be added