From 6f8a6d21a16fcd38924c1beb992c4af84e5ae1c2 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 9 May 2000 10:01:52 +0000
Subject: [PATCH] Selecting the macfsn option didn't work, fixed. Fixed the
 help strings. Swapped the macfsn and help button numbers.

---
 Mac/scripts/EditPythonPrefs.py     |   3 +--
 Mac/scripts/EditPythonPrefs.rsrc   | Bin 8809 -> 8994 bytes
 Mac/scripts/EditPythonPrefsBH.bh   |  10 +++++-----
 Mac/scripts/EditPythonPrefsBH.prj  | Bin 21084 -> 24091 bytes
 Mac/scripts/EditPythonPrefsBH.rsrc | Bin 3953 -> 3942 bytes
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Mac/scripts/EditPythonPrefs.py b/Mac/scripts/EditPythonPrefs.py
index 618d33e4ec1..44d89a63153 100644
--- a/Mac/scripts/EditPythonPrefs.py
+++ b/Mac/scripts/EditPythonPrefs.py
@@ -50,8 +50,7 @@
 	None, None, None, None, None, None, None, None, # 11-18 are different
 	"tabwarn",
 	"nosite",
-	None,
-	"nonavservices"]
+	"nonavservice"]
 opt_dialog_dict = {}
 for i in range(len(opt_dialog_map)):
 	if opt_dialog_map[i]:
diff --git a/Mac/scripts/EditPythonPrefs.rsrc b/Mac/scripts/EditPythonPrefs.rsrc
index 7ed29c7c38c9b8b6a56bfb2eba9db2449ffc3ddd..f4b893f683e9edfb2bd844b373d6f3604e49bc73 100644
GIT binary patch
delta 712
zcmYLG&ubGw7@b`j(q<EBOOw>vm?^1MkrX@#3R+QPOF{g#trY2Hc6X8;+#g|PlC{0G
zJ%}ekox7l(6g<d+g1x90{{Zj)z>_yUc&aqc?wagg=6&yb?|sYn{cJp2e0WZI|7hVv
zW*30!?rZP47UmA#QMKIlZ(v~?fb3Hku2t@-iYmTTkBTCk7rkm}3MAjo5KxqT0F>tN
zB^y!GM~>JzbUG|gtBNR8CdJ9haTTmfP8Zu#nyMP%$5Krde@f#cwJ5@N!L0aIDvQ0z
zQSr6-eJIxivtcp+dDu9mV+WfYavuhWda&tJNIcW`7-1ZH9Ijlr2s;e5u%sdLJJiH%
zzTUuW;IjxrhJ$0}z-Vs7dBkgp)#ClFGyO3(VbQD(!_arEI^!GCsdMC6h+1%w$jU^H
z!=h;}GMmgzNB#Gr4)^QCZTplb5)TG8F>Oe3+d=a85_XU(L(lh91Hx^16?I7qapHSW
z$Fxf#OF&V(jVY5`mJ5UNod8fX+3er8+7+A7KD)H~c3HM>Sx)P&Jc!Y_va}}OP0Qql
z<R9zHw=c{02}$agwiL?#8-3+wO&p%-&gDNv$58frJpjfY#JCsX+=rAe91-tkrninM
zapP6m(0-=|Z7;?7OsW};ubm9Y|A=^*F9#ILsb=g&A44!c5@V@>V8V~E?MApbaU&`Y
NTnju*<yw=o{{yww;Qasq

delta 581
zcmZ4F_R?j7EhGCxJ8f1b1_pVijd_c?SvXHJC~e*;cA2BzGB`CSHMvBgBwwMlI8~vz
zq$o2lUALsNAXT9(F{d=OSRpOH2q>JGmy%eNqL5mVoLW$lnV(mzXX27tjG{L$wOk=N
zC$YF#Hz~0=H3h3CM~HPmI}}PXGK&=^DU?pWDEfqn$!&AKurkx+31X_71$nZW7-J?2
z3dgW8FfgV~&gKoAd`s}t<QqaflX-yniIC>zPQGR)Muy3}g6iDt3?CW985tdzULKmP
zFKBG;!GHuBSr`}@{{aQK0v<5fH83!+FH`^;3KUQPhXw-!6DvE<X$PiRlZ_QKY=T3A
zl!4M=87VpGK#fW6q1!!y{3;-~0?2Q3@o|p;((_W1OOk-%+cF{ap<vG_*U8rv%jzW$
z0F7o~{P+Jq1B3J}F#A7<Exrp${2Pc30UVD(^vgs4|0^(XN`u%Lxga*zS`eENs8@kO
zqzcRinyJ7b8Utc$040ECE`y0PFi5-tv%|oaNqhlwAnbn#MN$O_w&WcITS@@L1}X;{
XDhJlf=U<+eTBJ~vTAW{6l$;6xdW5WG

diff --git a/Mac/scripts/EditPythonPrefsBH.bh b/Mac/scripts/EditPythonPrefsBH.bh
index c12f31d90b9..25b55ccfcea 100644
--- a/Mac/scripts/EditPythonPrefsBH.bh
+++ b/Mac/scripts/EditPythonPrefsBH.bh
@@ -32,12 +32,12 @@ DIALOG 510
 12.1 The type code Python will create files with. TEXT is probably best.
 13.1 Press here when satisfied with your new settings in this dialog.
 14.1 Press here when you're not satisfied with your new settings.
-19.1 Select to use string-type values for standard exceptions.
-19.3 Deselect to use new class-based standard exceptions.
+19.1 Select to warn for inconsistent TAB usage in sources.
+19.3 Deselect to disable TAB consistency warnings.
 20.1 Selecting this disables the new package and site-python features.
 20.3 Deselecting this enables the new package and site-python features.
-21.1 Press here to turn help balloons off again.
-22.1 Select this to use old-style Standard File calls in macfs
-22.3 Deselect this to auto-import macfsn which replaces macfs StandardFile calls with Navigation Services wrappers
+21.1 Select this to use old-style Standard File calls in macfs
+21.3 Deselect this to auto-import macfsn which replaces macfs StandardFile calls with Navigation Services wrappers
+22.1 Press here to turn help balloons off again.
 END-DIALOG
 END
diff --git a/Mac/scripts/EditPythonPrefsBH.prj b/Mac/scripts/EditPythonPrefsBH.prj
index dcfa46746fad81348df0eba6505003d75a94d7c2..955426d9e1d32ff77b84384dade54635a1734fcb 100644
GIT binary patch
delta 1585
zcmZWpU2Gdg5Z=8X|HmYC;v^S4zWh0knqCt^s-Pyp=iri>B(^I<0-~ac>k3<q?K(k3
z@Q@%tJn%p+BUMGvs-hK*iYfuuA|X`>5Ipd}KUEMd(7u&7KlA~Fpv>N#n@AmLcfOf#
zc6M%d_imi0Z(pT>Y^ijd5W*8eBZSQUL&#HIgb073Z}`K2he9gk&<DgPX^cOGzIGfa
z{3ket3`qDb)Ut*DL)~Fwp$B!Rg=46@^g&;i!uz&zYY<JAilvZouq7<CSyNx=!Tm`T
zYdAuP10i8{Gx0D;T8PWgtsA~Jy%Zdxuo;?y;l2fZ%6{3cN9ZXY-V%0+v-#qo2{_CJ
z_?3};@CR-4qL$+;*<5)!Un(xaZ(OTEy)JYcTIM7-3rST<g<N)7zm<4^)1yA1dYdof
z(%)^jQ5fiKhabBYSgRA7j4E)VHGrDa)DFL$_0o`Sic(E&25;}@9qSfnDEqmekL<J=
zhUw0)V6W(aI=KM7eOL55p<k)KtLqD@b3Gmoe(&?z$1ZK&y}R+PQ6p6AoZ#+nwU1rA
zfIa*Ld;B-`VhOI9<cvBUSK@PVP4#=DEV*D!0#rjyT56vMOQeJ&;!LTS)6}5;@5okz
z6MHxGpv?M~e7MEll!?z}l&q$<!`Zl#^-5D)pt^t0HnhR`Xm8D28@<P@joRV6(Qu8a
z?icx^xnr6d#pNO#9*dYvBfK-_gw^pNoQb=4xVY!aF!)$-ds`!rFIA4R6a(YdK8+ib
zgSA!blP-#-1|8G0vT+48HNZCGDml0{8LVTz+>(57v0SPw<CzHgse>_1m7zLe?d%uw
z$yfqi-sD2T3S_;|REbmOSr_hwO0b@Y+p(p}@%)0ZQ7s9EmN4}G6oOJ(C}8M)Otapt
z)Qgle&h%V0!Rgl$GEW8gfgO~>b41Y8$!T__d^j9racQ~2PIFt>`{kLRz2_Ywpr0~-
zafcJ32#?HcNn#42RIcQX5#i(rV(Zqn5g17N6QL*}wnmda@DkG2<$maKe2X^IFP=uf
zakVgM0W;W5f9fLoMI0!$6R@82OSab#yG&ZYikP(z#r7tAhICH`S6f;6-RO53EU}%2
zDqDRWO|QB7_8G)(lkU3?a!TQBe?lsCKng#NUaRDZ%ZMAysBjTJNcpASDw<!KNiKYf
znDrB7_Z7H_bpJPqH%)r@JYwsmhgYCJ?dSG950SJY?R^<vd;em2DUThw&6b-ocnQjB
zg_}yl*|c9u&tqTeja;tPk1;|rqn<bc-y<D<4^59jJGXv995CtdM;nKpStTUQs_QiP
z*rP8ZW`9hS@J*b|4~%7=MQr_uBkW_%qm12Pjh1nsgzw;F?h~7T6>$gi5;CXZv|;AI
X_6B0>XFc>a;)a4r6kb823kUfhv_x8<

delta 852
zcmYjPT}TvB6h3!$X2-wGVQV)=TX)x=ZE#x?6?|$lLupf7Gl|?Su_zMK-86eCupT0M
zTuy}$8G)b(f-%~Y6p@epAPGhZJq1ERL_HV;+jn<**aLU&cfar4Z|*(kK3Wx9v!d!k
zI(>zRTtwmkQTH37p5H|3WpItps>%c(3mLZIx$DXvP4iNdYB!61k?pGE1~qfYhpfWb
zk3|4x({PZyT$6`{oaD^0kk3A^&y;dPtF%SssS-_tDC}XMB6!>#DJmw?hNJ08ZjbNF
zCTe)P?lsT2yX`IOlW+-Acs&x}U3!d@^?v>tUK2&w>l6GgvVbcnJltp5*AJE}TpoTE
z{B8wC#sXaf{l|wo()uDT>5EF{8&MTbb0nAB*~qppb5p||wk#W0fdQ3a<mZ)E{{y0%
zho!xOi<^3@zdo0{eILXhVV~@-(Cm!QBUI=7eTJG%oRbCOm9VLjLaN={vSZj+2ZFA6
zzP2ijPFx#@e?e%dxwr*h_Mjl#^H@lJtbhd6dF;%l>5-(F8NYam)Q4@rPJzi|^3b3+
z?i(a>?{VbL8<6FN5N#icjK2=AJqD5Q5xRt*2;Jcm3*a@GP2`{CmxEr@e-F6Ck?mDr
zU5b#Ie@OW$cDo(f)c_tXlu<p$)k&{e{S~;}k+)}nOQi_;7xyNkO7JaDB|FVfBdGsJ
z?pOvkWDZfNgTKHe)C0Wcn9RKZ&R2k_#^Bv4uUTt>ns?;ZS>U}Gh}w0IrMyaQj!&ne
zru7*QBr=+r7(qq0oecSn==>xVRiZWg9$qacP?w6lSIN|K$flDS-{2hNa5I)=dAWG=
P1F(Ech;WP>&!+wXVwbZI

diff --git a/Mac/scripts/EditPythonPrefsBH.rsrc b/Mac/scripts/EditPythonPrefsBH.rsrc
index d272f638f14c3b06838c6937628b99dc4e4fce9e..ab50d323bdcc21d82f8088c69febdd374121b3df 100644
GIT binary patch
delta 142
zcmew;_e^erEhEcBJ8jlY3=F)RHs<lOOrFcaH#wU{fti6TZSy*os~kzD!Kpc^$t4OU
z`3mKUMR^Ko`9%tudCB>C#hJw=sd*&|A&yQ8rNxQqsX$?c;{4L0<kVt4U6<5ixW1Ik
a;>4t!RIp08#^g${d6{|Xn?LY2G6Dc!JTdM7

delta 175
zcmaDR_fc+wEhGO#J8jmz3=F(`H|FuPOrFcaH+eU+(BxVcK4u24!p-Ygu5#2{2B+qv
zCYLCb<SUdGrz#Ye6lLb6>y}g&q$-pp=9H!uE2QNY0fiIuQWA?&6jCdaQwvHm^Ye=J
sOk7fnQS|1emMbLZBo-IzCM6c9reM|N2(b=mheAn4X0gKN@4Wep00L1z4gdfE