From ddc11d2ff10363798b0c84e1b5cd16faf864ade0 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 6 Nov 2018 16:30:10 +0100 Subject: [PATCH] + enh: inconsistent indentation option switch --- language/common_res.h | 6 +++ language/np3_af_za/dialogs_af_za.rc | Bin 76194 -> 76560 bytes language/np3_be_by/dialogs_be_by.rc | Bin 76422 -> 76884 bytes language/np3_de_de/dialogs_de_de.rc | Bin 77570 -> 77862 bytes language/np3_en_gb/dialogs_en_gb.rc | Bin 76274 -> 76596 bytes language/np3_en_us/dialogs_en_us.rc | Bin 76074 -> 76416 bytes language/np3_es_es/dialogs_es_es.rc | Bin 78442 -> 78802 bytes language/np3_fr_fr/dialogs_fr_fr.rc | Bin 77766 -> 78130 bytes language/np3_ja_jp/dialogs_ja_jp.rc | Bin 73234 -> 73642 bytes language/np3_nl_nl/dialogs_nl_nl.rc | Bin 77584 -> 77950 bytes language/np3_ru_ru/dialogs_ru_ru.rc | Bin 76400 -> 76862 bytes language/np3_zh_cn/dialogs_zh_cn.rc | Bin 71460 -> 72242 bytes src/Dialogs.c | 71 +++++++++++----------------- src/Edit.c | 17 ++++--- src/Notepad3.c | 2 + src/TypeDefs.h | 1 + 16 files changed, 48 insertions(+), 49 deletions(-) diff --git a/language/common_res.h b/language/common_res.h index b5bcf9d90..de88ee5bf 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -287,6 +287,12 @@ #define IDC_RICHEDITABOUT 18091 #define IDC_TRANSL_AUTH 18092 #define IDC_TRANSPARENT 18093 +#define IDC_TAB_WIDTH 18094 +#define IDC_INDENT_DEPTH 18095 +#define IDC_TAB_AS_SPC 18096 +#define IDC_TAB_INDENTS 18097 +#define IDC_BACKTAB_INDENTS 18098 +#define IDC_WARN_INCONSISTENT_INDENTS 18099 #define CMD_ESCAPE 20000 #define CMD_SHIFTESC 20001 diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index dc55c9dd2a3342148be1b6608165097eae529f59..f843bb4b0d3385afbda006ba073a0a3fc95dfb98 100644 GIT binary patch delta 398 zcmZ2A~HE3sb{jAx6kB;c(%z=$s&{OLO3R$GgjKXE@2kq zWFHr~$p?P0Y@U!D!8Q4dR?z0Oyc2w^h71M_Mw<<5uQN`v|sGf)(!*^wa_$O{IlaGq?a89ezx z0~^p9QwD>{hRUXsp`x54FMRlq+>)1lf-O%vp8lS<<#lYn0^2Q&aT04xAFlOc#VlRAMylNjV$lkR~A0Wp&?PB)W)!32{qf=ZM4 z_$ZTrUoZ(b05Je805JeFlR<7tlU{^yllW*bv;Ktgi~~3TGnbJM0W*{Sgc7$n5&_s4 D&-qSH diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index b0cd37700b18e279f4a8edb3115faf178769ea84..06311bc90a543bfaad5d63721abc22007ef4e894 100644 GIT binary patch delta 560 zcmZp>%5vof%Z3|qlTDt7Y>tTMW1Q@eqcYhisQ@StG}$UyZ1OxYj>-QFl{R-I%wU`x z<19D*0S}|Z=C;6IN9JYhj<8sBZCt|JVQ8xCxZ(^ z2!jWM4ud&^<>ZO2)|2CSl_p2jSAf-dGWY@IU4di>P&J4Z08%~qYJI;nNT)MU6lRtq zLokpR3{>GfdE(PxZWEx1It+#krVIv?4~m*jzSAf)nWxc07F{2*9l;=-ljk&YFe7w@ zsls$P0bT9P;0?DCQ)gF`94K^R!x<78iWu@3GJ!aqL4hG3NGpJO$zXOdkX_7B!jK9S zFM-OWKzWHkkxZ~EJq9J94`8;318olihD7}2zd@4x@j!7z*nr#}%4v+`U*X9Cc_x!5 zyewcepDfs+zqzLQSf-7}i5qrk|w`O~!mW^_@3&0lVn!9_Rky0^`U x(QieB2BQHJ3oio~0{~q}obCVs delta 236 zcmca|gQe{%%Z3|qlb2kt*{l&S#JJfmaTnv{c`tM($0ZbiL?_E7N=%M%mfI|rJVTPv za`OJp>zg}jg%~Fboa36jqwX4zW|>@YnQii>`mV_aFIXn8NK=_CAYs61!eGvz!(hQ+ zHu<2a>Eu@pUX!0ZiDI_|iWxGPOioNS2Z{+z{?_O++31%BP>0dvElo0$^P(&!N4=i2 zd0)%3pvfVPL6iON*lkX@QNRr1Z1%ge4a@+F8cdf_X5`qs>p_hXqs8<>K1S2Y`&xvy f*9kNFiB7+u!RRxcO@~oxx|Js5v+Xikj3!I~mX}|& diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index 33e8d98fd6a8a9316d9267d1205076a8d605dfc3..6f71b0a19b62305fc9b17a93c3032b5e316a947a 100644 GIT binary patch delta 468 zcmYk2PbhATD_v%h8Bl9_A4R9V(S4r;}h=Z@8_It0jCu_j1v>ZK4(keB)>NP}b}Cv}hw?zJvt zpRKrxEaymrmwcS)=QGIpoRV`qI@WGse-W#TNp4cOuW;9cDuV)FbPHjxs4M!VIZB>r zUEj$OwY|KHhlY7-p;HNoKf?sfF*6p8Ry+or*xlB``l5kD5gS9iyN_@B`Bb=8ctWvf zNe1PwsXD0*qtRN#C!Ls&E#YlkgTuKxrr9`jAa0g0b$J7O!~$2!$cC;o0{?=9o`fDB z7XuYGe#1{eoTut{brQnY_xQ9oz?FDHBt3%ckI43t-RgoTB7XY>c}2o^YO{28-=Y#E Z%p{xGL)tQ?>Z11jBa_gUkn}><_z!TrlidIS delta 233 zcmZ4XfTigk%LbkJ$tCw{HrK>2U<5OA65H6o45y5LtYF53JSl!=O9q3HAxHj9hr5H@!$E!5?&5oGKrw;H;PRP-ld|}&$ z$shF8CV$u=G`VNjfz1uuy%;A?=unzGVds&}KD+x^rVB7LDoy@zpl$N6W<8)N$7GfR emnQq{_SyX5ph76K1%vVQjUtT3+ksX+kN^OA-E7MM diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc index 34c56c169ccc23d57f2de130aeaceeed5ef0b5fc..dda6d85342e07ecfd38e7a589761902d756dc58e 100644 GIT binary patch delta 424 zcmex#nPtm0mJO#8CO?Q*nLNRmW%9P9l*uld0h6aCi%s@X=9qlXSZVW{gjtM}H>{DH zZo|VUvH4N53)f^8?V!y|@=oxv8ZsC#7)>^`I=I=OPKhID;pH z3quHl$7JvN`yd%{PX<4rh%1l`0m_3|0bqIkhUwBEwa!3Mm~KagU?49TsKR-&Vn*m> zg+>-;Lk82yia$grZ_rel9MkAD*)N_$6s8{8?BL0cn!%i=43-Q!3@|+)4_Y+&fb>j` zQNp8d@|`9QMuw=j6*xpPSePP?|(|V|f*@D4%yPy!GvLpcQm{HLH diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index 7f4b98478dfcc95432d517291717b135b8b25bd8..ec2da0f57ddf90c4d33c0cd6020ddb6d137d3294 100644 GIT binary patch delta 456 zcmZ2=iKXEx%Z5!}lec)+ZD#TQA~N~F7q!V79 z-1Gt!MwZQgk|MY!tBD6}zL0y0kJXUDfWc_8;hKY+<7&kiCntz-h=wpYGB`2BGlVmE zGPp2=FnBQNFqlnNY_**nH&tcwy}BxpDsfK+KcK8DkPHE;1+fA^YA46mPnQPia|VjS zOmbuh2J(V|Dx4=@YzXEwVK4`pX~|!9h zn4yFr6)0XZd2NF{$QI6Upe;c_AI49<9VE#g4-5~4pFu7Q=CoiihT9@KIUvkza$Hj$ zqxt5uO^UtDmJFubKk_r46`8(3hS6)ffGVTJ^aYAQR+TDa-u5@DjBJeCzo{{rFaZF> C(|}F@ delta 260 zcmZp;%ChPb%Z5!}lS6WSCL4ILZ8q@!BC=U7aS!9v0TTp)?f3v$o#Fkw*IwKe3b`K3k3nl;~ZC%;` diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index af68355e8ddbc6bbdb14fe4faf4beeede72b3179..9b16102c7ca1f0f999af57dd868712daa18cf9fb 100644 GIT binary patch delta 418 zcmaF$gyqt6mJJfVlizvQZO-yNCptOcrOITr)Pl(@QUQ~N(j+D;BymjEQ&5`x;EllM ztmFxdliwXt*zA>dfeWN!^Rz-4epW*U0|ukXi8%)+zndX6xvQ6J^1ttFn`bl%F;2dq z!66vJ;K<;_5YG_K;K|^^5W?Uwd41Dukc_w|gC9`D6-b5v`pI)Pa0tV6 zIx++U<%5B;&XXCXf+tUFnI;P|%NZyNQ-f?)@MOc*uc|N=PC)ye8N6|*1esUYCI|Aj za5zIELlHwBLnaWXGbk|RGvrOS50w=K@lzO5fn*6#MF~(IB-0owt{D&XlOND@e;^qQ zWCsInf%ym3MT}CRjK-52+YV1=x*{~W;fmb!97#r@&28;gO_L{ZaZKlvV-(tckCQQi RpV4x|3Ubd&%9 delta 196 zcmV;#06YKE=LG8H1h5!Qle8O7l1T)!mQBtTlP(}4lT7Xqvzla(0h4b3ER%?1aFdkX ze3M9I7?a$;9+wUl0T{DjX1WTKl-+!@YH=J70XdT)j^DFrffxak@U;k&oPyYs@U;Y! z@YDncHUKvOEC4c-p@KP+P9q|du-Fol3WPY5Lh2}!fP}`ABI{a{xP_pX5CH)wlc0u9 ylWtiylRk)YlNMSsm)05q5R=NuB(oNY7J`>n7y%r&L<<304+A&=Gq<4{0WlfP#ZS@z diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 1f81f6da6ab2d7c68846d15efb22b9e15e85b389..e27c3874637324be8ce266213ce6edce351a6734 100644 GIT binary patch delta 429 zcmX?hpJme{mJKaFlM}q_Hed6ZAUfF~Wx-?<-Jr>SsbZ7&J>{7E&r)gfgI7YEXC?J9 zPBti#o30?lD6x4~>M^d#&%^^Z-znhWXEkInU@)4z(e>cux*nO$M;ZheCx1xh5DZ~( zWN>1LX9#ETWN={!VepuIv+*`aM%iHpeRhYBSSEd z7YtP4Jeg5Ebn<~_Hb&FQh0n|<|7&)@P>p2rWJTG)$pPXloTdzx3_1*k3@}{+lb^M? zDZ}h>0=m+f!5eNLx(N-fJV5&dUswurP5@dH$t1QCHFB-c6hBbd0SG=+KmLMcnN1liC--OC zPUdJ0o4oBGNX&@QaB}t`>B%3AlqMUrw@h}4G}`>E-E0D*#q@>JjHZ*HvqV2RvcxV{6LjMFoeO8!HFTBA)LXJ!G$4&!DF&^)m4y;xF>@j zP{b8Th5+S3tN^e)Yjv|UNUbwa6sFseAsEOD2C8tLd{H!b@`LIkS#&kX<^_XQt*R-Q zEMh7k3Nr;$MNzHXWCt-NQ8l3Z5*dmZ@)$CKIGsU(A)g^{@>+jcQ4l|cAr(lL09BL# z2gJBb=1%okz4uc_s>Ew^Ey(b^5&6zB8Txjxv bV1>;ob<^6IEg4LwH*zov$#m?6O%3@B(tbplmU|Gs!?PrL1Ob!$rwEfodeQ|k05AYClQnyTlTL#ulTauy zlO}v}lbGx%lMvN1lL~!qlkVAAlkj~WlWxd1lU{#plMu-;v-*FSh5tF@lT| zn?I#Y;hKC*JYX|Zfeb&hA%nr>k3yM~&P8p0RIkK1SwWpcFoeO8!HFTBA)LXJ!G$4& z!DBLK<71GFxF>@jP{b8Th5+S3tN^h5$Hw{6AhpgwQJ8K=hF~Bs7^uQ|@d7h$~H2YxbM`#+ySFrV`oI;K>J{g-$-#%r<#jrr6{I+A5RzS|UKIC)b#B2xHMP zdA&sVv?7H(5SJRusffVMqm%B|sG=KzWc%Vu-kA zJkXDRKzI8C$zUKm80dbO|4`laP%N0)g25Q*i@?c3ttFF{E(%Q+2$b8rt<`J-vn7M+ U^o3H4#*??T3T-zLW4t2)0Ll+_IRF3v delta 202 zcmV;*05$*q-~^D~1h5)Rlaw${lh92BvzSa`6_d_1D6<-4q5+dW<|>mMVrY|MZhVu} zVivQ!WXcMYVs3o1)^8jS0XdUV|E-f?I~KFJec%9KaQOzaV2ApT0XUbj838r7kQV{& E7<+3|#{d8T diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index 333444057bffa436762cc6648b44997a85f88cdc..dd2e1f9125cf52c33fdc95cbd496037c8ae978c5 100644 GIT binary patch delta 514 zcmZWlOGrXd5S^PZ`#?|+r0o9z6Vbkuy7SXd0x_S|u9sPaP_KvWQ0Tup=GODwvy%=O4MS8nYri8nR7p%h3gmL;(i{V*8b_0qJo%?%QD5+S^pU6b%U zp(ptf%-ZbukQA|yaQx%^+K+?%GkB8IV=Ad-UGEUa0b?`8Rn%ghEUggU5&Z#HU_BLDyZ delta 219 zcmdmYgXO~&mJO%kCWm-dO#bkSZL>_g0OMwZ#9fS&@97#$4oS#?$xIeX6x;kNX`3XY z<>ZZ>*Ed(y3NcRpaFlEEs=8~FKOEzlyrjNsvRa46WCd{pRucwu2A#?4gDofDY4DnS z?MW27C4&xwA%n@}iTdV1F`>yX8eJx<`~s_;N->qDIsClo>fTuX#{o#Aq>HkcZKHdx9`yoappJ8jL>Eg)|v| LY-iJAG+_b&%H>;~ diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index 8b7493bc55f1f11cd0b9ab80db765ddf01330101..93858e812e92b6ea499f24a7b1212453d13080e7 100644 GIT binary patch delta 552 zcmZ3oj%CvpmJK(!nDrU-C(k`*&S}VC#9+ao!=NyEp`*CC36Nz9#4u4PJ=vXKd2$QC z-ekK{g~{FK-%64S&n`I?d5WCvf9 z$qHgplh28>ZGMxog^$^g!C1LX9#ETWN={!VekOj zZq5L7$7K65%gGzIC`~?AngvoR?#bW>RN)FFLxAc*tN@Vu$);tUlXd(#gkdH*G6VzV zgMqTnlP8`Do-9_LB@Hs$87K-SzQo6g&`G4mH<_h0Of%)40;SoKtIB4 z3J2O01oTt<zX~AF&juX?#ftsR|-vygZ{#B7S`O!w9Np*6Y zCsc}gPd4#Onk;ZpX7i6DE0|%N$v=)bY&JTXge+jRS>o&q14hfqf*(yMPpA~y?D21& Z=;UMUa??Z@KWzUZ!f3$6!pp$L007Q+o?!q0 delta 210 zcmV;@04@Krv;?HC1hCi&lU`FOv%(8bPP6V>vH_Ev94eDCTC|h8u^_X+T$l)x)L2lH zkQfHD+GVs30XdW5fWwnib^4R=wh93>lOKLNlTHjGlgf5#lD`TCGyp6BGLs>GTa&nV zB$Mu6D3j1&GLuYrXp^X5Sd%1qc9Xv6D3f5-GLsZ~9Fy=bB9lO26qA5^W|L-7GP4+b z6ibuTcv6$l%Rsa0$7lnS)Ob>}(95C&lhk-pv+&OvF#$N2VFLj*w?F{_uoaWa2O5_S M7Xk3M`WFE-0*B#SEdT%j diff --git a/src/Dialogs.c b/src/Dialogs.c index d4bda627f..dd215b063 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -2117,30 +2117,26 @@ bool LongLineSettingsDlg(HWND hwnd,UINT uidDlg,int *iNumber) INT_PTR CALLBACK TabSettingsDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) { + UNUSED(lParam); + switch(umsg) { - case WM_INITDIALOG: { if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } - SetDlgItemInt(hwnd,100,Settings.TabWidth,false); - SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,15,0); + SetDlgItemInt(hwnd,IDC_TAB_WIDTH,Settings.TabWidth,false); + SendDlgItemMessage(hwnd,IDC_TAB_WIDTH,EM_LIMITTEXT,15,0); - SetDlgItemInt(hwnd,101,Settings.IndentWidth,false); - SendDlgItemMessage(hwnd,101,EM_LIMITTEXT,15,0); + SetDlgItemInt(hwnd,IDC_INDENT_DEPTH,Settings.IndentWidth,false); + SendDlgItemMessage(hwnd,IDC_INDENT_DEPTH,EM_LIMITTEXT,15,0); - if (Settings.TabsAsSpaces) - CheckDlgButton(hwnd,102,BST_CHECKED); - - if (Settings.TabIndents) - CheckDlgButton(hwnd,103,BST_CHECKED); - - if (Settings.BackspaceUnindents) - CheckDlgButton(hwnd,104,BST_CHECKED); + CheckDlgButton(hwnd,IDC_TAB_AS_SPC, Settings.TabsAsSpaces ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd,IDC_TAB_INDENTS, Settings.TabIndents ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd,IDC_BACKTAB_INDENTS, Settings.BackspaceUnindents ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd,IDC_WARN_INCONSISTENT_INDENTS, Settings.WarnInconsistentIndents ? BST_CHECKED : BST_UNCHECKED); CenterDlgInParent(hwnd); - } return true; @@ -2149,47 +2145,36 @@ INT_PTR CALLBACK TabSettingsDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPa switch(LOWORD(wParam)) { - - case IDOK: { - - BOOL fTranslated1,fTranslated2; - - UINT iNewTabWidth = GetDlgItemInt(hwnd,100,&fTranslated1,FALSE); - UINT iNewIndentWidth = GetDlgItemInt(hwnd,101,&fTranslated2,FALSE); - - if (fTranslated1 && fTranslated2) + case IDOK: { - Settings.TabWidth = iNewTabWidth; - Settings.IndentWidth = iNewIndentWidth; - - Settings.TabsAsSpaces = (IsDlgButtonChecked(hwnd,102)) ? true : false; - - Settings.TabIndents = (IsDlgButtonChecked(hwnd,103)) ? true : false; - - Settings.BackspaceUnindents = (IsDlgButtonChecked(hwnd,104)) ? true : false; - - EndDialog(hwnd,IDOK); - } - - else - PostMessage(hwnd,WM_NEXTDLGCTL,(WPARAM)(GetDlgItem(hwnd,(fTranslated1) ? 101 : 100)),1); + BOOL fTranslated1, fTranslated2; + UINT const iNewTabWidth = GetDlgItemInt(hwnd, IDC_TAB_WIDTH, &fTranslated1, FALSE); + UINT const iNewIndentWidth = GetDlgItemInt(hwnd, IDC_INDENT_DEPTH, &fTranslated2, FALSE); + if (fTranslated1 && fTranslated2) { + Settings.TabWidth = iNewTabWidth; + Settings.IndentWidth = iNewIndentWidth; + Settings.TabsAsSpaces = (IsDlgButtonChecked(hwnd, IDC_TAB_AS_SPC)) ? true : false; + Settings.TabIndents = (IsDlgButtonChecked(hwnd, IDC_TAB_INDENTS)) ? true : false; + Settings.BackspaceUnindents = (IsDlgButtonChecked(hwnd, IDC_BACKTAB_INDENTS)) ? true : false; + Settings.WarnInconsistentIndents = (IsDlgButtonChecked(hwnd, IDC_WARN_INCONSISTENT_INDENTS)) ? true : false; + EndDialog(hwnd, IDOK); + } + else { + PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, (fTranslated1) ? IDC_INDENT_DEPTH : IDC_TAB_WIDTH)), 1); + } } break; - case IDCANCEL: EndDialog(hwnd,IDCANCEL); break; + default: + break; } - return true; - } - - UNUSED(lParam); - return false; } diff --git a/src/Edit.c b/src/Edit.c index 5d58e5eed..e3a503c93 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -951,13 +951,16 @@ void EditDetectIndentMode(HWND hwnd) } } } - - if (((tabCount > 0) && (spaceCount > 0)) // mismatch - || (Settings.TabsAsSpaces && (tabCount > 0)) // existing tabs, should be replaced by spaces - || (!Settings.TabsAsSpaces && (spaceCount > 0))) // indent space, should be populated with tabs - { - MessageBox(hwnd, L"Found Indentation Inconsistency.", L"Notepad3 - Inconsistent Indentation", MB_OK | MB_ICONEXCLAMATION); + + if (Settings.WarnInconsistentIndents && !Style_IsCurLexerStandard()) { + if (((tabCount > 0) && (spaceCount > 0)) + //|| (Settings.TabsAsSpaces && (tabCount > 0)) // existing tabs, should be replaced by spaces + //|| (!Settings.TabsAsSpaces && (spaceCount > 0)) // indent space, should be populated with tabs + ) { + MessageBox(hwnd, L"Found Indentation Inconsistency.", L"Notepad3 - Inconsistent Indentation", MB_OK | MB_ICONEXCLAMATION); + } } + // TODO: Set correct Indent mode } @@ -1342,6 +1345,8 @@ bool EditSaveFile( if (hFile == INVALID_HANDLE_VALUE) return false; + EditDetectIndentMode(hwnd); + // ensure consistent line endings if (Settings.FixLineEndings) { EditEnsureConsistentLineEndings(hwnd); diff --git a/src/Notepad3.c b/src/Notepad3.c index ea1d4eb43..0ebb52e90 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -6825,6 +6825,7 @@ void LoadSettings() GET_BOOL_VALUE_FROM_INISECTION(BackspaceUnindents, false); GET_INT_VALUE_FROM_INISECTION(TabWidth, 4, 1, 1024); g_iTabWidthG = Settings.TabWidth; GET_INT_VALUE_FROM_INISECTION(IndentWidth, 4, 0, 1024); g_iIndentWidthG = Settings.IndentWidth; + GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, true); GET_BOOL_VALUE_FROM_INISECTION(MarkLongLines, true); GET_INT_VALUE_FROM_INISECTION(LongLinesLimit, 80, 0, LONG_LINES_MARKER_LIMIT); g_iLongLinesLimitG = Settings.LongLinesLimit; GET_INT_VALUE_FROM_INISECTION(LongLineMode, EDGE_LINE, EDGE_LINE, EDGE_BACKGROUND); @@ -7191,6 +7192,7 @@ void SaveSettings(bool bSaveSettingsNow) if (g_iIndentWidthG != Defaults.TabWidth) { IniSectionSetInt(pIniSection, L"IndentWidth", g_iIndentWidthG); } + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, WarnInconsistentIndents); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, MarkLongLines); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, LongLinesLimit); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, LongLineMode); diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 20773370d..e494d11f3 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -282,6 +282,7 @@ typedef struct _settings_t bool BackspaceUnindents; int TabWidth; int IndentWidth; + bool WarnInconsistentIndents; bool MarkLongLines; int LongLinesLimit; int LongLineMode;