PNG  IHDRX cHRMz&u0`:pQ<bKGD pHYsodtIME MeqIDATxw]Wug^Qd˶ 6`!N:!@xI~)%7%@Bh&`lnjVF29gΨ4E$|>cɚ{gk= %,a KX%,a KX%,a KX%,a KX%,a KX%,a KX%, b` ǟzeאfp]<!SJmɤY޲ڿ,%c ~ع9VH.!Ͳz&QynֺTkRR.BLHi٪:l;@(!MԴ=žI,:o&N'Kù\vRmJ雵֫AWic H@" !: Cé||]k-Ha oݜ:y F())u]aG7*JV@J415p=sZH!=!DRʯvɱh~V\}v/GKY$n]"X"}t@ xS76^[bw4dsce)2dU0 CkMa-U5tvLƀ~mlMwfGE/-]7XAƟ`׮g ewxwC4\[~7@O-Q( a*XGƒ{ ՟}$_y3tĐƤatgvێi|K=uVyrŲlLӪuܿzwk$m87k( `múcE)"@rK( z4$D; 2kW=Xb$V[Ru819קR~qloѱDyįݎ*mxw]y5e4K@ЃI0A D@"BDk_)N\8͜9dz"fK0zɿvM /.:2O{ Nb=M=7>??Zuo32 DLD@D| &+֎C #B8ַ`bOb $D#ͮҪtx]%`ES`Ru[=¾!@Od37LJ0!OIR4m]GZRJu$‡c=%~s@6SKy?CeIh:[vR@Lh | (BhAMy=݃  G"'wzn޺~8ԽSh ~T*A:xR[ܹ?X[uKL_=fDȊ؂p0}7=D$Ekq!/t.*2ʼnDbŞ}DijYaȲ(""6HA;:LzxQ‘(SQQ}*PL*fc\s `/d'QXW, e`#kPGZuŞuO{{wm[&NBTiiI0bukcA9<4@SӊH*؎4U/'2U5.(9JuDfrޱtycU%j(:RUbArLֺN)udA':uGQN"-"Is.*+k@ `Ojs@yU/ H:l;@yyTn}_yw!VkRJ4P)~y#)r,D =ě"Q]ci'%HI4ZL0"MJy 8A{ aN<8D"1#IJi >XjX֔#@>-{vN!8tRݻ^)N_╗FJEk]CT՟ YP:_|H1@ CBk]yKYp|og?*dGvzنzӴzjֺNkC~AbZƷ`.H)=!QͷVTT(| u78y֮}|[8-Vjp%2JPk[}ԉaH8Wpqhwr:vWª<}l77_~{s۴V+RCģ%WRZ\AqHifɤL36: #F:p]Bq/z{0CU6ݳEv_^k7'>sq*+kH%a`0ԣisqにtү04gVgW΂iJiS'3w.w}l6MC2uԯ|>JF5`fV5m`Y**Db1FKNttu]4ccsQNnex/87+}xaUW9y>ͯ骵G{䩓Գ3+vU}~jJ.NFRD7<aJDB1#ҳgSb,+CS?/ VG J?|?,2#M9}B)MiE+G`-wo߫V`fio(}S^4e~V4bHOYb"b#E)dda:'?}׮4繏`{7Z"uny-?ǹ;0MKx{:_pÚmFמ:F " .LFQLG)Q8qN q¯¯3wOvxDb\. BKD9_NN &L:4D{mm o^tֽ:q!ƥ}K+<"m78N< ywsard5+вz~mnG)=}lYݧNj'QJS{S :UYS-952?&O-:W}(!6Mk4+>A>j+i|<<|;ر^߉=HE|V#F)Emm#}/"y GII웻Jі94+v뾧xu~5C95~ūH>c@덉pʃ1/4-A2G%7>m;–Y,cyyaln" ?ƻ!ʪ<{~h~i y.zZB̃/,雋SiC/JFMmBH&&FAbϓO^tubbb_hZ{_QZ-sύodFgO(6]TJA˯#`۶ɟ( %$&+V'~hiYy>922 Wp74Zkq+Ovn錄c>8~GqܲcWꂎz@"1A.}T)uiW4="jJ2W7mU/N0gcqܗOO}?9/wìXžΏ0 >֩(V^Rh32!Hj5`;O28؇2#ݕf3 ?sJd8NJ@7O0 b־?lldщ̡&|9C.8RTWwxWy46ah嘦mh٤&l zCy!PY?: CJyв]dm4ǜҐR޻RլhX{FƯanшQI@x' ao(kUUuxW_Ñ줮[w8 FRJ(8˼)_mQ _!RJhm=!cVmm ?sFOnll6Qk}alY}; "baӌ~M0w,Ggw2W:G/k2%R,_=u`WU R.9T"v,<\Ik޽/2110Ӿxc0gyC&Ny޽JҢrV6N ``یeA16"J³+Rj*;BϜkZPJaÍ<Jyw:NP8/D$ 011z֊Ⱳ3ι֘k1V_"h!JPIΣ'ɜ* aEAd:ݺ>y<}Lp&PlRfTb1]o .2EW\ͮ]38؋rTJsǏP@芎sF\> P^+dYJLbJ C-xϐn> ι$nj,;Ǖa FU *择|h ~izť3ᤓ`K'-f tL7JK+vf2)V'-sFuB4i+m+@My=O҈0"|Yxoj,3]:cо3 $#uŘ%Y"y죯LebqtҢVzq¼X)~>4L׶m~[1_k?kxֺQ`\ |ٛY4Ѯr!)N9{56(iNq}O()Em]=F&u?$HypWUeB\k]JɩSع9 Zqg4ZĊo oMcjZBU]B\TUd34ݝ~:7ڶSUsB0Z3srx 7`:5xcx !qZA!;%͚7&P H<WL!džOb5kF)xor^aujƍ7 Ǡ8/p^(L>ὴ-B,{ۇWzֺ^k]3\EE@7>lYBȝR.oHnXO/}sB|.i@ɥDB4tcm,@ӣgdtJ!lH$_vN166L__'Z)y&kH;:,Y7=J 9cG) V\hjiE;gya~%ks_nC~Er er)muuMg2;֫R)Md) ,¶ 2-wr#F7<-BBn~_(o=KO㭇[Xv eN_SMgSҐ BS헃D%g_N:/pe -wkG*9yYSZS.9cREL !k}<4_Xs#FmҶ:7R$i,fi!~' # !6/S6y@kZkZcX)%5V4P]VGYq%H1!;e1MV<!ϐHO021Dp= HMs~~a)ަu7G^];git!Frl]H/L$=AeUvZE4P\.,xi {-~p?2b#amXAHq)MWǾI_r`S Hz&|{ +ʖ_= (YS(_g0a03M`I&'9vl?MM+m~}*xT۲(fY*V4x@29s{DaY"toGNTO+xCAO~4Ϳ;p`Ѫ:>Ҵ7K 3}+0 387x\)a"/E>qpWB=1 ¨"MP(\xp߫́A3+J] n[ʼnӼaTbZUWb={~2ooKױӰp(CS\S筐R*JغV&&"FA}J>G֐p1ٸbk7 ŘH$JoN <8s^yk_[;gy-;߉DV{c B yce% aJhDȶ 2IdйIB/^n0tNtџdcKj4϶v~- CBcgqx9= PJ) dMsjpYB] GD4RDWX +h{y`,3ꊕ$`zj*N^TP4L:Iz9~6s) Ga:?y*J~?OrMwP\](21sZUD ?ܟQ5Q%ggW6QdO+\@ ̪X'GxN @'4=ˋ+*VwN ne_|(/BDfj5(Dq<*tNt1х!MV.C0 32b#?n0pzj#!38}޴o1KovCJ`8ŗ_"]] rDUy޲@ Ȗ-;xџ'^Y`zEd?0„ DAL18IS]VGq\4o !swV7ˣι%4FѮ~}6)OgS[~Q vcYbL!wG3 7띸*E Pql8=jT\꘿I(z<[6OrR8ºC~ډ]=rNl[g|v TMTղb-o}OrP^Q]<98S¤!k)G(Vkwyqyr޽Nv`N/e p/~NAOk \I:G6]4+K;j$R:Mi #*[AȚT,ʰ,;N{HZTGMoּy) ]%dHء9Պ䠬|<45,\=[bƟ8QXeB3- &dҩ^{>/86bXmZ]]yޚN[(WAHL$YAgDKp=5GHjU&99v簪C0vygln*P)9^͞}lMuiH!̍#DoRBn9l@ xA/_v=ȺT{7Yt2N"4!YN`ae >Q<XMydEB`VU}u]嫇.%e^ánE87Mu\t`cP=AD/G)sI"@MP;)]%fH9'FNsj1pVhY&9=0pfuJ&gޤx+k:!r˭wkl03׼Ku C &ѓYt{.O.zҏ z}/tf_wEp2gvX)GN#I ݭ߽v/ .& и(ZF{e"=V!{zW`, ]+LGz"(UJp|j( #V4, 8B 0 9OkRrlɱl94)'VH9=9W|>PS['G(*I1==C<5"Pg+x'K5EMd؞Af8lG ?D FtoB[je?{k3zQ vZ;%Ɠ,]E>KZ+T/ EJxOZ1i #T<@ I}q9/t'zi(EMqw`mYkU6;[t4DPeckeM;H}_g pMww}k6#H㶏+b8雡Sxp)&C $@'b,fPߑt$RbJ'vznuS ~8='72_`{q纶|Q)Xk}cPz9p7O:'|G~8wx(a 0QCko|0ASD>Ip=4Q, d|F8RcU"/KM opKle M3#i0c%<7׿p&pZq[TR"BpqauIp$ 8~Ĩ!8Սx\ւdT>>Z40ks7 z2IQ}ItԀ<-%S⍤};zIb$I 5K}Q͙D8UguWE$Jh )cu4N tZl+[]M4k8֦Zeq֮M7uIqG 1==tLtR,ƜSrHYt&QP윯Lg' I,3@P'}'R˪e/%-Auv·ñ\> vDJzlӾNv5:|K/Jb6KI9)Zh*ZAi`?S {aiVDԲuy5W7pWeQJk֤#5&V<̺@/GH?^τZL|IJNvI:'P=Ϛt"¨=cud S Q.Ki0 !cJy;LJR;G{BJy޺[^8fK6)=yʊ+(k|&xQ2`L?Ȓ2@Mf 0C`6-%pKpm')c$׻K5[J*U[/#hH!6acB JA _|uMvDyk y)6OPYjœ50VT K}cǻP[ $:]4MEA.y)|B)cf-A?(e|lɉ#P9V)[9t.EiQPDѠ3ϴ;E:+Օ t ȥ~|_N2,ZJLt4! %ա]u {+=p.GhNcŞQI?Nd'yeh n7zi1DB)1S | S#ًZs2|Ɛy$F SxeX{7Vl.Src3E℃Q>b6G ўYCmtկ~=K0f(=LrAS GN'ɹ9<\!a`)֕y[uՍ[09` 9 +57ts6}b4{oqd+J5fa/,97J#6yν99mRWxJyѡyu_TJc`~W>l^q#Ts#2"nD1%fS)FU w{ܯ R{ ˎ󅃏џDsZSQS;LV;7 Od1&1n$ N /.q3~eNɪ]E#oM~}v֯FڦwyZ=<<>Xo稯lfMFV6p02|*=tV!c~]fa5Y^Q_WN|Vs 0ҘދU97OI'N2'8N֭fgg-}V%y]U4 峧p*91#9U kCac_AFңĪy뚇Y_AiuYyTTYЗ-(!JFLt›17uTozc. S;7A&&<ԋ5y;Ro+:' *eYJkWR[@F %SHWP 72k4 qLd'J "zB6{AC0ƁA6U.'F3:Ȅ(9ΜL;D]m8ڥ9}dU "v!;*13Rg^fJyShyy5auA?ɩGHRjo^]׽S)Fm\toy 4WQS@mE#%5ʈfFYDX ~D5Ϡ9tE9So_aU4?Ѽm%&c{n>.KW1Tlb}:j uGi(JgcYj0qn+>) %\!4{LaJso d||u//P_y7iRJ߬nHOy) l+@$($VFIQ9%EeKʈU. ia&FY̒mZ=)+qqoQn >L!qCiDB;Y<%} OgBxB!ØuG)WG9y(Ą{_yesuZmZZey'Wg#C~1Cev@0D $a@˲(.._GimA:uyw֬%;@!JkQVM_Ow:P.s\)ot- ˹"`B,e CRtaEUP<0'}r3[>?G8xU~Nqu;Wm8\RIkբ^5@k+5(By'L&'gBJ3ݶ!/㮻w҅ yqPWUg<e"Qy*167΃sJ\oz]T*UQ<\FԎ`HaNmڜ6DysCask8wP8y9``GJ9lF\G g's Nn͵MLN֪u$| /|7=]O)6s !ĴAKh]q_ap $HH'\1jB^s\|- W1:=6lJBqjY^LsPk""`]w)󭃈,(HC ?䔨Y$Sʣ{4Z+0NvQkhol6C.婧/u]FwiVjZka&%6\F*Ny#8O,22+|Db~d ~Çwc N:FuuCe&oZ(l;@ee-+Wn`44AMK➝2BRՈt7g*1gph9N) *"TF*R(#'88pm=}X]u[i7bEc|\~EMn}P瘊J)K.0i1M6=7'_\kaZ(Th{K*GJyytw"IO-PWJk)..axӝ47"89Cc7ĐBiZx 7m!fy|ϿF9CbȩV 9V-՛^pV̌ɄS#Bv4-@]Vxt-Z, &ֺ*diؠ2^VXbs֔Ìl.jQ]Y[47gj=幽ex)A0ip׳ W2[ᎇhuE^~q흙L} #-b۸oFJ_QP3r6jr+"nfzRJTUqoaۍ /$d8Mx'ݓ= OՃ| )$2mcM*cЙj}f };n YG w0Ia!1Q.oYfr]DyISaP}"dIӗթO67jqR ҊƐƈaɤGG|h;t]䗖oSv|iZqX)oalv;۩meEJ\!8=$4QU4Xo&VEĊ YS^E#d,yX_> ۘ-e\ "Wa6uLĜZi`aD9.% w~mB(02G[6y.773a7 /=o7D)$Z 66 $bY^\CuP. (x'"J60׿Y:Oi;F{w佩b+\Yi`TDWa~|VH)8q/=9!g߆2Y)?ND)%?Ǐ`k/sn:;O299yB=a[Ng 3˲N}vLNy;*?x?~L&=xyӴ~}q{qE*IQ^^ͧvü{Huu=R|>JyUlZV, B~/YF!Y\u_ݼF{_C)LD]m {H 0ihhadd nUkf3oٺCvE\)QJi+֥@tDJkB$1!Đr0XQ|q?d2) Ӣ_}qv-< FŊ߫%roppVBwü~JidY4:}L6M7f٬F "?71<2#?Jyy4뷢<_a7_=Q E=S1И/9{+93֮E{ǂw{))?maÆm(uLE#lïZ  ~d];+]h j?!|$F}*"4(v'8s<ŏUkm7^7no1w2ؗ}TrͿEk>p'8OB7d7R(A 9.*Mi^ͳ; eeUwS+C)uO@ =Sy]` }l8^ZzRXj[^iUɺ$tj))<sbDJfg=Pk_{xaKo1:-uyG0M ԃ\0Lvuy'ȱc2Ji AdyVgVh!{]/&}}ċJ#%d !+87<;qN޼Nفl|1N:8ya  8}k¾+-$4FiZYÔXk*I&'@iI99)HSh4+2G:tGhS^繿 Kتm0 вDk}֚+QT4;sC}rՅE,8CX-e~>G&'9xpW,%Fh,Ry56Y–hW-(v_,? ; qrBk4-V7HQ;ˇ^Gv1JVV%,ik;D_W!))+BoS4QsTM;gt+ndS-~:11Sgv!0qRVh!"Ȋ(̦Yl.]PQWgٳE'`%W1{ndΗBk|Ž7ʒR~,lnoa&:ü$ 3<a[CBݮwt"o\ePJ=Hz"_c^Z.#ˆ*x z̝grY]tdkP*:97YľXyBkD4N.C_[;F9`8& !AMO c `@BA& Ost\-\NX+Xp < !bj3C&QL+*&kAQ=04}cC!9~820G'PC9xa!w&bo_1 Sw"ܱ V )Yl3+ס2KoXOx]"`^WOy :3GO0g;%Yv㐫(R/r (s } u B &FeYZh0y> =2<Ϟc/ -u= c&׭,.0"g"7 6T!vl#sc>{u/Oh Bᾈ)۴74]x7 gMӒ"d]U)}" v4co[ ɡs 5Gg=XR14?5A}D "b{0$L .\4y{_fe:kVS\\O]c^W52LSBDM! C3Dhr̦RtArx4&agaN3Cf<Ԉp4~ B'"1@.b_/xQ} _߃҉/gٓ2Qkqp0շpZ2fԫYz< 4L.Cyυι1t@鎫Fe sYfsF}^ V}N<_`p)alٶ "(XEAVZ<)2},:Ir*#m_YӼ R%a||EƼIJ,,+f"96r/}0jE/)s)cjW#w'Sʯ5<66lj$a~3Kʛy 2:cZ:Yh))+a߭K::N,Q F'qB]={.]h85C9cr=}*rk?vwV렵ٸW Rs%}rNAkDv|uFLBkWY YkX מ|)1!$#3%y?pF<@<Rr0}: }\J [5FRxY<9"SQdE(Q*Qʻ)q1E0B_O24[U'],lOb ]~WjHޏTQ5Syu wq)xnw8~)c 쫬gٲߠ H% k5dƝk> kEj,0% b"vi2Wس_CuK)K{n|>t{P1򨾜j>'kEkƗBg*H%'_aY6Bn!TL&ɌOb{c`'d^{t\i^[uɐ[}q0lM˕G:‚4kb祔c^:?bpg… +37stH:0}en6x˟%/<]BL&* 5&fK9Mq)/iyqtA%kUe[ڛKN]Ě^,"`/ s[EQQm?|XJ߅92m]G.E΃ח U*Cn.j_)Tѧj̿30ڇ!A0=͜ar I3$C^-9#|pk!)?7.x9 @OO;WƝZBFU keZ75F6Tc6"ZȚs2y/1 ʵ:u4xa`C>6Rb/Yм)^=+~uRd`/|_8xbB0?Ft||Z\##|K 0>>zxv8۴吅q 8ĥ)"6>~\8:qM}#͚'ĉ#p\׶ l#bA?)|g g9|8jP(cr,BwV (WliVxxᡁ@0Okn;ɥh$_ckCgriv}>=wGzβ KkBɛ[˪ !J)h&k2%07δt}!d<9;I&0wV/ v 0<H}L&8ob%Hi|޶o&h1L|u֦y~󛱢8fٲUsւ)0oiFx2}X[zVYr_;N(w]_4B@OanC?gĦx>мgx>ΛToZoOMp>40>V Oy V9iq!4 LN,ˢu{jsz]|"R޻&'ƚ{53ўFu(<٪9:΋]B;)B>1::8;~)Yt|0(pw2N%&X,URBK)3\zz&}ax4;ǟ(tLNg{N|Ǽ\G#C9g$^\}p?556]/RP.90 k,U8/u776s ʪ_01چ|\N 0VV*3H鴃J7iI!wG_^ypl}r*jɤSR 5QN@ iZ#1ٰy;_\3\BQQ x:WJv츟ٯ$"@6 S#qe딇(/P( Dy~TOϻ<4:-+F`0||;Xl-"uw$Цi󼕝mKʩorz"mϺ$F:~E'ҐvD\y?Rr8_He@ e~O,T.(ފR*cY^m|cVR[8 JҡSm!ΆԨb)RHG{?MpqrmN>߶Y)\p,d#xۆWY*,l6]v0h15M˙MS8+EdI='LBJIH7_9{Caз*Lq,dt >+~ّeʏ?xԕ4bBAŚjﵫ!'\Ը$WNvKO}ӽmSşذqsOy?\[,d@'73'j%kOe`1.g2"e =YIzS2|zŐƄa\U,dP;jhhhaxǶ?КZ՚.q SE+XrbOu%\GتX(H,N^~]JyEZQKceTQ]VGYqnah;y$cQahT&QPZ*iZ8UQQM.qo/T\7X"u?Mttl2Xq(IoW{R^ ux*SYJ! 4S.Jy~ BROS[V|žKNɛP(L6V^|cR7i7nZW1Fd@ Ara{詑|(T*dN]Ko?s=@ |_EvF]׍kR)eBJc" MUUbY6`~V޴dJKß&~'d3i WWWWWW
Current Directory: /usr/share/emacs/24.3/lisp/vc
Viewing File: /usr/share/emacs/24.3/lisp/vc/ediff-help.elc
;ELC ;;; Compiled by mockbuild@buildfarm01-new.corp.cloudlinux.com on Tue Nov 11 12:52:10 2025 ;;; from file /builddir/build/BUILD/emacs-24.3/lisp/vc/ediff-help.el ;;; in Emacs version 24.3.1 ;;; with all optimizations. ;;; This file uses dynamic docstrings, first added in Emacs 19.29. ;;; This file does not contain utf-8 non-ASCII characters, ;;; and so can be loaded in Emacs versions earlier than 23. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (require 'ediff-init) #@36 The head of the full help message. (defconst ediff-long-help-message-head " Move around | Toggle features | Manipulate\n=====================|===========================|=============================" (#$ . 578)) #@36 The tail of the full-help message. (defconst ediff-long-help-message-tail "=====================|===========================|=============================\n R -show registry | = -compare regions | M -show session group\n D -diff output | E -browse Ediff manual| G -send bug report\n i -status info | ? -help off | z/q -suspend/quit\n-------------------------------------------------------------------------------\nFor help on a specific command: Click Button 2 over it; or\n Put the cursor over it and type RET." (#$ . 822)) #@117 Help message usually used for 3-way comparison. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-compare3 "\np,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y\nn,SPC -next diff | h -highlighting | rx -restore buf X's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| ## -ignore whitespace | ! -update diff regions\n C-l -recenter | #c -ignore case |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n </> -scroll lt/rt | X -read-only in buf X | wd -save diff output\n ~ -rotate buffers| m -wide display |\n" (#$ . 1417)) #@117 Help message usually used for 2-way comparison. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-compare2 "\np,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A\nn,SPC -next diff | h -highlighting | rx -restore buf X's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| ## -ignore whitespace | ! -update diff regions\n C-l -recenter | #c -ignore case |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n </> -scroll lt/rt | X -read-only in buf X | wd -save diff output\n ~ -swap variants | m -wide display |\n" (#$ . 2161)) #@130 Help message when comparing windows or regions line-by-line. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-narrow2 "\np,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A\nn,SPC -next diff | h -highlighting | rx -restore buf X's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| ## -ignore whitespace | ! -update diff regions\n C-l -recenter | #c -ignore case | % -narrow/widen buffs\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n </> -scroll lt/rt | X -read-only in buf X | wd -save diff output\n ~ -swap variants | m -wide display |\n" (#$ . 2905)) #@130 Help message when comparing windows or regions word-by-word. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-word-mode "\np,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y\nn,SPC -next diff | h -highlighting | rx -restore buf X's old diff\n j -jump to diff | |\n gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs\n C-l -recenter | #c -ignore case |\n v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X\n </> -scroll lt/rt | X -read-only in buf X | wd -save diff output\n ~ -swap variants | m -wide display |\n" (#$ . 3684)) #@102 Help message for merge sessions. Normally, not a user option. See `ediff-help-message' for details. (defconst ediff-long-help-message-merge "\np,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C\nn,SPC -next diff | h -highlighting | r -restore buf C's old diff\n j -jump to diff | @ -auto-refinement | * -refine current region\n gx -goto X's point| ## -ignore whitespace | ! -update diff regions\n C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions\n v/V -scroll up/dn | X -read-only in buf X | wx -save buf X\n </> -scroll lt/rt | m -wide display | wd -save diff output\n ~ -swap variants | s -shrink window C | / -show ancestor buff\n | $$ -show clashes only | & -merge w/new default\n | $* -skip changed regions |\n" (#$ . 4412)) #@69 Normally, not a user option. See `ediff-help-message' for details. (defvar ediff-long-help-message "" (#$ . 5313)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-long-help-message put permanent-local t] 4) #@37 Contents of the brief help message. (defconst ediff-brief-message-string " Type ? for help" (#$ . 5561)) #@69 Normally, not a user option. See `ediff-help-message' for details. (defvar ediff-brief-help-message "" (#$ . 5672)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-brief-help-message put permanent-local t] 4) #@195 The brief help message that the user can customize. If the user sets this to a parameter-less function, Ediff will use it to produce the brief help message. This function must return a string. (defvar ediff-brief-help-message-function nil (#$ . 5923)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-brief-help-message-function put permanent-local t] 4) #@102 The long help message that the user can customize. See `ediff-brief-help-message-function' for more. (defvar ediff-long-help-message-function nil (#$ . 6319)) (byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\310\311\312\313\314&\207" [make-variable-buffer-local ediff-long-help-message-function put permanent-local t custom-declare-variable ediff-use-long-help-message nil "If t, Ediff displays a long help message. Short help message otherwise." :type boolean :group ediff-window] 8) #@264 The actual help message. Normally, the user shouldn't touch this. However, if you want Ediff to start up with different help messages for different jobs, you can change the value of this variable and the variables `ediff-help-message-*' in `ediff-startup-hook'. (defvar ediff-help-message "" (#$ . 6823)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-help-message put permanent-local t] 4) (defvar ediff-help-region-map (make-sparse-keymap)) (define-key ediff-help-region-map [mouse-2] 'ediff-help-for-quick-help) (defalias 'ediff-set-help-overlays #[nil "eb\210\304\211\211\211\305\306\304\307#\2053\310\224\310\225\311\224\311\225{\312\n \"\313 \314\315#\210\313 \316#\210\202 ,\207" [cmd end beg overl nil re-search-forward " *\\([^ \n|]+\\||\\) +-[^|\n]+" noerror 0 1 ediff-make-overlay ediff-overlay-put mouse-face highlight ediff-help-info] 4]) #@40 Explain Ediff commands in more detail. (defalias 'ediff-help-for-quick-help #[nil "\306\307!\204 \310\311 \"\210)\312\n!\306\211\313\314\315 !\"@\211;\204'\310\316!\210\317\320!\210\306@ \321\230\203:\322\323!\202e \324\230\203F\322\325!\202e \326\230\203R\322\327!\202e \330\230\203^\322\331!\202e \332\230\203j\322\333!\202e \334\230\203v\322\335!\202e \336\230\203\202\322\335!\202e \337\230\203\216\322\340!\202e \341\230\203\232\322\342!\202e \343\230\203\246\322\344!\202e \345\230\203\262\322\346!\202e \347\230\203\276\322\350!\202e \351\230\203\312\322\352!\202e \353\230\203\326\322\354!\202e \355\230\203\342\322\356!\202e \357\230\203\356\322\360!\202e \361\230\203\372\322\362!\202e \363\230\203\322\364!\202e \365\230\203\322\366!\202e \367\230\203\322\370!\202e \371\230\203*\322\372!\202e \373\230\2036\322\374!\202e \375\230\203B\322\376!\202e \377\230\203P\322\201A!\202e \201B\230\203`\322\201C!\202e \201D\230\203p\322\201E!\202e \201F\230\203\200\322\201G!\202e \201H\230\203\220\322\201I!\202e \201J\230\203\240\322\201K!\202e \201L\230\203\260\322\201M!\202e \201N\230\203\300\322\201O!\202e \201P\230\203\320\322\201Q!\202e \201R\230\203\340\322\201S!\202e \201T\230\203\360\322\201U!\202e \201V\230\203\322\201W!\202e \201X\230\203\322\201Y!\202e \201Z\230\203 \322\201[!\202e \201\\\230\2030\322\201]!\202e \201^\230\203@\322\201_!\202e \201`\230\203P\322\201a!\202e \201b\230\203`\322\201c!\202e\310\201d!,\207" [meta-buf-p this-command last-command-event cmd overl pos nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-event-point mapcar #[(elt) "\301\302\"\207" [elt overlay-get ediff-help-info] 3] overlays-at "Hmm... I don't see an Ediff command around here..." ediff-documentation "Quick Help Commands" "?" re-search-forward "^`\\?'" "G" "^`G'" "E" "^`E'" "wd" "^`wd'" "wx" "^`wa'" "a/b" "^`a'" "x" "xy" "^`ab'" "p,DEL" "^`p'" "n,SPC" "^`n'" "j" "^`j'" "gx" "^`ga'" "!" "^`!'" "*" "^`\\*'" "m" "^`m'" "|" "^`|'" "@" "^`@'" "h" "^`h'" "r" "^`r'" "rx" "^`ra'" "##" "^`##'" "#c" "^`#c'" "#f/#h" "^`#f'" "X" case-fold-search "^`A'" "v/V" "^`v'" "</>" "^`<'" "~" "^`~'" "i" "^`i'" "D" "^`D'" "R" "^`R'" "M" "^`M'" "z/q" "^`z'" "%" "^`%'" "C-l" "^`C-l'" "$$" "^`\\$\\$'" "$*" "^`\\$\\*'" "/" "^`/'" "&" "^`&'" "s" "^`s'" "+" "^`\\+'" "=" "^`='" "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer"] 5 (#$ . 7729) nil]) (defalias 'ediff-help-message-line-length #[nil "\212eb\210\203 \301y\210\302\210i)\207" [ediff-use-long-help-message 1 nil] 1]) (defalias 'ediff-indent-help-message #[nil "\302\303\304 !\305 Z]\306\245\307\310\"\212eb\210`dW\205' c\210\311 \210\312y\210\202+\207" [shift str 0 window-width selected-window ediff-help-message-line-length 2 make-string 32 beginning-of-line 1] 3]) (defalias 'ediff-set-help-message #[nil "\2039\204:\203 \202I \203\n \fQ\202I \203*\n \fQ\202I\n\2037\n \fQ\202I\f\203D\n \fQ\202I\n\fQ\203b9\204\\:\203b \202~;\203m\202~\306 \203|\203|\202~\203\212\202\214\307\310!\207" [ediff-long-help-message-function ediff-word-mode ediff-long-help-message-head ediff-long-help-message-word-mode ediff-long-help-message-tail ediff-narrow-job ediff-window-display-p run-hooks ediff-display-help-hook ediff-long-help-message-narrow2 ediff-merge-job ediff-long-help-message-merge ediff-diff3-job ediff-long-help-message-compare3 ediff-long-help-message-compare2 ediff-long-help-message ediff-brief-help-message-function ediff-multiframe ediff-brief-message-string ediff-brief-help-message ediff-use-long-help-message ediff-help-message] 3]) (defalias 'ediff-customize #[nil "\300\301!\207" [customize-group "ediff"] 2 nil nil]) (provide 'ediff-help)