From 90c52b83e74275a82d2b16d64b9ef4715eaa799d Mon Sep 17 00:00:00 2001
From: Estevao Soares dos Santos <estevao.santos@gmail.com>
Date: Fri, 27 Jan 2017 19:03:37 +0000
Subject: [PATCH] feat(encodeEmail): add option to enable/disable mail
 obfuscation

Prior to version 1.6.1, emails would always be obfuscated through dec and hex encoding.
This option makes it possible to disable this.
---
 README.md                                 |   3 ++
 dist/showdown.js                          | Bin 75601 -> 75466 bytes
 dist/showdown.js.map                      | Bin 222377 -> 221733 bytes
 dist/showdown.min.js                      | Bin 30745 -> 30945 bytes
 dist/showdown.min.js.map                  | Bin 33899 -> 33987 bytes
 src/helpers.js                            |  40 +++++++++++++++++
 src/options.js                            |   5 +++
 src/subParsers/autoLinks.js               |  11 ++++-
 src/subParsers/encodeEmailAddress.js      |  52 ----------------------
 test/features/disable-email-encoding.html |   1 +
 test/features/disable-email-encoding.md   |   1 +
 test/node/showdown.helpers.js             |  30 +++++++++++++
 test/node/testsuite.features.js           |   2 +
 13 files changed, 91 insertions(+), 54 deletions(-)
 delete mode 100644 src/subParsers/encodeEmailAddress.js
 create mode 100644 test/features/disable-email-encoding.html
 create mode 100644 test/features/disable-email-encoding.md
 create mode 100644 test/node/showdown.helpers.js

diff --git a/README.md b/README.md
index 3c9630a..8ab5dc1 100644
--- a/README.md
+++ b/README.md
@@ -294,6 +294,9 @@ var defaultOptions = showdown.getDefaultOptions();
  
  * **ghMentions**: (boolean) [default false] Enables github @mentions, which link to the username mentioned (since v1.6.0) 
  
+ * **encodeEmails**: (boolean) [default true] Enables e-mail addresses encoding through the use of Character Entities, transforming ASCII e-mail addresses into its equivalent decimal entities. (since v1.6.1)
+
+   NOTE: Prior to version 1.6.1, emails would always be obfuscated through dec and hex encoding.
 
 **NOTE**: Please note that until version 1.6.0, all of these options are ***DISABLED*** by default in the cli tool.
  
diff --git a/dist/showdown.js b/dist/showdown.js
index 52fb0da37792d6210e3d84b33596eb68965e123c..8b7e44d3453478189fd62f6687ea53baba63ec36 100644
GIT binary patch
delta 783
zcma))v2PPG6vhWa6J1hNRj5%@QN0w2OH0$VEJd`5T2&dcz|g<I_4#r}cXnd?+DaY5
zQka;$BXtHUP(~(JB#<J+(utjsi4EI1)T-%#7t7Dz``+*QdGsy!<!f$ctFclA8S$fl
zA2E2e`Eh2aq}Ojv6$!&UAngRvSf5SJ>ks)^z33GNZ5Ibpw>N--KoBX31QiLMb|bSB
zNF@Ot!d`>~!iorJGes38aut+7Oom(}lyzZuf3MS-w4zLLph^Pir}PlTgeeFJrU{B6
zZw}UKxKaAi96UP+Q;CrxfY>#k{{-@2<t8Tl4_$(zF<ntH!80&GTtGyQA;Xeu#?X51
zQ-+CY0wN><f$2Kn31FV|I5XN+km-Rm{n_3yievMD+#pj4Val+goIy|UAT=fd4MQTV
z&^&b-E18wp>FNCDo!fQ}p8naN)33`V{q%8R>2h+r<MBZA(zWI$+MllI`L`EEH^e5m
zSmoWBZj1^#_x^KH5S0q%;=@0klkG|*NN8+)t5p1nzvY2hE^nh-)}Nl2_4&)<0~$h&
z_bk3#yYhqNGMu=CEM@)T?)?c$N47jR2CxOS(cPQWIhKdx;?>dIY{qsq{QI=Jke&Ud
fmJegK+5GJWYWceLy{_N9@P_qQwdycD|8@KqQ~VPv

delta 1058
zcmaiy&ubGw6vq*&hfty7LBt9#33QV-%_c=#vzvq(%t5qzQ1Cq6oy`v2-C1^Kn+-h#
z&w6qX9z2K_FVceq{2N55KaTzp{sW$TGu_mPf+5V#kM}<Bz3+RUPL{rXURtru^)d*b
zk6k{Fpw)T5vb#L%T>Q|Roji!T%V|V~Lt^Sal1X0XSM%r@<g-`T@-J^MtPVrMg4?c}
zP$7(ZZPB*=^6Bci&Drtut@0G^MsX@FAQ4dI0p!%B0kk=4LdD~Jmu4i41KM<WSSi6e
z{sA7QQu|4t{^<xr00D)P90C>{G+@l650p4QI6g^;BWa=;0DS6!A{0S^Mh<tWs~8lW
zXo4u0IxHjs@C1CCp^0R2(f}3}4CU|hm<r$?c${I(5rkaGGb#o>q(Z8D5t9)1xfD$p
zVtv+hUJpQ*fS*vWS6QoO+js1>YG((RcI&2IZ{eEl+)(>=+qTrhR&hAJTB~mB*H+su
z5(9utvDzBY(SVlTYuL5|PqVEdemd$^ffcu7SNebRe?u1{{g?kweAguXqV6dSh(N)4
zgi3qZGn9OP0((TFtYdh>oCDO8HXuep(GGj6^d1a`E|Z&&NpPU^Qtejq229{Ab$uyg
z%QR8(Nty&|Zp=x#lhPupS(?vuGk^W=()B+^wE<olIg(*UH8mDFIlA(qdOjcB|8A%=
z^uRcsF3W%o-DA5{0=>aE?Q(DL&477O!-*^R(B3lYaD+DMXPOXDa!A!Jkbp-NYFL$s
zxh$sEf`Fh7_58=)$LT!e*>uc<Vr-+*Upy&U4Q&2mD$Rt(0dZ)}tn`~3mN{x@uez=B
p5Hex0*0U%Gyo87P;*bfpA5gd)lSHcW5-QUKn}iC?z8?R~egXeOJoW$p

diff --git a/dist/showdown.js.map b/dist/showdown.js.map
index 1b06051cb9b7dfff0ab47c97ae7299fe789aae7f..31a0dc67a8a1a3e1334e71c657fb9a7684878d00 100644
GIT binary patch
delta 1484
zcma))Urbwd6vy-X(E`1|+R+wRhwR6gmVYZ~oEkbxOR0pZ12SVG*<vs4?RvM;TYGN}
z0f8A4UuGt9;!aF>ATdicI@6_#eQ+eO7>zy*d@ze*wkA59i4Qm*oDR|7z2Jt<2m8>Q
zd(QXw{e8aY-1k1OIQL0K_BzQ~XipWaS*`GuEeM}F>!8r*K>q*{V5-cFWi4bEglz(5
z_wb5;*@WXu#0keH1qcrckeUz-EuO#3+Y4R?47_ZGf#Fj6_#s%dw&k9wxmZ**+Sdc5
z-UX~*fVCC@Pnjt9k_5C}B@S4F3P_l%bCb2lGzhmBBja8(2?3^mb-)`ZxT=M#{=u-~
zB^JybAeG2g_`N!f?>XUY4Ha<V1~KFEX=2tZoW{5j{5v_T#exMdG10aV5+8Blw@>qI
zdWUs$_JaZzvc!ss!$d$2B^H<~b^@~tcxQ|VZ?zLa=nn+?y@5cm?McG`YP$v@>oTKf
ziBy0m{t)DEJHcit!?h+-i_0Eb3O8d7FzXVqyo*>NeANtv`O<uMkbFbX?<EZoKJ7r;
zHR8-)43TC63$s>C-Q;oo;|?r1i8+71mwZj|Og~3`J!OX-9w!XEZOW}oU!p~$&)%IY
zhCkLv$%m`YG`9vX$hh>HKDP%gLThgz(5r)w0sE{CKP;goF!@I%1m~)8dIyht<$3-$
zt*5x&Q3?Zh9I*VVqxfWZAaJr9>Y1HtJ$#!ky=pe9C@zsInEp+ed6%!c2UB+HGT?u>
zOzP0@CU)>&F_AHN<%23Xygme{)*X;-<6~|%&HQ8{X{i5wH)L-;g5er!#`Q)LfXGHG
zP4(p7+_>#S+b?{9g$oW~l>+|xB@yy_o+5{CVS5KHDVLHFB`SqRL^+|N?NPc5-+6-C
zr&5}%Bs-WpWVD&IUl%Yj8cj>8DydA1r<Kg{IDbkkqe@JPv0z+GixEvqvrtl#HCa+y
znU)rlYD`Iw$jRd@a3t8*cfXaK)D$LbDwAH!$S;WrDXB4AREo$WVuJA(!wPL3l;!14
zdd5H1KOD=b5mA$vnEaRB|KvKFWX=D@7Wq4Z$_y%=PEK#<(y^v=E+x(4(&$}0kM3x=
z9+8s~iN|4aQDq|I`J>7Rizp*0CCS6IGBq=-@}zpoh?q$5Q7W8TR#_~QjObHmsk9Q!
zaFeJUi%Dr+$cLUuXzJ!Axbp<HoAiC)RGjW_*tWsI=6+b`J+nqbxEP}~nDtQ;KK315
zEi;zc$&6O$dwLEZ7@`(DaD#q<{XfzY!#uw_LF>A9$J0`b`?+<krgXTy9D@Ihqk}C)
z)o15uHTvdhxm%90M#cDURL?dhwTX>yp4mF}@CEAFckip)Vm3INw%i%huSH$C=YFMu
z)M6ksdC@jRt17oBw{>v*65Ut3Rd65O>vOZsBmCh$*e3ei__M319j|>vh5X_?o!y&%
Jf0b@b`~?_T2Aco?

delta 2283
zcmb7EYitx%6waOQmhM2=Qg$hAp<G%@yRhs7f!dbGZp)THB^1OE;;Kw{r`@%)yW`Ak
zDIvORd<CMm?o|#UH35|vBPPYFmEez(_{T>SH4sP$l*H%{f~gS`H3mI*wxtEDiIdFD
zoqNyuzVrCbocy%-ozIGgt`XKxtg}N2DXs*gQBBs_iGuRst0c5w_;C3L1tdAVY4K%a
z`0%k$1R=JI1r~dAE(@rmq>v396<MIf0f9zRJbdc)U2$0U1)0xAzjLyl3-fHDU@+7i
z47T<`|I?(lvZo~&>}hdt2?n>g_XdM|-IMo9h@C!M0mmza)i7Wq8fgH39a+G#J%w!a
zl7rECB8=Z6RWSYt5!rbV+1SUH5nUvQHo}!9g2<M<V1-detgmH=nCrGd_82Jy+D5Ew
zJX6J}ZijtA^z6vlm~XL#BtdnNN(jG&XMg=9vQ2M`jP4Pk>Lp?W^#*aWA*aZ8wA&e7
zgUp<?<4O@IE6F0*S1pJp8tm{OGgbi91R4yiz~eK-kt-FMIx^qN^H$i?zf`i0k3=>U
z6z>$Re~lHghlmxf2}FdFEIQk5CXE9|!(=X8vIr$`V-s=0z#y@+eRk`S0I~Ybx|s{F
zTfU4_XEW>|RZGfU_Zr^g+=_AXSYvJMT$vN|u|ofE#QNwAc=saBWO5Jslu3Iq*ggdS
zORdCF$a#}(j2KQ>avPgf`b_z@DUbiZyPKSIl(T*BS%k(AJmDf0ceKI=H8JP3v*Ty%
zlU;!wo3RgcnUy`}6CoQ#9q~q9n`;KChCr<noUA)+hmO<44r4_a?&*an%{?|2uv>(+
zt(?NiW>w=ftR-S$UhHsUFLAK}PZ8Uy)v~W2c0!<?%w_bT2<PVt*5T`~UM9@91)1Ns
z9C;HbYUrj2KDSUT_*)?OEb+i-h&Wh>&z^hU$^th_hYMg8VQMdiP(~b3vJLg(dy!a}
zakP{TelD_-TU^U_J_#`NC*F?zh_GX2R(54pF>DwlMXdWn2OK|(-fo%LhSj4N2+Zk4
zmXh;!IA4###OylZ_dm!Yrha9Ivn>dvT*UI=R6te`&=N`15jzZgiOl2kFzoyCL&0vI
zDiR)VgX;=eMK*(UmDJ)Kp>gjW{paUqJcCdVA!+tqbATK`)1(H*9w4Rcxm;=fZpeXy
zXUk7KryQuj$=@#K=8Gekc;x31X}$1rVC2`VP`qh&Iw|WBNtL4y8t}^Qf`xGV4WSI$
zM};}y{6?s(mXncGRG#*m)9YOI)0{Nd$j)=Z#p(>*npD$96P1!w=08O$nSVvyO=VBF
zhlZ=WQmKI4CnZ!x_C!*NaCJCISMZn89cjb#HDdDJ&Q#K=L^+(1qDnm3<EH!LMvTf*
zBt|1KNs}UmtZ|SG#V6H8Im84r&Bq?)AToN%8e&D|NIW4aG^Np)+=nJc+&JK-@nk*{
zY68Sks;qOgu2dXZyJ;e&8+TxlwpZ2-ey*!hf_A11-IJjqOtWb!CrZ~#G^WX28^YDg
zYx>r0ZeCu~*no@Qx7J+m$F;9v4d46y%}xAb^~6X1XnD;#^Va8Yo(v9i?Big56QR*W
z@R|FJ3Ac_z_pJ`$+Q@G?G6!yK4p(pdC&M(@X=MMx@ZSWP=Jj4_<5c=Bk}gMSDv2fU
z!tP=1I}gz9l7Vg5Pxr(lJy=)SO;s!`+F^Hj<62rm(YUc{x1{vsL*t$2byng!N^5=0
zFw`cm7fXL2ttnhZ-UI1|w2Zt0T><2RP+2pBVBNGUos1Z9jHaGz1N>g03e=~BA6)#C
zZlHB}i8a;Hm1di<;240p#aq)y$_OW0<6X2KmA7;Qx-`|f=s|A9AFr1xveYZ{V=5`B
zq)h8EDP2t&6Y_1MiiBlw!K|$CZDx{pN+Xlh7(pF2Yx*azY#rCY^ng5?tSVAOuJ@v~
zXJwPO+nslGHS=h6LyN0sQ72NPU0Nz(9`wfbig>3YQ&rN8e4?6cq&4gnFV4=Eg83tL
J-wU^&{2O-+$20%{

diff --git a/dist/showdown.min.js b/dist/showdown.min.js
index 798230df580fb8bb22dad578609ab95658b36b49..dde42109d662bf03a6a418850ec9fc6aa0410e80 100644
GIT binary patch
delta 441
zcmaKnJxc>Y5QYg@NKn!k5Ve>b!sWa(kq8QBE*g?6Qj1n1th;l$#mjEo-Ajrf!P3^N
zwDK=Vevz$>AElK^svu}JQ#|i8^FDs$UO#h%>P`uCEQd@E1=J2-3SY}(4+WJB!ye&@
z_D2jOk|ySyBq{o(J&&QLiuVnd!neXX3b;FifiR{}Yt&$3CDU#^od~H$kP)<Eq6jsp
zAQXlhj@kpGh|rN#JubS?JZ*J4fcw8)To?)5XuzA44@iQ-07J@qB!THZQ%&BN@76c4
z5@XUwRaq#|oWGQv6gMC8OWAe%K6^ULXDeYly9nD8QMz2)qRwbQ6tKXWl`zt`jue_y
z37|ptJg~-2nL6IpqE#Q4Y4G<sJqxgZ0p?Q2@tGS?&#n`Q6-I$&yUew%hV4?<s#i(F
Vx+MXvWZOY;(meQHoxFwB+7FZGoACeu

delta 218
zcmaF(k#Xh+Mt*%QMTO#w{PL9i@;n6t%Z>b>I5r>U%$L~Qr5q!|mZVu-mRL0TzqvY7
zlIG-tp`sG0dCB=Hsjj(+nK_OrDMhKp#Y&nQ$(ps38)GFW|FPoQe8}PhuONn^$rGKW
zC&zQKP0m+p=TQRbF3Go2(oWQw{6#5%M<Fv!L&-`>(bhImbFz!Fi-k_2t-4L3LPk+)
ynyr$$cA~brk{yUrve8epQv%8+>J_CH<Rm7iYUnH3>1kW(r|W=}Y+m5zXaoR6MMx9?

diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
index 5e2077fbe5c6eb30c1128aee2e6569af7215d81f..70c1a54aa3228c0b5b4c94bab24114a7f50d32ea 100644
GIT binary patch
delta 9260
zcmb_idu&_Rd509&k)6h}BgwX6%T63ewnI83MNt$J$M(4ol2_OC6-Ch$mBfxLF?@*P
zQ=%v(jk;{X+7)e)od7M0ZbPu4*fU8X1jR6*NHOdI6ieG-=wn!m0DGXr3Uuoq!y2r^
ze&2U4Wyz9(bl5+X?>XQ3&i8&D|J$d!|NPV4@5H(v$W`X63psOXu2|mGyT7(?aNB}d
zSZL&$%`@IJv@KsacyaT?{eRrOuh7W7DF5`p?{0qf;PCwi&8fQPofo><lCK}>>-Jmn
zD@V?r8_~Q8A#9y~6NcBuzfEsih;&Hv#)MhXy_OKxnEa0;NA(CT={JPe6e8!*ygB@#
zBYHtMXwA~GFC2goz&Jq*8+hhK40s%DjmU|I9zBE)?Bod9y5`wjd+4pMLjj^7R-oUg
zSd)()dtA=;KQNDFkmPt%LJyg1npYRGX{KnMu{(a9FLuFpeA%NqZqE2Lz)#KLpJF;h
z+~`qeVC$&->;98Hos;q>{i9vDe&GDYbw=%Yi&0{5+uaHm6QD<l6RWDrZx0-kpB?!9
z-p;8tQ|Qau+NN>Tyl=Q<ZZYiB7EK~K3nA;XBnaKqy-EC*<lBSa8W^Duk!svI(bk$$
zKK#Q&9VC`;O1gjZl@sx<uCn~Alc&1YHvi@1<wNJQ)1?@pPAOSeW8NiA2q--Tb@EMN
z-J2D<Jm8%3*P`Bx5E-J&hKNbg1Xd-6^eM6ihklYQt5_{6UvM4`=Z!nN0-{{hW}wyu
z!BTJ-)NVzIfh4Id!6?_F@|%vePZ#<%d1110CLz*uOxXe`(5IFSQZ8h$b-*tTPsAIE
zDI$of@fh9vA`vfWH9^0**|1_aAD4gNxjGVJ(r1{8c^Fa-CN>%eTHU7w;v|@)KTiB6
z0g12qQF+39`exW9%S?FdSXwp5NbWj>v!aPfK{VNP#0nB3*e@Y)J)lTf=@NE<vd+XL
z`38amx}p}8U-XU*j1y()g29><gfFi}<Ue}fKIkFF#ERC4%P(JiSI_h5Oo&gXvV_CF
zfnPnWF)5%QOR07o?CZ0%lxVWD6N}7Jsuh=SJUKDgA~!N`lcU(+PLGdF(7{|p{*C{b
zJmmZMfjVQ#Yd-myuhlckv^ydBrtj>5RhK58eBb9k2$HhGtZ9X~{F75><P-kiP}udo
zu|KvA^UwWbJ#}RoVHpm5V`H4mN95Moik8`dEkCa%0vtf>6^=#;WkG<2;Sv2IZI$Uw
z(0L1%0Sj{|N@d5G@`U0Ps)mPCoB=vO+GQ4bQUTc;fC^j-(!B|*VnIZX7$?2r2L1(N
zTi9aBl}#gta0Ax;Q7l(&QKrAbhBoPDvh5{}V?-*#)F;~P*{Kx^H|UB4YnhRyD~Oi+
z!27EFaOBL*mRf`oKxGQHMMgfxix%$G8%(|mr%7lVx=Xvj92YF5ZTH%e@*OChjAO-;
z>%oUDL<@X5MS{0(gI7ci69Pz0D{y;_Br8&Ub(pV6<O$eBz)lE5j4=&PSpG2h@S&v`
z!DSe@Y|4*~KHBAx=SFjbArhHh(%ObMuZdBEkTwhfpHEKrN&ibd^1ad5jxKnc8r-JI
zWIJmtt=zhNHe?=PVa3XZPrf-eAio~!_o$VSQLvaFrBIxqr~;zERbGX(Qe6Hb6ebL|
zunOiD28B}(xj27qtlwP;^U4MHE9mb3cxyl4uDliQoG7_iuZ16SPqkbaP<q!rTc=`l
zsw)(fhZ7%@_l+O#h24YdqN2JSmrsnlRL9nVtu+1_3l@s}lvDC$U(Im9ZXw>08aZfC
zOx0gho{-npS!V!4J_u`7wgG!wUXGmU^2xbK{&11Z5V9(<Nfk8t^AldV@2Nl!)IfF+
zmd`x(m5nN+$yJmM5}|racNc3a=yC9EYefZ#MWBt1S?p+GRuVZO<?gL;InH<6M0-r7
z1*A*X9FCK*^F;x@?q#HT4e1q!lR@P=+TxvMTxJ>SF8R5qhlh~X2m#y}q}~|SXe)^?
zTO=3S@;gsIKA`*$K7_y}e9DYH@~abl^3<jM;V>&>o3EPiaq<kLaSlnYo)92Fa8}h9
zOO~9wG$<>V_TPeQhm8R1$W63KTqLr^2~tl)Q|tntIl0a#=5%st4wu#%%O!K2XrFQD
zf)xE*#3B}zX0!DP`GZT5E0qa+iFrrGL8=ERo>vTr6~G+rP^*FP$<S^>R^l@G%+N4I
z3D^vdP(W1XWeE#;o?-#+GevZARKD@d;{$smdH<QwuCRP(VW4YF4qm?Tu+LKDP}ZU1
zC8T-yie!X=#^vu^j&=vw@ek*5b<wO7x3NaF5|xjJ`g)5Ho!~XQrl~b~<;wnJ3M`@r
znU~}=Xw`2N`HZYyd7yi7LcV<EW=};WDc0mE1RFTiE?puJG|Yk}>l0_Y5eOq!Z(VJu
zsEq{4fvV$AAkc14D2@=$GZeneu!gLJoh1HLbs?I1Jt4n;^~#e<-&xLPC@07RtR{zI
zDovAA1x<=&wXhtMZ-)CeM#=E>h^~s1<P_=mhDy86GPAO?PNQ5xX+sBIkl=*ad+vr=
zQJc65239f@4fFVfF-(&k&b!A?kUu%R0qr{?h}76n6)j0{@Z>Jp0Ry9@YX2>vZ}?Ha
z;$T}B1y$52%XV{Wp2^Ei6U`MJsgh{k0kOysdF?tttb$&?#*%Gm-Z~^b<)K_)m?~wG
zyqDl4apYD~4Bhc8)Zk%@C~8wcVMa7{ODC(3^JZR~q|N0$NhmT2MeQ1-HKMijz%~<-
zKhpLe-z5ZFq*`P^PhKCC{`doKEJ1d=JC+PpxwhVg0KB%`r19G`outurlg1zF5A`BC
zAz0Q7jyUC*{HA{PFt06=IXj}H37?#t?w5VWnww!d*>QIk`g_B@B2nQh?#^vELC7H>
z<Sh<-4r_le#_cvS{(1B4Nfkg*re#GQ3CIzMYTM)J5Hu*7yS)$Bv^n*G_~_6EOay*n
z7i`486>S=LDw=Q?*-~N^TR9;0DG0u30BiaZ>&)H>Kp~4PzNPKCjodkpZA4#pn~ZG(
zVH0f~^|D@4R#jW&cxA1#CAwwWy0OS|v6X#pouK%;2RwqX3%`><4k1Zl20Ii8?|xV^
zIFzHY#{>)!qDYiT6xIz$BHCGEG*-<Ogd6JhpjKrupwR&qY|AgkE<CR2vAv7nW=Xrl
zhAm>@=r;BCow|o{qSRggNY=e^4+IG3ux?JNNz%s@TQLe|aF_Njnqo~`0C#OoprF9o
z&WKQFo>a*R)q}IG^a|ik)tg5ggzmBoq0cHoWKgwI&Q$S&GT=OkaaO2qCEHLs?dY3Y
z+Ywbus0!+C08+042=4{3k)|Rer63RinO6QyFK<^BY_6p@6)Ssgqpx;T3d$ot6~U^u
zA`W6xAfALk$sXy4|J~*#`GIxfG;YUkCbZ35MW#uC!)lx87{8G^aWJ4Mb5w3UxGNml
zVoYPdMn-h~x<!8N!F7%Z@9^uvGrNw*M6P6Tvpz%VbIK=wGBLKXr2L5U6_1I8RiqDL
zK}#_3DWHxEcZu0D+pg3)o{El+rDpBihTgK^PY-mqTRZhiY8yMxibXnL3^r*hqfE;J
zXO>S>Jr|3l?_Ocv;V}Q9{pCE=2h!)ER~XpBic%&?9%UzKr*;kOpaSC(mzS7*r^%#E
zEc2fnjYH6;*RK(>9DZUYE=}P9C`zW$n4<*RJe>Ge*Z#Z~GD@cWhsl3FuOcn_xGdGl
zxW;Y~b0Ueu^XS{qq=5v*$q>v3S!@p-nPEiT!72X$N`8Q+msm3x#E?qb^5)dpjZvoS
zm-K@FHz#QIcAP|+dPN>ic{V^M$yZr?LKR?f*Cp=qXPC|09`0ZxM^P`%MwCQ3M{wv<
zkS-E!?kEzNy3i$vA{3%YOGp)vi|xHXjj|+GBR?AIF2>~tspGrTq6HtRK)Q#gFZL;A
zvHO^$EQ1sE*+Z%^N|N!3Y*4;Befjvd49cKtT9Nk2?@xdJP>@O5f?r8rJ)z)3oN<k<
zu~S4hMh*Gx^nXvTa<lGG<kuH4c?C-eHAHZ`=_Jh)MS7aUR*;=BRiHZ6#6*Ndw7T=s
zlbH{wxIhr1!r{5hWAgmWu|sO0utiy7X8s_65+d0^H!kb#)2A^n!QDwt0W{)(zip8l
zHS+SmW<GUD4Kk7m9x#UG=dv^73ZD6cJhs|I%pJ%?38iWitsQ5}mOM4<@7=LhvE=i!
zPxbFa$Rlb){?V+b2c0xfW+U=Pvm=Jf^e<@`NwN#pFZH_eR_45X`Pqn1>4@9PI&?(&
zfu}1Xg?NMX#o`v$lA3r`<v%_9rL1b!lNp{9u5d@NuGQG?lW5t=GRY#HGMDvt;Lz=r
zjqPyy)J_ojz30qh%Y?y1!H7S#=yZ5nu%K3VV^^pEbf?wjUL_Yy5DnBm=a9)XrlP9V
zdGwp$iEt{cK+wNamDXh2vzpZQh;4ghn9I>6ZfWNN>c~R@uJuz5ZI#!H7<zWy9FRYI
z{xvcyh-}^PoAOs~hI@hppihs=_ikp%E~%n{U3P`~Waw7xF6dr{Mg>G?A{reE$Y0z#
zPo=db(%_oxVce9XFQl&^SK%TInaR-9u+i}`eOsj-2NzDemfHy{>S~I*$IifoaGFxK
z9yE}EA+ppq8ichdADqh{VY*k~6);YKsHlDKPSxQ~_34++>YeN0O-L7PSZqYO0u!1o
zDtf^LDT~d<R%AHJltP9ax;@^5;WYr#4f*`-(+6raLojEW6Y{m&lU+^u-P@;%A8CG|
zTs(ny0|*l>Bh}tKOqiY=<>Zu56%9c^w0n&pJo5SZGhHG1$@#$uLNtce4IS1`)H8_*
z9s!Fa*08tiPEnbc&ep0S|8_pr19!uz#GN_BkbGgGSJZhqjr$jA^yr9!W}&4*iJ~5N
z)U!q6BaAGD??cj-KV6uhmJC`>Q`DMUQpA$ReOkrcpzgZL8!0l-irzVq5bMUQZ=3g>
zxyN_{{#Q|>rlx#1SHTPwQ>mdGRe!sD6;(rx8?yAUTexxfL}3ng%R36UzKg4H&9&V)
zsP8jTQIOypns-DKu^VG*u=1}jeqCLE3NIaEb@y5H3L(1x2l=!8%0MB9tVk;ZU5&~k
zh5p_EGo4H$@y4b+@VLU0y$D0>ElY8sU-v|1z3@bO*1LlC{)QSDA=SqLKE`K(kElb)
z;Q21QA(wRNpel~pDy*%N6Tp~@({Ek=d%?b{X8Tq|&A}9*Wh2jL=K;53l&KD@8P)`a
zg-nG*Q4+x#k4X(}MXncrudl#wK<Y(-bY9Z)GElmpT4#*=cvvAEpS-pB2n8c(zlBBl
zMrqiMO=bH0&SIbZUTIV<nZeG|`NfR8RG>8a>BZCTXS)OO7mKA%6+xmjC-U-{^1Dy8
z*jcFZT+wcWiH3&W2+1>~Re8t8D<KW{)=YVF$#V{KDfNW|`ZW3NRAU0VFr)mc1=Ge-
zvMwu2zxCkGmE)E12ay;cRT?xB%<~ohQD8TPAB}rLw66)+H`J<v+NIo{CL0q=c6qBk
zgpjV2at+g?yop>(kFU$0RfY$Alz&j>6HY77sIvumu{zvUmDAPe(FpJ3C7Jd;oUF1w
zQ@&Gu901>~UQxDt68%7K56^KbWVx?DJ1B3~n*Wy>4%~*aPrrO_`K-KN|IAVKTH<tG
zR3YH9K4!|F)}L}`G&Lh2M;d?D9l>JbWLI8(ym_hD$7bl(Q)4liX`X&sJ%V(K)wLvX
zXcw+Q$Ye1}Qf|TGZo===A{NjS@~h3iqe}Ja#2%HZjgptR{@SwFtyGbQXlg}fZw2Ik
zE}!dl(Q~bssZ2=k%6r?J!f}o*p&hYh@YpW-Qa*)v=)ES<>WsLS-4WL(TAg>1a#X>*
z-C41ykfu{xQ!8Cftp+3pV@i&8&Be1DbA7dgS-th#J?p|d&MEeP8{;;TW3)3}obeVh
za*Qv@``hEnaPHL=Vs-}+*4x7uR3t&Eo~1W%M_jku&a9?Ur-GM<ZSj8S9x;?m+%=?q
zYyEDx$5R;md6!gCiq`;Zt<~Ldi-K=Uedto&U(+^J3$#}SfWQFn%`THCS?K%{Xu#R4
zQXF3$t_Dz|x&^5!@Hm0ve|o6c*_oXXFDn|)bj*mcLTtv=IIeqcS-!r0F4{?}h&D<1
zv>EBlIM8#^;HarB(omNEBLafyIz6X@xMT|ah%CxBES3>@|7U&9wNxZh7BiJT_07gh
zN4lt%L*zorp?I_wm%sV)ZITNd50axW#~Z70+4G4HE~^1GckW5mja@6n$?kK+J!(Yt
zu+DELC?=S=7#BmRp7V0}l?xBzffmoeGlUiYOXay&hFxvlBa;(ttl7TJzkKBj_dS6(
zT(HO#xDQ_VKMTZkaFPnTG@i>iW|Su6ufKZwAnt~~L;6TuzVqrM$MH!~V2zPDc-g~f
dEuwp3^2e`^xOC+9jJSC8q9S3_{?$ji{ujo9V157q

delta 8985
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
L{nM9zspG!@keMH;

diff --git a/src/helpers.js b/src/helpers.js
index fb21348..d572df4 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -251,6 +251,46 @@ showdown.helper.replaceRecursiveRegExp = function (str, replacement, left, right
   return finalStr;
 };
 
+/**
+ * Obfuscate an e-mail address through the use of Character Entities,
+ * transforming ASCII characters into their equivalent decimal or hex entities.
+ *
+ * Since it has a random component, subsequent calls to this function produce different results
+ *
+ * @param {string} mail
+ * @returns {string}
+ */
+showdown.helper.encodeEmailAddress = function (mail) {
+  'use strict';
+  var encode = [
+    function (ch) {
+      return '&#' + ch.charCodeAt(0) + ';';
+    },
+    function (ch) {
+      return '&#x' + ch.charCodeAt(0).toString(16) + ';';
+    },
+    function (ch) {
+      return ch;
+    }
+  ];
+
+  mail = mail.replace(/./g, function (ch) {
+    if (ch === '@') {
+      // this *must* be encoded. I insist.
+      ch = encode[Math.floor(Math.random() * 2)](ch);
+    } else {
+      var r = Math.random();
+      // roughly 10% raw, 45% hex, 45% dec
+      ch = (
+        r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
+      );
+    }
+    return ch;
+  });
+
+  return mail;
+};
+
 /**
  * POLYFILLS
  */
diff --git a/src/options.js b/src/options.js
index e9d7008..87705f8 100644
--- a/src/options.js
+++ b/src/options.js
@@ -105,6 +105,11 @@ function getDefaultOpts(simple) {
       defaultValue: false,
       description: 'Enables github @mentions',
       type: 'boolean'
+    },
+    encodeEmails: {
+      defaultValue: true,
+      description: 'Encode e-mail addresses through the use of Character Entities, transforming ASCII e-mail addresses into its equivalent decimal entities',
+      type: 'boolean'
     }
   };
   if (simple === false) {
diff --git a/src/subParsers/autoLinks.js b/src/subParsers/autoLinks.js
index 0d5583d..4bf53e9 100644
--- a/src/subParsers/autoLinks.js
+++ b/src/subParsers/autoLinks.js
@@ -36,8 +36,15 @@ showdown.subParser('autoLinks', function (text, options, globals) {
   }
 
   function replaceMail(wholeMatch, mail) {
-    var unescapedStr = showdown.subParser('unescapeSpecialChars')(mail);
-    return showdown.subParser('encodeEmailAddress')(unescapedStr);
+    var href = 'mailto:';
+    mail = showdown.subParser('unescapeSpecialChars')(mail);
+    if (options.encodeEmails) {
+      mail = showdown.helper.encodeEmailAddress(mail);
+      href = showdown.helper.encodeEmailAddress(href + mail);
+    } else {
+      href = href + mail;
+    }
+    return '<a href="' + href + '">' + mail + '</a>';
   }
 
   text = globals.converter._dispatch('autoLinks.after', text, options, globals);
diff --git a/src/subParsers/encodeEmailAddress.js b/src/subParsers/encodeEmailAddress.js
deleted file mode 100644
index 925b3cc..0000000
--- a/src/subParsers/encodeEmailAddress.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *  Input: an email address, e.g. "foo@example.com"
- *
- *  Output: the email address as a mailto link, with each character
- *    of the address encoded as either a decimal or hex entity, in
- *    the hopes of foiling most address harvesting spam bots. E.g.:
- *
- *    <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
- *       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
- *       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
- *
- *  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
- *  mailing list: <http://tinyurl.com/yu7ue>
- *
- */
-showdown.subParser('encodeEmailAddress', function (addr) {
-  'use strict';
-
-  var encode = [
-    function (ch) {
-      return '&#' + ch.charCodeAt(0) + ';';
-    },
-    function (ch) {
-      return '&#x' + ch.charCodeAt(0).toString(16) + ';';
-    },
-    function (ch) {
-      return ch;
-    }
-  ];
-
-  addr = 'mailto:' + addr;
-
-  addr = addr.replace(/./g, function (ch) {
-    if (ch === '@') {
-      // this *must* be encoded. I insist.
-      ch = encode[Math.floor(Math.random() * 2)](ch);
-    } else if (ch !== ':') {
-      // leave ':' alone (to spot mailto: later)
-      var r = Math.random();
-      // roughly 10% raw, 45% hex, 45% dec
-      ch = (
-        r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
-      );
-    }
-    return ch;
-  });
-
-  addr = '<a href="' + addr + '">' + addr + '</a>';
-  addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
-
-  return addr;
-});
diff --git a/test/features/disable-email-encoding.html b/test/features/disable-email-encoding.html
new file mode 100644
index 0000000..21e2731
--- /dev/null
+++ b/test/features/disable-email-encoding.html
@@ -0,0 +1 @@
+<p>this email <a href="mailto:foobar@example.com">foobar@example.com</a> should not be encoded</p>
diff --git a/test/features/disable-email-encoding.md b/test/features/disable-email-encoding.md
new file mode 100644
index 0000000..80fb6e8
--- /dev/null
+++ b/test/features/disable-email-encoding.md
@@ -0,0 +1 @@
+this email <foobar@example.com> should not be encoded
diff --git a/test/node/showdown.helpers.js b/test/node/showdown.helpers.js
new file mode 100644
index 0000000..ec9fa21
--- /dev/null
+++ b/test/node/showdown.helpers.js
@@ -0,0 +1,30 @@
+/**
+ * Created by Estevao on 27/01/2017.
+ */
+
+var bootstrap = require('../bootstrap.js'),
+  showdown = bootstrap.showdown,
+  encoder = showdown.helper.encodeEmailAddress;
+
+describe('encodeEmailAddress', function () {
+  'use strict';
+  var email = 'foobar@example.com',
+      encodedEmail = encoder(email);
+
+  it('should encode email', function () {
+    encodedEmail.should.not.equal(email);
+  });
+
+  it('should decode to original email', function () {
+    var decodedEmail = encodedEmail.replace(/&#(.+?);/g, function (wm, cc) {
+      if (cc.charAt(0) === 'x') {
+        //hex
+        return String.fromCharCode('0' + cc);
+      } else {
+        //dec
+        return String.fromCharCode(cc);
+      }
+    });
+    decodedEmail.should.equal(email);
+  });
+});
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
index c25aa6a..f2bccc0 100644
--- a/test/node/testsuite.features.js
+++ b/test/node/testsuite.features.js
@@ -53,6 +53,8 @@ describe('makeHtml() features testsuite', function () {
       converter = new showdown.Converter({ghCompatibleHeaderId: true});
     } else if (testsuite[i].name === 'ghMentions') {
       converter = new showdown.Converter({ghMentions: true});
+    } else if (testsuite[i].name === 'disable-email-encoding') {
+      converter = new showdown.Converter({encodeEmails: false});
     } else {
       converter = new showdown.Converter();
     }