Current File : //usr/local/share/emacs/27.2/lisp/vc/ediff-merg.elc
;ELC
;;; Compiled
;;; in Emacs version 27.2
;;; 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.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(byte-code "\300\301!\210\300\302!\210\303\304\305\306\307DD\310\311\312\313\314&\210\303\315\305\306\316DD\317\311\320\313\314&\210\303\321\305\306\322DD\323\311\324\313\314&\210\303\325\305\306\326DD\327\311\330\313\314&\210\331\325!\210\303\332\305\306\333DD\334\311\330\313\314&\210\331\332!\207" [require ediff-init ediff-util custom-declare-variable ediff-quit-merge-hook funcall function #[0 "\300\207" [ediff-maybe-save-and-delete-merge] 1] "Hooks to run before quitting a merge job.\nThe most common use is to save and delete the merge buffer." :type hook :group ediff-merge ediff-default-variant #[0 "\300\207" [combined] 1] "The variant to be used as a default for buffer C in merging.\nValid values are the symbols `default-A', `default-B', and `combined'." (radio (const default-A) (const default-B) (const combined)) ediff-combination-pattern #[0 "\300\207" [("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end")] 1] "Pattern to be used for combining difference regions in buffers A and B.\nThe value must be a list of the form\n(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4)\nwhere bufspec is the symbol A, B, or Ancestor. For instance, if the value is\n'(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the\ncombined text will look like this:\n\nSTRING1\ndiff region from variant A\nSTRING2\ndiff region from the ancestor\nSTRING3\ndiff region from variant B\nSTRING4\n" (choice (list string symbol string symbol string) (list string symbol string symbol string symbol string)) ediff-show-clashes-only #[0 "\300\207" [nil] 1] "If t, show only those diff regions where both buffers disagree with the ancestor.\nThis means that regions that have status prefer-A or prefer-B will be\nskipped over. A value of nil means show all regions." boolean make-variable-buffer-local ediff-skip-merge-regions-that-differ-from-default #[0 "\300\207" [nil] 1] "If t, show only the regions that have not been changed by the user.\nA region is considered to have been changed if it is different from the current\ndefault (`default-A', `default-B', `combined') and it hasn't been marked as\n`prefer-A' or `prefer-B'.\nA region is considered to have been changed also when it is marked as\n`prefer-A', but is different from the corresponding difference region in\nBuffer A or if it is marked as `prefer-B' and is different from the region in\nBuffer B."] 8)
#@10
(fn N)
(defalias 'ediff-merge-region-is-non-clash #[257 "\302>\203 \303\304 \203 H\305H\206 \306\"\207\307\207" [ediff-job-name ediff-state-of-merge (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) string-match "prefer" 0 "" t] 5 (#$ . 2821)])
#@10
(fn N)
(defalias 'ediff-merge-region-is-non-clash-to-skip #[257 "\302>\205
\205
\303!\207" [ediff-job-name ediff-show-clashes-only (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) ediff-merge-region-is-non-clash] 3 (#$ . 3194)])
#@10
(fn N)
(defalias 'ediff-skip-merge-region-if-changed-from-default-p #[257 "\302>\205 \205 \303\304\"\207" [ediff-job-name ediff-skip-merge-regions-that-differ-from-default (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) ediff-merge-changed-from-default-p prefers-too] 4 (#$ . 3551)])
#@10
(fn N)
(defalias 'ediff-get-combined-region #[257 "\302\303\304\211G\305W\203 \306!\210G\307V\203Q @\262A@\262;\203+ \211\310>\204/ \306!\210\3111D \312\313 #R\211\2620\202H \210\202I \210AA\262\202 @\262;\204^ \306!\210\312Q\211\262\207" [ediff-combination-pattern ediff-control-buffer "" "ediff-combination-pattern: Invalid format. Please consult the documentation" nil 5 error 2 (A B Ancestor) (error) "\n" ediff-get-region-contents] 13 (#$ . 3964)])
#@16
(fn CTL-BUF)
(defalias 'ediff-set-state-of-all-diffs-in-all-buffers #[257 "\301\211W\205 \302\"\210\211T\262\202 \207" [ediff-number-of-differences 0 ediff-set-state-of-diff-in-all-buffers] 5 (#$ . 4453)])
(put 'ediff-set-state-of-all-diffs-in-all-buffers 'byte-optimizer 'byte-compile-inline-expand)
#@18
(fn N CTL-BUF)
(defalias 'ediff-set-state-of-diff-in-all-buffers #[514 "\301\302#\301\303#\301\304#\230\203M \230\203M \302\305\"A\266\202JH\306\307I\210\303\305\"A\266\202JH\306\310I\210\304\305\"A\266\202JH\306\311I\202_\230\203\205 \302\305\"A\266\202JH\306\307I\210\303\305\"A\266\202JH\306\311I\210\304\305\"A\266\202JH\306\312I\202_\230\203\275 \302\305\"A\266\202JH\306\310I\210\304\305\"A\266\202JH\306\311I\210\303\305\"A\266\202JH\306\312I\202_\230\203\365 \304\305\"A\266\202JH\306\307I\210\303\305\"A\266\202JH\306\310I\210\302\305\"A\266\202JH\306\312I\202_\211\313!\230\2030\302\305\"A\266\202JH\306\312I\210\303\305\"A\266\202JH\306\312I\210\304\305\"A\266\202JH\306\314I\202_\302\305\"A\266\202JH\306\312I\210\303\305\"A\266\202JH\306\312I\210\304\305\"A\266\202JH\306\312I\207" [ediff-difference-vector-alist ediff-get-region-contents A B C assoc 3 "=diff(B)" "=diff(C)" "=diff(A)" nil ediff-get-combined-region "=diff(A+B)"] 10 (#$ . 4768)])
(defalias 'ediff-set-merge-mode #[0 "\300\301!\210\302\303\304\301#\207" [normal-mode t remove-hook write-file-functions ediff-set-merge-mode] 4])
#@37
(fn DIFF-NUM &optional REMERGING)
(defalias 'ediff-do-merge #[513 "\304W\203 \304\262\305\211 W\203\233 \305\262\306\307\"\304U\203. \310\311\203) \312\202* \313 $\210\n\2057 \nH\304H\203e \314!\204I \315\316\"\203L \317\262\315\320\"\203e \211\204e \n\203e \nH\304\321\322 \"I\210\n\205n \nH\304H\211\204\224 \323\230\203\202 \324T\325\"\210\202\224 \326\315\327\"\203\217 \330\202\220 \331\332\325$\210T\262\202
\310\333!)\207" [state-of-merge ediff-number-of-differences ediff-state-of-merge ediff-default-variant 0 nil mod 10 message "%s buffers A & B into C ... region %d of %d" "Re-merging" "Merging" ediff-merge-changed-from-default-p string-match "prefer" t "\\(default\\|combined\\)" format "%S" "combined" ediff-combine-diffs batch ediff-copy-diff "-A" A B C "Merging buffers A & B into C ... Done"] 9 (#$ . 5979)])
#@86 Remerge unmodified diff regions using a new default. Start with the current region.
(defalias 'ediff-re-merge #[0 "\302\303\304E\305\306!C\"\307\310\311\312\"\313\314$!\315 \316\"\210\317 \207" [ediff-default-variant ediff-current-difference ("default-A") ("default-B") ("combined") delete symbol-name intern completing-read format-message "Current merge default is `%S'. New default: " nil must-match ediff-do-merge remerge ediff-recenter] 8 (#$ . 6840) nil])
#@134 Shrink window C to just one line.
With a prefix argument, returns window C to its normal size.
Used only for merging jobs.
(fn ARG)
(defalias 'ediff-shrink-window-C #[257 "\204 \305\306!\210\211\307=\203 \310\262\202 \211\247\204 \311\262\211\2045 \312 !\313W\203, \n\202- \314\315\316\317!)\207\211\314W\203M \312 !\320V\203M \n\321_\315\316\317!\207\211\314V\205d \312\f!\320V\205d \n\322_\315\316\317!\207" [ediff-merge-job ediff-window-C ediff-merge-window-share ediff-window-config-saved ediff-window-A user-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] 3 (#$ . 7315) "P"])
#@276 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'.
(fn N &optional BATCH-INVOCATION)
(defalias 'ediff-combine-diffs #[513 "\247\203\n S\202 \262\301\302!\262\303\301\304%\266\211\206$ \305T!\207" [ediff-current-difference nil ediff-get-combined-region ediff-copy-diff C ediff-jump-to-difference] 9 (#$ . 8004) "P"])
#@19
(fn REGION-NUM)
(defalias 'ediff-looks-like-combined-merge #[257 "\205\255 \306\307 \211\205 \310!\205 \311\310!!\262\203, \312\n\313\"A\266\202JH\314H\206- \315\"\316\312\317#\316\312\320# \321\211\211\211\203\250 \211\205R \310!\205R \311\310!!\262\203\236 r q\210\203\232 b\210@\262\322\323#\210\324\224\262\324\225\262\203\205 \203\205 BB\262G\325V\203\224 AA\262\202[ \321\262\202[ )\202\250 \f\326=\204\250 \327
!\210\330!\266\210\207" [ediff-merge-job ediff-buffer-C ediff-difference-vector-alist ediff-combination-pattern this-command ediff-KILLED-VITAL-BUFFER string-match "(A\\+B)" get-buffer buffer-name C assoc 3 "" ediff-get-diff-posn beg end nil search-forward noerror 0 1 ediff-quit error reverse] 13 (#$ . 8528)])
#@39
(fn DIFF-NUM &optional PREFERS-TOO)
(defalias 'ediff-merge-changed-from-default-p #[513 "\303\304#\303\305#\303\306# \205 H\307H\211\310\230\203& \230?\206a \n\311\230\2033 \230?\206a \n\312\230\203B \313!\230?\206a \203S \n\314\230\203S \230?\206a \205a \n\315\230\205a \230?\207" [ediff-control-buffer ediff-state-of-merge state-of-merge ediff-get-region-contents A B C 0 "default-A" "default-B" "combined" ediff-get-combined-region "prefer-A" "prefer-B"] 9 (#$ . 9304)])
(provide 'ediff-merg)
Mini Shell