Adrian Aichner <aichner(a)ecf.teradyne.com> writes:
> The patch failed against (emacs-version) "XEmacs 21.0
> \"Pyrenean-pre4\" [Lucid] (i386-pc-win32) of Tue Oct 13 1998 on
> TWILIGHT"
> isn't that the latest one?
Hmmm..
>
> Jan> If your package-ui customized and has menus then my older
> Jan> patch is in, if not upgrade.
>
> Hmmh? To be exact, I have this:
I meant the menus that are now in package-ui mode. But anyway.
I did a CVS update
cvs diff lisp/package-get.el lisp/package-ui.el
again and uuencoded it.
Unfortunately this will also you give you gregs patch. If you want
I'll recreate it in its own but the change itself is really trivial.
Jan
begin 664 gregandjv.patch
M26YD97@Z(&QI<W O<&%C:V%G92UU:2YE; H]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]"E)#4R!F:6QE.B O=7-R+T-64W)O;W0O6$5M86-S+WAE;6%C<RTR,"]L
M:7-P+W!A8VMA9V4M=6DN96PL=@IR971R:65V:6YG(')E=FES:6]N(#$N-0ID
M:69F("UU("UR,2XU('!A8VMA9V4M=6DN96P*+2TM('!A8VMA9V4M=6DN96P)
M,3DY."\Q,"\Q,R P-SHS-CHT-@DQ+C4**RLK('!A8VMA9V4M=6DN96P),3DY
M."\Q,"\Q-2 R,CHP,CHS-0I 0" M,C0P+#<@*S(T,"PW($! "B @(" @(" H
M<')O9VX*( DH<V5T<2!D:7-P("AP=6DM<&%C:V%G92US>6UB;VPM8VAA<B!P
M:V<M<WEM('9E<G-I;VXI*0H@"2AS971Q('-Y;2UC:&%R("AC87(@9&ES<"DI
M"BT)*&EF("AC9'(@9&ES<"D**PDH:68@*&-A<B H8V1R(&1I<W I*0H@"2 @
M(" H<V5T+65X=&5N="UF86-E(&5X=&5N=" H9V5T+69A8V4@*&-A<B H8V1R
M(&1I<W I*2DI"B )(" H<V5T+65X=&5N="UF86-E(&5X=&5N=" H9V5T+69A
M8V4@)V1E9F%U;'0I*2D*( DI*0I 0" M-#<Q+#8@*S0W,2PW($! "B!W:&EC
M:"!A<F4@;W5T+6]F+61A=&4@*&$@;F5W97(@=F5R<VEO;B!I<R!A=F%I;&%B
M;&4I+B @5&AE('5S97(@8V%N('1H96X*('-E;&5C="!P86-K86=E<R!F;W(@
M:6YS=&%L;&%T:6]N('9I82!T:&4@:V5Y8F]A<F0@;W(@;6]U<V4N(@H@(" H
M:6YT97)A8W1I=F4I"BL@("AP86-K86=E+6=E="UR97%U:7)E+6)A<V4I"B @
M("AL970@*" H;W5T8G5F("AG970M8G5F9F5R+6-R96%T92!P=6DM:6YF;RUB
M=69F97(I*0H@"2 H<V5P+7-T<FEN9R B/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/5QN(BD*( D@<W1A<G0@*0I 0" M-3,V+#<@*S4S-RPW
M($! "B )"0D@(" @("AP;VEN="DI*0H@"0D@(" I"B )"2 H<V5T<2!E>'1E
M;G0@*&UA:V4M97AT96YT(&(@92DI"BT)"2 H:68@*&-D<B!D:7-P*0HK"0D@
M*&EF("AC87(@*&-D<B!D:7-P*2D*( D)(" @(" H<V5T+65X=&5N="UF86-E
M(&5X=&5N=" H9V5T+69A8V4@*&-A<B H8V1R(&1I<W I*2DI"B )"2 @("AS
M970M97AT96YT+69A8V4@97AT96YT("AG970M9F%C92 G9&5F875L="DI*0H@
M"0D@*'-E="UE>'1E;G0M<')O<&5R='D@97AT96YT("=H:6=H;&EG:'0@="D*
M26YD97@Z(&QI<W O<&%C:V%G92UG970N96P*/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/0I20U,@9FEL93H@+W5S<B]#5E-R;V]T+UA%;6%C<R]X96UA8W,M,C O
M;&ES<"]P86-K86=E+6=E="YE;"QV"G)E=')I979I;F<@<F5V:7-I;VX@,2XQ
M.0ID:69F("UU("UR,2XQ.2!P86-K86=E+6=E="YE; HM+2T@<&%C:V%G92UG
M970N96P),3DY."\Q,"\Q,R P-SHS-CHT-@DQ+C$Y"BLK*R!P86-K86=E+6=E
M="YE; DQ.3DX+S$P+S$U(#(R.C R.C,V"D! ("TQ-S@L,3,(a)*S$W."PX,R!
M0 H@(" Z='EP92 G8F]O;&5A;@H@(" Z9W)O=7 @)W!A8VMA9V4M9V5T*0H@
M"BLH9&5F8W5S=&]M('!A8VMA9V4M9V5T+6)A<V4M9FEL96YA;64**R @(B]F
M=' N>&5M86-S+F]R9SHO<'5B+WAE;6%C<R]P86-K86=E<R]P86-K86=E+6EN
M9&5X+DQ!5$535"(**R @(BI.86UE(&]F('1H92!D969A=6QT('!A8VMA9V4@
M9&%T86)A<V4@9FEL92P@=7-U86QL>2!O;B!F=' N>&5M86-S+F]R9RXB"BL@
M(#IT>7!E("=F:6QE"BL@(#IG<F]U<" G<&%C:V%G92UG970I"BL**SL[.R,C
M(V%U=&]L;V%D"BLH9&5F=6X@<&%C:V%G92UG970M<F5Q=6ER92UB87-E("@I
M"BL@(")297%U:7)E('1H870@=&AE('!A8VMA9V4M9V5T(&1A=&%B87-E(&AA
M<R!B965N(&QO861E9"XB"BL@("AW:&5N("AO<B H;F]T("AB;W5N9' @)W!A
M8VMA9V4M9V5T+6)A<V4I*0HK(" @(" @(" @(" @*&YO="!P86-K86=E+6=E
M="UB87-E*2D**R @(" H<&%C:V%G92UG970M;&]A9"UB87-E*2D**R @*'=H
M96X@*&]R("AN;W0@*&)O=6YD<" G<&%C:V%G92UG970M8F%S92DI"BL@(" @
M(" @(" @(" H;F]T('!A8VMA9V4M9V5T+6)A<V4I*0HK(" @("AE<G)O<B B
M4&%C:V%G92UG970@9&%T86)A<V4@;F]T(&QO861E9"(I*2D**PHK*&1E9F-O
M;G-T('!A8VMA9V4M9V5T+7!G<"US:6=N960M8F5G:6XM;&EN92 B7BTM+2TM
M0D5'24X@4$=0(%-)1TY%1"!-15-304=%+2TM+2TB"BL@(")497AT(&9O<B!S
M=&%R="!O9B!01U @<VEG;F5D(&UE<W-A9V5S+B(I"BLH9&5F8V]N<W0@<&%C
M:V%G92UG970M<&=P+7-I9VYA='5R92UB96=I;BUL:6YE(")>+2TM+2U"14=)
M3B!01U @4TE'3D%455)%+2TM+2TB"BL@(")497AT(&9O<B!B96=I;FYI;F<@
M;V8@4$=0('-I9VYA='5R92XB*0HK*&1E9F-O;G-T('!A8VMA9V4M9V5T+7!G
M<"US:6=N871U<F4M96YD+6QI;F4@(EXM+2TM+45.1"!01U @4TE'3D%455)%
M+2TM+2TB"BL@(")497AT(&9O<B!E;F0@;V8@4$=0('-I9VYA='5R92XB*0HK
M"BL[.SLC(R-A=71O;&]A9 HK*&1E9G5N('!A8VMA9V4M9V5T+6QO860M8F%S
M92 H)F]P=&EO;F%L(&1B+69I;&4I"BL@("),;V%D('1H92!P86-K86=E+6=E
M="!D871A8F%S92!F:6QE+B(**R @*&EN=&5R86-T:79E("AL:7-T"BL@(" @
M(" @(" @(" @(" @*')E860M9FEL92UN86UE("),;V%D('!A8VMA9V4M9V5T
M(&1A=&%B87-E.B B"BL@(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @
M("AF:6QE+6YA;64M9&ER96-T;W)Y('!A8VMA9V4M9V5T+6)A<V4M9FEL96YA
M;64I"BL@(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @('!A8VMA9V4M
M9V5T+6)A<V4M9FEL96YA;64**R @(" @(" @(" @(" @(" @(" @(" @(" @
M(" @(" @= HK(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" H9FEL
M92UN86UE+6YO;F1I<F5C=&]R>2!P86-K86=E+6=E="UB87-E+69I;&5N86UE
M*2DI*0HK(" H<V5T<2!D8BUF:6QE("AE>'!A;F0M9FEL92UN86UE("AO<B!D
M8BUF:6QE('!A8VMA9V4M9V5T+6)A<V4M9FEL96YA;64I*2D**R @*&EF("AN
M;W0@*&9I;&4M97AI<W1S+7 @9&(M9FEL92DI"BL@(" @(" H97)R;W(@(E!A
M8VMA9V4M9V5T(&1A=&%B87-E(&9I;&4@8"5S)R!D;V5S(&YO="!E>&ES="(@
M9&(M9FEL92DI"BL@("AI9B H;F]T("AF:6QE+7)E861A8FQE+7 @9&(M9FEL
M92DI"BL@(" @(" H97)R;W(@(E!A8VMA9V4M9V5T(&1A=&%B87-E(&9I;&4@
M8"5S)R!N;W0@<F5A9&%B;&4B(&1B+69I;&4I*0HK(" H;&5T("@H8G5F("AF
M:6YD+69I;&4M;F]S96QE8W0@9&(M9FEL92!T*2D**R @(" @(" @8V]N=&5N
M="UB96<@8V]N=&5N="UE;F0@8F5G(&5N9"D**R @(" H<V%V92UE>&-U<G-I
M;VX**R @(" @("AS970M8G5F9F5R(&)U9BD**R @(" @("AG;W1O+6-H87(@
M*'!O:6YT+6UI;BDI"BL@(" @(" H<V5T<2!C;VYT96YT+6)E9R H<&]I;G0I
M*0HK(" @(" @*'-E='$@8V]N=&5N="UE;F0@*'-A=F4M97AC=7)S:6]N("AG
M;W1O+6-H87(@*'!O:6YT+6UA>"DI("AP;VEN="DI*0HK(" @(" @*'=H96X@
M*')E+7-E87)C:"UF;W)W87)D('!A8VMA9V4M9V5T+7!G<"US:6=N960M8F5G
M:6XM;&EN92!N:6P@="D**R @(" @(" @*'-E='$@8F5G("AM871C:"UB96=I
M;FYI;F<@,"DI"BL@(" @(" @("AS971Q(&-O;G1E;G0M8F5G("AM871C:"UE
M;F0@,"DI*0HK(" @(" @*'=H96X@*')E+7-E87)C:"UF;W)W87)D('!A8VMA
M9V4M9V5T+7!G<"US:6=N871U<F4M8F5G:6XM;&EN92!N:6P@="D**R @(" @
M(" @*'-E='$@8V]N=&5N="UE;F0@*&UA=&-H+6)E9VEN;FEN9R P*2DI"BL@
M(" @(" H=VAE;B H<F4M<V5A<F-H+69O<G=A<F0@<&%C:V%G92UG970M<&=P
M+7-I9VYA='5R92UE;F0M;&EN92!N:6P@="D**R @(" @(" @*'-E='$@96YD
M("AP;VEN="DI*0HK(" @(" @*&EF("AN;W0@*&%N9"!C;VYT96YT+6)E9R!C
M;VYT96YT+65N9"!B96<@96YD*2D**R @(" @(" @(" H;W(@*'EE<RUO<BUN
M;RUP(")086-K86=E+6=E="!D871A8F%S92!N;W0@4$=0('-I9VYE9"P@8V]N
M=&EN=64_("(I"BL@(" @(" @(" @(" @("AE<G)O<B B4&%C:V%G92UG970@
M9&%T86)A<V4@;F]T(&QO861E9"(I*2D**R @(" @("AI9B H86YD(&-O;G1E
M;G0M8F5G(&-O;G1E;G0M96YD(&)E9R!E;F0I"BL@(" @(" @(" @*&EF("AN
M;W0@*&-O;F1I=&EO;BUC87-E(&YI; HK(" @(" @(" @(" @(" @(" @(" @
M(" H;W(@*&9B;W5N9' @)VUC+7!G<"UV97)I9GDM<F5G:6]N*0HK(" @(" @
M(" @(" @(" @(" @(" @(" @(" @*&QO860M;&EB<F%R>2 B;6,M<&=P(BD*
M*R @(" @(" @(" @(" @(" @(" @(" @(" @("AF8F]U;F1P("=M8RUP9W M
M=F5R:69Y+7)E9VEO;BDI"BL@(" @(" @(" @(" @(" @(" @(" H97)R;W(@
M;FEL*2DI"BL@(" @(" @(" @(" @("AO<B H>65S+6]R+6YO+7 **R @(" @
M(" @(" @(" @(" @(" B3F\@;6%I;&-R>7!T.R!C86XG="!V97)I9GD(a)<&%C
M:V%G92UG970@1$(@<VEG;F%T=7)E+"!C;VYT:6YU93\@(BD**R @(" @(" @
M(" @(" @(" @("AE<G)O<B B4&%C:V%G92UG970@9&%T86)A<V4@;F]T(&QO
M861E9"(I*2DI"BL@(" @(" H:68@*&%N9"!B96<@96YD"BL@(" @(" @(" @
M(" @(" H9F)O=6YD<" G;6,M<&=P+79E<FEF>2UR96=I;VXI"BL@(" @(" @
M(" @(" @(" H;F]T("AM8RUP9W M=F5R:69Y+7)E9VEO;B!B96<@96YD("=N
M;V9E=&-H*2DI"BL@(" @(" @(" @*&5R<F]R(")086-K86=E+6=E="!01U @
M<VEG;F%T=7)E(&9A:6QE9"!V97)I9FEC871I;VXB*2D**R @(" @("AE=F%L
M+7)E9VEO;B!C;VYT96YT+6)E9R!C;VYT96YT+65N9"D**R @(" @("AM97-S
M86=E("),;V%D960@<&%C:V%G92UG970@9&%T86)A<V4B*2D**R @(" H:VEL
M;"UB=69F97(@8G5F*2DI"B *("AD969U;B!P86-K86=E+6=E="UI;G1E<F%C
M=&EV92UP86-K86=E+7%U97)Y("AG970M=F5R<VEO;B!P86-K86=E+7-Y;6)O
M;"D*(" @(E!E<F9O<FT@:6YT97)A8W1I=F4@<75E<GEI;F<@9F]R('!A8VMA
M9V4@86YD(&]P=&EO;F%L('9E<G-I;VXN"B!1=65R>2!F;W(@82!V97)S:6]N
M(&EF($=%5"U615)324].(&ES(&YO;BUN:6PN("!2971U<FX@<&%C:V%G92!N
M86UE(&%S"B!A('-Y;6)O;"!I;G-T96%D(&]F(&$@<W1R:6YG(&EF(%!!0TM!
M1T4M4UE-0D],(&ES(&YO;BUN:6PN"B!4:&4@<F5T=7)N('9A;'5E(&ES('-U
M:71A8FQE(&9O<B!D:7)E8W0@<&%S<VEN9R!T;R!@:6YT97)A8W1I=F4G+B(*
M+2 @*')E<75I<F4@)W!A8VMA9V4M9V5T+6)A<V4I"BL@("AP86-K86=E+6=E
M="UR97%U:7)E+6)A<V4I"B @("AL970@*" H=&%B;&4@*&UA<&-A<B G*&QA
M;6)D82 H:71E;2D*( D)"2 @("AL970@*" H;F%M92 H<WEM8F]L+6YA;64@
M*&-A<B!I=&5M*2DI("D*( D)"2 @(" @*&-O;G,@;F%M92!N86UE*0I 0" M
M,C(W+#<@*S(Y-RPW($! "B H9&5F=6X@<&%C:V%G92UG970M=7!D871E+6%L
M;" H*0H@(" B1F5T8V@@86YD(&EN<W1A;&P@=&AE(&QA=&5S="!V97)S:6]N
M<R!O9B!A;&P@8W5R<F5N=&QY(&EN<W1A;&QE9"!P86-K86=E<RXB"B @("AI
M;G1E<F%C=&EV92D*+2 @*')E<75I<F4@)W!A8VMA9V4M9V5T+6)A<V4I"BL@
M("AP86-K86=E+6=E="UR97%U:7)E+6)A<V4I"B @(#L[($QO860@82!F<F5S
M:"!C;W!Y"B @("AC871C:" G97AI= H@(" @("AM87!C87(@*&QA;6)D82 H
M<&MG*0I 0" M,CDU+#<@*S,V-2PW($! "B!5<V5S(&!P86-K86=E+6=E="UB
M87-E)R!T;R!D971E<FUI;F4@:G5S="!W:&%T(&ES(')E<75I<F5D(&%N9"!W
M:&%T"B!P86-K86=E('!R;W9I9&5S('1H870@9G5N8W1I;VYA;&ET>2X@(%)E
M='5R;G,@=&AE(&QI<W0@;V8@<&%C:V%G97,*(')E<75I<F5D(&)Y(%!!0TM!
M1T53+B(*+2 @*')E<75I<F4@)W!A8VMA9V4M9V5T+6)A<V4I"BL@("AP86-K
M86=E+6=E="UR97%U:7)E+6)A<V4I"B @("AL970@*"AO<FEG+7!A8VMA9V5S
M('!A8VMA9V5S*0H@(" @(" @("!D97!E;F1E;F-I97,@<')O=FED960I"B @
M(" @*'=H:6QE('!A8VMA9V5S"D! ("TV-#0L-R K-S$T+#<@0$ *(" @8V]N
M<W L('1H96X@:70@;75S="!M871C:"!A(&-O<G)E<W!O;F1I;F<@*'!R;W9I
M9&4@*%-932!615)324].*2D(a)9G)O;2 *(" @=&AE('!A8VMA9V4N(@H@(" H
M:6YT97)A8W1I=F4@(E-3>6UB;VPZ("(I"BT@("AR97%U:7)E("=P86-K86=E
M+6=E="UB87-E*0HK(" H<&%C:V%G92UG970M<F5Q=6ER92UB87-E*0H@(" H
M;&5T("@H<&%C:V%G97,@<&%C:V%G92UG970M8F%S92D*( DH9&]N92!N:6PI
M"B )*&9O=6YD(&YI;"DI"D! ("TV-S8L-R K-S0V+#<@0$ *("AD969U;B!P
M86-K86=E+6=E="UC=7-T;VT@*"D*(" @(D9E=&-H(&%N9"!I;G-T86QL('1H
M92!L871E<W0@=F5R<VEO;G,@;V8@86QL(&-U<W1O;6EZ960@<&%C:V%G97,N
M(@H@(" H:6YT97)A8W1I=F4I"BT@("AR97%U:7)E("=P86-K86=E+6=E="UB
M87-E*0HK(" H<&%C:V%G92UG970M<F5Q=6ER92UB87-E*0H@(" [.R!,;V%D
M(&$@9G)E<V@@8V]P>0H@(" H;&]A9" B<&%C:V%G92UG970M8W5S=&]M+F5L
M(BD*(" @*&UA<&-A<B H;&%M8F1A("AP:V<I"D! ("TW-34L-B K.#(U+#<@
M0$ *("AP<F]V:61E("=P86-K86=E+6=E="D*( H@.SL@<&]T96YT:6%L;'D@
M=7!D871E('1H92!C=7-T;VT@9&5P96YD96YC:65S(&5V97)Y('1I;64@=V4@
M;&]A9"!T:&ES"BLH=VAE;B!N:6P@.SL@(R,C(R!D:7-A8FQE(&9O<B!N;W<N
M+BX@+6=K"B H=6YL97-S(&YO;FEN=&5R86-T:79E"B H;&5T("@H8W5S=&]M
M+69I;&4@*'!A8VMA9V4M9V5T+69I;&4M:6YS=&%L;&5D+7 @(G!A8VMA9V4M
M9V5T+6-U<W1O;2YE;"(I*0H@(" @(" @*'!A8VMA9V4M9FEL92 H<&%C:V%G
M92UG970M9FEL92UI;G-T86QL960M<" B<&%C:V%G92UG970M8F%S92YE;"(I
M*2D*0$ @+3<W,"PU("LX-#$L-B! 0 H@"2AS879E+6)U9F9E<BD*( DH;65S
M<V%G92 B9V5N97)A=&EN9R!P86-K86=E(&-U<W1O;6EZ871I;VYS+BXN9&]N
M92(I*2D*(" @*&QO860@(G!A8VMA9V4M9V5T+6-U<W1O;2YE;"(I*2D**RD*
@( H@.SL[('!A8VMA9V4M9V5T+F5L(&5N9',@:&5R90IO
end