;ELC ;;; compiled by simon@mole.gnu.ai.mit.edu on Mon Nov 6 07:29:31 1995 ;;; from file /home/gp2/simon/Emacs/lisp/ediff-merg.el ;;; emacs version 19.29.90.3. ;;; bytecomp version FSF 2.10 ;;; optimization is on. ;;; this file uses opcodes which do not exist in Emacs 18. (if (and (boundp 'emacs-version) (or (and (boundp 'epoch::version) epoch::version) (string-lessp emacs-version "19.29"))) (error "`ediff-merg.el' was compiled for Emacs 19.29 or later")) (require (quote ediff-init)) #@134 *The variant to be used as a default for buffer C in merging. Valid values are the symbols `default-A', `default-B', and `combined'. (defvar ediff-default-variant (quote default-A) (#$ . -514)) #@233 *Pattern to be used for combining difference regions in buffers A and B. The value is (STRING1 STRING2 STRING3). The combined text will look like this: STRING1 diff region from variant A STRING2 diff region from variant B STRING3  (defvar ediff-combination-pattern (quote ("#ifdef NEW /* variant A */" "#else /* variant B */" "#endif /* NEW */")) (#$ . -715)) #@195 *If t, show only those diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be skiped over. Nil means show all regions. (defvar ediff-show-clashes-only nil (#$ . -1083)) (byte-code "!#" [make-variable-buffer-local ediff-show-clashes-only put permanent-local t] 4) (defalias 'ediff-get-combined-region #[(n) "@\n\fʼn p\np\nc!c!!c͎q =>_ =J_ =V_ =_)m=m!)p\n!!!َq = = = =)=!)!p\n!!!!!!ڎq = = = =)+=+!)!!ێp\n!!!܎q =]~ =i~ =u~ =~)=!)q \n$ \n${)=!.A@\n\fʼn p\np\n!!!͎q = = = =)(=(!)ip\n|!|!!|َq =Wx =cx =ox =x)=!)!ip\n!!!ڎq = = = =)=!)!!iێp\n=!=!!=܎q =9 =$9 =09 =9)G=G!)qW \n$d \n${)s=s!.8" [ediff-combination-pattern "\n" n A ediff-control-buffer nil end start ctrl-buf buf-type StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-get-diff-posn beg 2] 11]) (put (quote ediff-get-combined-region) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-make-combined-diff #[(regA regB) "@\nA@ 8" [ediff-combination-pattern "\n" regA regB 2] 8]) (put (quote ediff-make-combined-diff) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-set-state-of-all-diffs-in-all-buffers #[(ctl-buf) "\nW \f\" T)" [0 n ediff-number-of-differences ediff-set-state-of-diff-in-all-buffers ctl-buf] 4]) (put (quote ediff-set-state-of-all-diffs-in-all-buffers) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-set-state-of-diff-in-all-buffers #[(n ctl-buf) "\nÉpp^!^!!^ˎq=9\fZ=EZ=QZ=Z)h=h!)p!!!׎q=\f===)=!)!p!!!؎q=\f===)&=&!)!!َp}!}!!}ڎq=X\fy=dy=py=y)=!)q $\f${)=!.\nÉpp!!!ˎq=\f = = = )=!)Zpo!o!!o׎q=J\fk=Vk=bk=k)y=y!)!Zp!!!؎q=\f===)=!)!!Zَp0!0!!0ڎq= \f,=,=#,=,):=:!)q I$\fU${)d=d!.\nÉpp!!!ˎq=\f===)=!) p\"!\"!!\"׎q=\f= ==),=,!)! p!!!؎q=]\f~=i~=u~=~)=!)!! َp!!!ڎq=\f===)=!)q $\f${)=!.WW\"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI '@)ÉppQ!Q!!Qˎq=,\fM=8M=DM=M)[=[!)p!!!׎q=\f===)=!)!p!!!؎q=\f = = = )=!)!!َpp!p!!pڎq=K\fl=Wl=cl=l)z=z!)q $\f${)=!.'A@)Épp\n!\n!!\nˎq=\f===)=!)S ph!h!!h׎q=C\fd=Od=[d=d)r=r!)!S p!!!؎q=\f===)=!)!!S َp) !) !!) ڎq= \f% = % = % =% )3 =3 !)q B $\fN ${)] =] !.'8) \"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI+" [n A ctl-buf nil end start ctrl-buf buf-type StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-get-diff-posn beg regC regB regA intern format "ediff-difference-vector-%S" 3 "=diff(B)" "=diff(C)" "=diff(A)" ediff-combination-pattern "\n" ediff-control-buffer 2 "=diff(A+B)"] 13]) (defalias 'ediff-set-merge-mode #[nil "!\"" [normal-mode t remove-hook local-write-file-hooks ediff-set-merge-mode] 3]) (defalias 'ediff-do-merge #[(diff-num &optional remerging) "W\f\"ʼn \nW< \"U:3Ђ4 \n$F HH ʼn pp!!!܎q===!=#)$=!)p!!!q=\n=\n=!\n=\n#)$=!)!pn!n!!nq=Ij=Uj=a!j=j#)x$=x!)!!p!!!q===!=#)$=!)q $ ${)$=!. ʼn ppl!l!!l܎q=Gh=Sh=_!h=h#)v$=v!)p!!!q===!=#)$=!)!p*!*!!*q=&=&=!&=&#)4$=4!)!!p!!!q=f=r=~!=#)$=!)q $ ${)$=!. ʼn pp(!(!!(܎q=$=$=!$=$#)2$=2!)up!!!q=a=m=y!=#)$=!)!up!!!q===!=#)$=!)!!upG!G!!Gq=\"C=.C=:!C=C#)Q$=Q!)qb $p ${)$=!../0񘃖0.򘃥/.0/456@56A@468*.\"\" H\f\"I+ HH3 T\"3 @\".ӂ/$ T ́A!," [diff-num 0 format "%S" ediff-default-variant nil state-of-merge do-not-copy default-state-of-merge n ediff-number-of-differences mod 10 message "%s buffers A & B into C ... region %d of %d" remerging "Re-merging" "Merging" ediff-state-of-merge A ediff-control-buffer end start ctrl-buf buf-type StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-get-diff-posn beg reg-C reg-B reg-A "default-A" "default-B" "combined" regB regA ediff-combination-pattern "\n" 2 string-match "prefer" t "\\(default\\|combined\\)" ediff-combine-diffs batch ediff-copy-diff "-A" "Merging buffers A & B into C ... Done"] 9]) #@85 Remerge unmodified diff regions using a new default. Start with the current region. (defalias 'ediff-re-merge #[nil "E!C \"\"$!\" *" [("default-A") ("default-B") ("combined") default-variant-alist delete symbol-name ediff-default-variant actual-alist intern completing-read format "Current merge default is `%S'. New default: " nil must-match ediff-do-merge ediff-current-difference remerge ediff-recenter] 6 (#$ . 9361) nil]) #@124 Shrink window C to just one line. With a prefix argument, returns window C to its normal size. Used only for merging jobs. (defalias 'ediff-shrink-window-C #[(arg) "! =  7!W,\n-\n !) WS!VS\n_\n ! Vn!Vn\n_\n !" [ediff-merge-job error "ediff-shrink-window-C can be used only for merging jobs" arg - -1 nil window-height ediff-window-C 3 ediff-merge-window-share 0 "" ediff-window-config-saved ediff-recenter no-rehighlight 2 .9 ediff-window-A 1.1000000000000001] 2 (#$ . 9824) "P"]) #@151 Combine Nth diff regions of buffers A and B and place the combination in C. Combining is done using the list in variable `ediff-combination-pattern'. (defalias 'ediff-combine-diffs #[(n &optional batch-invocation) " S\n ‰‰ \n p\fp\f\nr\n!r\n!!rώ\nq =Mn =Yn =en =n)|=|!)p\f\n\n!\n!!ێ\nq = = = =)=!)!p\f\n0\n!0\n!!0܎\nq = , =, =#, =,):=:!)!!ݎp\f\n\n!\n!!ގ\nq =l =x = =)=!)q  \n$ \n${)=!.‰ \n p\fp\f\n+\n!+\n!!+ώ\nq =' =' =' =')5=5!)vp\f\n\n!\n!!ێ\nq =d =p =| =)=!)!vp\f\n\n!\n!!܎\nq = = = =)=!)!!vݎp\f\nJ\n!J\n!!Jގ\nq =%F =1F ==F =F)T=T!)q d \n$q \n${)=!. \f!@ !A@\f!8*% %+% " [n ediff-current-difference nil reg-combined regB regA A ediff-control-buffer end start ctrl-buf buf-type StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-get-diff-posn beg ediff-combination-pattern "\n" 2 ediff-copy-diff batch-invocation ediff-recenter] 8 (#$ . 10386) "P"]) (defalias 'ediff-looks-like-combined-merge #[(region-num) "!\f)\f!)\f!!)\"!J HH*\" # #@A@8Ӊp \f\f!\f!!\fqb###)%=!).\f" [ediff-merge-job string-match regexp-quote "(A+B)" ediff-buffer-C get-buffer buffer-name intern format "ediff-difference-vector-%S" C region-num 3 "" ediff-get-diff-posn beg end ediff-combination-pattern 2 nil reg-c-end reg-c-beg reg-b-end reg-b-beg reg-a-end reg-a-beg pat3 pat2 pat1 reg-end reg-beg combined StartBuffer ((set-buffer StartBuffer)) search-forward noerror 0 this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 13]) (provide (quote ediff-merg))