;ELC ;;; compiled by kwzh@nutrimat.gnu.ai.mit.edu on Wed Jul 17 15:41:15 1996 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff-merg.el ;;; emacs version 19.31.94.1. ;;; 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 combined) (#$ . -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 ("<<<<<<<<<<<<<< variant A" ">>>>>>>>>>>>>> variant B" "======= end of combination")) (#$ . -714)) #@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 (#$ . -1093)) (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_ =_)n=n!)p\n!!!َq = = = =)=!)!p\n#!#!!#ڎq = =\n = =).=.!)!!ێp\n!!!܎q =` =l =x =)=!)q \n$ \n${)=!.A@\n\fʼn p\np\n#!#!!#͎q = =\n = =).=.!)rp\n!!!َq =]~ =i~ =u~ =~)=!)!rp\n!!!ڎq = = = =)=!)!!rێp\nE!E!!E܎q = A =,A =8A =A)P=P!)q` \n$m \n${)}=}!.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 ediff-KILLED-VITAL-BUFFER ((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)i=i!)p!!!׎q=\f===)=!)!p!!!؎q=\f===))=)!)!!َp!!!ڎq=[\f|=g|=s|=|)=!)q $\f${)=!.\nÉpp!!!ˎq=\f== =)!=!!)cpu!u!!u׎q=P\fq=\\q=hq=q)=!)!cp!!!؎q=\f===)=!)!!cَp8!8!!8ڎq=\f4=4=+4=4)C=C!)q R$\f^${)n=n!.\nÉpp!!!ˎq=\f===)=!)p-!-!!-׎q=\f)=)= )=))8=8!)!p!!!؎q=i\f=u==)=!)!!َp!!!ڎq=\f===)=!)q \n$\f${)&=&!.ff\"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI \"!JHI\"!JHI\"!JHI '@)Épp`!`!!`ˎq=;\f\\=G\\=S\\=\\)k=k!)p!!!׎q=\f===)=!)!p ! !! ؎q=\f===)+=+!)!!َp!!!ڎq=]\f~=i~=u~=~)=!)q $\f${)=!.'A@)Épp!!!ˎq=\f===))=)!)k p}!}!!}׎q=X\fy=dy=py=y)=!)!k p!!!؎q=\f===)=!)!!k َp@ !@ !!@ ڎq= \f< =' < =3 < =< )K =K !)q Z $\ff ${)v =v !.'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 ediff-KILLED-VITAL-BUFFER ((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‰W\" \"U1 +̂, $< HH  ‰pp!!!؎q=~===) =#!)p!!!q====)  = #!)!pc!c!!cq=>_=J_=V_=_)n =n#!)!!p!!!q====) =#!)q $ ${) =#!. ‰pp`!`!!`؎q=;\\=G\\=S\\=\\)k =k#!)p!!!q====) =#!)!p ! !! q====)+ =+#!)!!p!!!q=]~=i~=u~=~) =#!)q $ ${) =#!. ‰pp!!!؎q====)( =(#!)lp|!|!!|q=Wx=cx=ox=x) =#!)!lp!!!q====) =#!)!!lp?!?!!?q=;=&;=2;=;)J =J#!)qZ $g ${)w =w#!.*+, 혃,* +* ,+012@12A@028** \" \"\f H;\"I+ HH\f   T\" \"ς$ TɁ@!+" [diff-num 0 nil state-of-merge do-not-copy 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 ediff-KILLED-VITAL-BUFFER ((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\\)" format "%S" ediff-default-variant 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 (#$ . 9248) 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 0.90000000000000002 ediff-window-A 1.1000000000000001] 2 (#$ . 9711) "P"]) #@240 Combine Nth diff regions of buffers A and B and place the combination in C. N is a prefix argument. If nil, combine the current difference regions. Combining is done according to the specifications in variable `ediff-combination-pattern'. (defalias 'ediff-combine-diffs #[(n &optional batch-invocation) "\nS ‰‰ \n p\fp\f\ns\n!s\n!!sώ\nq =No =Zo =fo =o)~=~!)p\f\n\n!\n!!ێ\nq = = = =)=!)!p\f\n3\n!3\n!!3܎\nq =/ =/ =&/ =/)>=>!)!!ݎp\f\n\n!\n!!ގ\nq =p =| = =)=!)q  \n$ \n${)=!.‰ \n p\fp\f\n1\n!1\n!!1ώ\nq =\f- =- =$- =-)<=<!)p\f\n\n!\n!!ێ\nq =k =w = =)=!)!p\f\n\n!\n!!܎\nq = = = =)=!)!!ݎp\f\nS\n!S\n!!Sގ\nq =.O =:O =FO =O)^=^!)q n \n${ \n${)=!. \f!@ !A@\f!8*% %+%T!" [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 ediff-KILLED-VITAL-BUFFER ((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-jump-to-difference] 8 (#$ . 10290) "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 ediff-KILLED-VITAL-BUFFER] 13]) (provide (quote ediff-merg))