;ELC ;;; Compiled by rms@psilocin.gnu.org on Mon May 4 23:31:06 1998 ;;; from file /gd/gnu/emacs/lisp/ediff-merg.el ;;; in Emacs version 20.2.92.10 ;;; with bytecomp version 2.41 ;;; with all optimizations. ;;; This file uses opcodes which do not exist in Emacs 18. (if (and (boundp 'emacs-version) (< (aref emacs-version (1- (length emacs-version))) ?A) (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")) (byte-code "\301\302!\210\303B\304B\305B\306B\307B\310\311!\207" [current-load-list provide ediff-merg ediff-window-A ediff-window-B ediff-window-C ediff-merge-window-share ediff-window-config-saved require ediff-init] 2) #@104 *Hooks to run before quitting a merge job. The most common use is to save and delete the merge buffer. (custom-declare-variable 'ediff-quit-merge-hook ''ediff-maybe-save-and-delete-merge '(#$ . -769) :type 'hook :group 'ediff-merge) #@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'. (custom-declare-variable 'ediff-default-variant ''combined '(#$ . -1009) :type '(radio (const default-A) (const default-B) (const combined)) :group 'ediff-merge) #@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  (custom-declare-variable 'ediff-combination-pattern ''("<<<<<<<<<<<<<< variant A" ">>>>>>>>>>>>>> variant B" "======= end of combination") '(#$ . -1311) :type '(list string string string) :group 'ediff-merge) #@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 (#$ . -1759)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-show-clashes-only put permanent-local t] 4) (defalias 'ediff-merge-region-is-non-clash #[(n) "\205\303\304 \203 \nH\305H\206\306\"\207" [ediff-show-clashes-only ediff-state-of-merge n string-match "prefer" 0 ""] 4]) (put 'ediff-merge-region-is-non-clash 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-combined-region #[(n) "@\306 \307\n\310\211 \203U\311 !\203U\312\311 !!\203Ur q\210\307=\2030\202Q\313=\203<\202Q\314=\203H\202Q\315=\205Q)\202`\316=\204c\317!\203\203\311 \203\253\311 !\203\253\312\311 !!\203\253r q\210\307=\203\206\202\247\313=\203\222\202\247\314=\203\236\202\247\315=\205\247)\202\266\316=\206\266\317!!\203\203\312\311 \203\311 !\203\312\311 !!\203r q\210\307=\203\336\202\377\313=\203\352\202\377\314=\203\366\202\377\315=\205\377)\202\316=\206\317!!!\203\203r \203[\311 !\203[\312\311 !!\203[r q\210\307=\2036\202W\313=\203B\202W\314=\203N\202W\315=\205W)\202f\316=\206f\317!q\210\f\206s\320\321 $ \206~\320\303 ${)\202\216\316=\206\216\317!-A@\306 \313\n\310\211 \203\345\311 !\203\345\312\311 !!\203\345r q\210\307=\203\300\202\341\313=\203\314\202\341\314=\203\330\202\341\315=\205\341)\202\360\316=\204\363\317!\203\311 \203;\311 !\203;\312\311 !!\203;r q\210\307=\203\2027\313=\203\"\2027\314=\203.\2027\315=\2057)\202F\316=\206F\317!!\203\312\311 \203\223\311 !\203\223\312\311 !!\203\223r q\210\307=\203n\202\217\313=\203z\202\217\314=\203\206\202\217\315=\205\217)\202\236\316=\206\236\317!!!\203r \203\353\311 !\203\353\312\311 !!\203\353r q\210\307=\203\306\202\347\313=\203\322\202\347\314=\203\336\202\347\315=\205\347)\202\366\316=\206\366\317!q\210\f\206\320\321 $ \206\320\303 ${)\202\316=\206\317!-\3228\306\260\207" [ediff-combination-pattern n ediff-control-buffer end start ctrl-buf "\n" A nil get-buffer buffer-name B C Ancestor ediff-quit error ediff-get-diff-posn beg 2 buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer this-command ediff-KILLED-VITAL-BUFFER] 11]) (put 'ediff-get-combined-region 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-make-combined-diff #[(regA regB) "@\303 A@\303\n\3048\303\260\207" [ediff-combination-pattern regA regB "\n" 2] 8]) (put 'ediff-make-combined-diff 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-set-state-of-all-diffs-in-all-buffers #[(ctl-buf) "\303\303 W\205\304\n\"\210T\211\202)\207" [n ediff-number-of-differences ctl-buf 0 ediff-set-state-of-diff-in-all-buffers] 4]) (put 'ediff-set-state-of-all-diffs-in-all-buffers 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-set-state-of-diff-in-all-buffers #[(n ctl-buf) "\306 \307\211\f\203M\310\f!\203M\311\310\f!!\203Mr\fq\210 \306=\203+\202I \312=\2036\202I \313=\203A\202I \314=\205I)\202X\315=\204[\316!\203m\310\f\203\237\310\f!\203\237\311\310\f!!\203\237r\fq\210 \306=\203}\202\233 \312=\203\210\202\233 \313=\203\223\202\233 \314=\205\233)\202\252\315=\206\252\316!!\203m\311\310\f\203\363\310\f!\203\363\311\310\f!!\203\363r\fq\210 \306=\203\321\202\357 \312=\203\334\202\357 \313=\203\347\202\357 \314=\205\357)\202\376\315=\206\376\316!!!\203mr\f\203G\310\f!\203G\311\310\f!!\203Gr\fq\210 \306=\203%\202C \312=\2030\202C \313=\203;\202C \314=\205C)\202R\315=\206R\316!q\210 \206^\317 \320\f$\n\206h\317 \302\f${)\202x\315=\206x\316!-\312 \307\211\f\203\306\310\f!\203\306\311\310\f!!\203\306r\fq\210 \306=\203\244\202\302 \312=\203\257\202\302 \313=\203\272\202\302 \314=\205\302)\202\321\315=\204\324\316!\203\346\310\f\203\310\f!\203\311\310\f!!\203r\fq\210 \306=\203\366\202 \312=\203\202 \313=\203\f\202 \314=\205)\202#\315=\206#\316!!\203\346\311\310\f\203l\310\f!\203l\311\310\f!!\203lr\fq\210 \306=\203J\202h \312=\203U\202h \313=\203`\202h \314=\205h)\202w\315=\206w\316!!!\203\346r\f\203\300\310\f!\203\300\311\310\f!!\203\300r\fq\210 \306=\203\236\202\274 \312=\203\251\202\274 \313=\203\264\202\274 \314=\205\274)\202\313\315=\206\313\316!q\210 \206\327\317 \320\f$\n\206\341\317 \302\f${)\202\361\315=\206\361\316!-\313 \307\211\f\203?\310\f!\203?\311\310\f!!\203?r\fq\210 \306=\203\202; \312=\203(\202; \313=\2033\202; \314=\205;)\202J\315=\204M\316!\203_\310\f\203\221\310\f!\203\221\311\310\f!!\203\221r\fq\210 \306=\203o\202\215 \312=\203z\202\215 \313=\203\205\202\215 \314=\205\215)\202\234\315=\206\234\316!!\203_\311\310\f\203\345\310\f!\203\345\311\310\f!!\203\345r\fq\210 \306=\203\303\202\341 \312=\203\316\202\341 \313=\203\331\202\341 \314=\205\341)\202\360\315=\206\360\316!!!\203_r\f\2039\310\f!\2039\311\310\f!!\2039r\fq\210 \306=\203\2025 \312=\203\"\2025 \313=\203-\2025 \314=\2055)\202D\315=\206D\316!q\210 \206P\317 \320\f$\n\206Z\317 \302\f${)\202j\315=\206j\316!- \211! \230\203\276!\230\203\276\306\"#\321 #\"A*JH\322\323I\210\312\"#\321 #\"A*JH\322\324I\210\313\"#\321 #\"A*JH\322\325I\202 ! \230\203\306\"#\321 #\"A*JH\322\323I\210\312\"#\321 #\"A*JH\322\325I\210\313\"#\321 #\"A*JH\322\307I\202 !\230\203J\306\"#\321 #\"A*JH\322\324I\210\313\"#\321 #\"A*JH\322\325I\210\312\"#\321 #\"A*JH\322\307I\202  \230\203\220\313\"#\321 #\"A*JH\322\323I\210\312\"#\321 #\"A*JH\322\324I\210\306\"#\321 #\"A*JH\322\307I\202 $@\326\306%\307\211\f\203\346\310\f!\203\346\311\310\f!!\203\346r\fq\210 \306=\203\304\202\342 \312=\203\317\202\342 \313=\203\332\202\342 \314=\205\342)\202\361\315=\204\364\316!\203\310\f\2038\310\f!\2038\311\310\f!!\2038r\fq\210 \306=\203\2024 \312=\203!\2024 \313=\203,\2024 \314=\2054)\202C\315=\206C\316!!\203\311\310\f\203\214\310\f!\203\214\311\310\f!!\203\214r\fq\210 \306=\203j\202\210 \312=\203u\202\210 \313=\203\200\202\210 \314=\205\210)\202\227\315=\206\227\316!!!\203r\f\203\340\310\f!\203\340\311\310\f!!\203\340r\fq\210 \306=\203\276\202\334 \312=\203\311\202\334 \313=\203\324\202\334 \314=\205\334)\202\353\315=\206\353\316!q\210 \206\367\317 \320\f$\n\206\317 \302\f${)\202\315=\206\316!-$A@\326\312%\307\211\f\203e\310\f!\203e\311\310\f!!\203er\fq\210 \306=\203C\202a \312=\203N\202a \313=\203Y\202a \314=\205a)\202p\315=\204s\316!\203\205\310\f\203\267\310\f!\203\267\311\310\f!!\203\267r\fq\210 \306=\203\225\202\263 \312=\203\240\202\263 \313=\203\253\202\263 \314=\205\263)\202\302\315=\206\302\316!!\203\205\311\310\f\203 \310\f!\203 \311\310\f!!\203 r\fq\210 \306=\203\351\202 \312=\203\364\202 \313=\203\377\202 \314=\205)\202\315=\206\316!!!\203\205r\f\203_\310\f!\203_\311\310\f!!\203_r\fq\210 \306=\203=\202[ \312=\203H\202[ \313=\203S\202[ \314=\205[)\202j\315=\206j\316!q\210 \206v\317 \320\f$\n\206\200\317 \302\f${)\202\220\315=\206\220\316!-\327$8\326\260)\230\203\333\306\"#\321 #\"A*JH\322\307I\210\312\"#\321 #\"A*JH\322\307I\210\313\"#\321 #\"A*JH\322\330I\202 \306\"#\321 #\"A*JH\322\307I\210\312\"#\321 #\"A*JH\322\307I\210\313\"#\321 #\"A*JH\322\307I+\207" [n ctl-buf end start ctrl-buf buf-type A nil get-buffer buffer-name B C Ancestor ediff-quit error ediff-get-diff-posn beg assoc 3 "=diff(B)" "=diff(C)" "=diff(A)" "\n" 2 "=diff(A+B)" ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer this-command ediff-KILLED-VITAL-BUFFER regC regB regA ediff-difference-vector-alist alist ediff-combination-pattern ediff-control-buffer] 13]) (defalias 'ediff-set-merge-mode #[nil "\300\301!\210\302\303\304\"\207" [normal-mode t remove-hook local-write-file-hooks ediff-set-merge-mode] 3]) (defalias 'ediff-do-merge #[(diff-num &optional remerging) "\306W\203\306\307\211\211\fW\203\323\307\310 \311\"\306U\203.\312\313 \203)\314\202*\315 \f$\210)\2059) H\306H \203\233 \316*\307\211+,-,\203\230\317,!\203\230\320\317,!!\203\230r,q\210-\316=\203s.\202\224-\321=\203/\202\224-\322=\203\2130\202\224-\323=\205\2241)\202\2432\324=\204\246\3253!\203\326\317,\203\362\317,!\203\362\320\317,!!\203\362r,q\210-\316=\203\315.\202\356-\321=\203\331/\202\356-\322=\203\3450\202\356-\323=\205\3561)\202\3752\324=\206\375\3253!!\203\326\320\317,\203N\317,!\203N\320\317,!!\203Nr,q\210-\316=\203).\202J-\321=\2035/\202J-\322=\203A0\202J-\323=\205J1)\202Y2\324=\206Y\3253!!!\203\326r,\203\252\317,!\203\252\320\317,!!\203\252r,q\210-\316=\203\205.\202\246-\321=\203\221/\202\246-\322=\203\2350\202\246-\323=\205\2461)\202\2652\324=\206\265\3253!q\210+\206\304\326-\327 ,$\206\321\326-\330 ,${)\202\3412\324=\206\341\3253!- \321*\307\211+,-,\203<\317,!\203<\320\317,!!\203<r,q\210-\316=\203.\2028-\321=\203#/\2028-\322=\203/0\2028-\323=\20581)\202G2\324=\204J\3253!\203z\317,\203\226\317,!\203\226\320\317,!!\203\226r,q\210-\316=\203q.\202\222-\321=\203}/\202\222-\322=\203\2110\202\222-\323=\205\2221)\202\2412\324=\206\241\3253!!\203z\320\317,\203\362\317,!\203\362\320\317,!!\203\362r,q\210-\316=\203\315.\202\356-\321=\203\331/\202\356-\322=\203\3450\202\356-\323=\205\3561)\202\3752\324=\206\375\3253!!!\203zr,\203N\317,!\203N\320\317,!!\203Nr,q\210-\316=\203).\202J-\321=\2035/\202J-\322=\203A0\202J-\323=\205J1)\202Y2\324=\206Y\3253!q\210+\206h\326-\327 ,$\206u\326-\330 ,${)\202\2052\324=\206\205\3253!- \322*\307\211+,-,\203\340\317,!\203\340\320\317,!!\203\340r,q\210-\316=\203\273.\202\334-\321=\203\307/\202\334-\322=\203\3230\202\334-\323=\205\3341)\202\3532\324=\204\356\3253!\203\317,\203:\317,!\203:\320\317,!!\203:r,q\210-\316=\203.\2026-\321=\203!/\2026-\322=\203-0\2026-\323=\20561)\202E2\324=\206E\3253!!\203\320\317,\203\226\317,!\203\226\320\317,!!\203\226r,q\210-\316=\203q.\202\222-\321=\203}/\202\222-\322=\203\2110\202\222-\323=\205\2221)\202\2412\324=\206\241\3253!!!\203r,\203\362\317,!\203\362\320\317,!!\203\362r,q\210-\316=\203\315.\202\356-\321=\203\331/\202\356-\322=\203\3450\202\356-\323=\205\3561)\202\3752\324=\206\375\3253!q\210+\206\f\326-\327 ,$\206\326-\330 ,${)\202)2\324=\206)\3253!-456 \331\230\203>64\230\203| \332\230\203L54\230\203| \333\230\203u65789@\33489A@\3347\33598\334\260*4\230\203|\336\337 \"\203~\340\336\341 \"\203\232\n\204\232)\203\232) H\306\342\343:\"I\210+)\205\246) H\306H\n\204\314 \333\230\203\272\344 T\345\"\210\202\314\346 \336\347 \"\203\307\316\202\310\321\322\345$\210 T\211\202\312\350!+\207" [diff-num state-of-merge do-not-copy n ediff-number-of-differences remerging 0 nil mod 10 message "%s buffers A & B into C ... region %d of %d" "Re-merging" "Merging" A get-buffer buffer-name B C Ancestor ediff-quit error ediff-get-diff-posn beg end "default-A" "default-B" "combined" "\n" 2 string-match "prefer" t "\\(default\\|combined\\)" format "%S" ediff-combine-diffs batch ediff-copy-diff "-A" "Merging buffers A & B into C ... Done" ediff-state-of-merge ediff-control-buffer start ctrl-buf buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer this-command ediff-KILLED-VITAL-BUFFER reg-C reg-B reg-A regB regA ediff-combination-pattern ediff-default-variant] 9]) #@85 Remerge unmodified diff regions using a new default. Start with the current region. (defalias 'ediff-re-merge #[nil "\304\305\306E\307\310 !C\"\311\312\313\314 \"\n\315\316$!\317 \320\"\210\321 *\207" [default-variant-alist ediff-default-variant actual-alist ediff-current-difference ("default-A") ("default-B") ("combined") delete symbol-name intern completing-read format "Current merge default is `%S'. New default: " nil must-match ediff-do-merge remerge ediff-recenter] 6 (#$ . 14192) 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) "\204\306\307!\210 \310=\203\311\202 \247\204\312 \2043\313\n!\314W\203* \202+\315\316\317\320!)\207 \315W\203K\313\n!\321V\203K \322_\316\317\320!\207 \315V\205b\313 !\321V\205b \323_\316\317\320!\207" [ediff-merge-job arg ediff-window-C ediff-merge-window-share ediff-window-config-saved ediff-window-A error "ediff-shrink-window-C can be used only for merging jobs" - -1 nil window-height 3 0 "" ediff-recenter no-rehighlight 2 0.9 1.1] 2 (#$ . 14699) "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) "\247\203\nS\202 \306\211\211\307 \306\211\203k\310!\203k\311\310!!\203krq\210\307=\203F\202g\312=\203R\202g\313=\203^\202g\314=\205g)\202v\315=\204y\316!\203\251\310\203\305\310!\203\305\311\310!!\203\305rq\210\307=\203\240\202\301\312=\203\254\202\301\313=\203\270\202\301\314=\205\301)\202\320\315=\206\320\316!!\203\251\311\310\203!\310!\203!\311\310!!\203!rq\210\307=\203\374\202\312=\203\202\313=\203\202\314=\205)\202,\315=\206,\316!!!\203\251r\203}\310!\203}\311\310!!\203}rq\210\307=\203X\202y\312=\203d\202y\313=\203p\202y\314=\205y)\202\210\315=\206\210\316!q\210\206\227\317\320$\206\244\317\321${)\202\264\315=\206\264\316!-\312 \306\211\203\310!\203\311\310!!\203rq\210\307=\203\352\202 \312=\203\366\202 \313=\203\202 \314=\205 )\202\315=\204\316!\203M\310\203i\310!\203i\311\310!!\203irq\210\307=\203D\202e\312=\203P\202e\313=\203\\\202e\314=\205e)\202t\315=\206t\316!!\203M\311\310\203\305\310!\203\305\311\310!!\203\305rq\210\307=\203\240\202\301\312=\203\254\202\301\313=\203\270\202\301\314=\205\301)\202\320\315=\206\320\316!!!\203Mr\203!\310!\203!\311\310!!\203!rq\210\307=\203\374\202\312=\203\202\313=\203\202\314=\205)\202,\315=\206,\316!q\210\206;\317\320$\206H\317\321${)\202X\315=\206X\316!-\f @\322\fA@\322 \3238\322\260*\324\306\313 \n%\210+ \206\205\325T!\207" [n ediff-current-difference reg-combined regB regA ediff-control-buffer nil A get-buffer buffer-name B C Ancestor ediff-quit error ediff-get-diff-posn beg end "\n" 2 ediff-copy-diff ediff-jump-to-difference start ctrl-buf buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer this-command ediff-KILLED-VITAL-BUFFER ediff-combination-pattern batch-invocation] 8 (#$ . 15355) "P"]) (defalias 'ediff-looks-like-combined-merge #[(region-num) "\205\343\306\307\310! \203,\311 !\203,\312\311 !!\203,\313\n\314\f \"A*J H\315H\206-\316\"\317\313\320 #\317\313\321 #@A@\3228\323\211\211\211\211\211 !\"#$\211%\203\277 \203\263\311 !\203\263\312\311 !!\203\263r q\210$b\210\324\"#\325#\210\326\224\326\225\324!#\325#\210\326\224\326\225\324 #\325#\210\326\224\326\225)\202\277&\327=\204\277\330'!\210\205\341\205\341\205\341\205\341\257.\f\207" [ediff-merge-job ediff-buffer-C ediff-difference-vector-alist alist buf-type region-num string-match regexp-quote "(A+B)" get-buffer buffer-name C assoc 3 "" ediff-get-diff-posn beg end 2 nil search-forward noerror 0 ediff-quit error ediff-combination-pattern 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 this-command ediff-KILLED-VITAL-BUFFER] 13])