ikan Uploader :
Directory : /usr/share/emacs/25.2/lisp/vc/
Upload File : |
| Current File : //usr/share/emacs/25.2/lisp/vc/ediff-util.elc |
;ELC
;;; Compiled
;;; in Emacs version 25.2.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.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(provide 'ediff-util)
(defvar ediff-after-quit-hook-internal nil)
(byte-code "\300\301!\204
\302\301\303\304B\"\210\305\306!\210\305\307!\210\305\310!\210\305\311!\210\305\312!\210\305\313!\207" [fboundp declare-function defalias macro #[(&rest _r) "\300\207" [nil] 1] require ediff-init ediff-help ediff-mult ediff-wind ediff-diff ediff-merg] 4)
#@668 Ediff mode controls all operations in a single Ediff session.
This mode is entered through one of the following commands:
`ediff'
`ediff-files'
`ediff-buffers'
`ebuffers'
`ediff3'
`ediff-files3'
`ediff-buffers3'
`ebuffers3'
`ediff-merge'
`ediff-merge-files'
`ediff-merge-files-with-ancestor'
`ediff-merge-buffers'
`ediff-merge-buffers-with-ancestor'
`ediff-merge-revisions'
`ediff-merge-revisions-with-ancestor'
`ediff-windows-wordwise'
`ediff-windows-linewise'
`ediff-regions-wordwise'
`ediff-regions-linewise'
`epatch'
`ediff-patch-file'
`ediff-patch-buffer'
`epatch-buffer'
`erevision'
`ediff-revision'
Commands:
\{ediff-mode-map}
(defalias 'ediff-mode #[nil "\302 \210\303\304\305\306!\207" [major-mode mode-name kill-all-local-variables ediff-mode "Ediff" run-hooks ediff-mode-hook] 2 (#$ . 759)])
#@125 Local keymap used in Ediff mode.
This is local to each Ediff Control Panel, so they may vary from invocation
to invocation.
(defvar ediff-mode-map nil (#$ . 1604))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-mode-map put permanent-local t] 4)
#@36 Set up Ediff keymap, if necessary.
(defalias 'ediff-set-keys #[nil "\204 \301 \210\302!\207" [ediff-mode-map ediff-setup-keymap use-local-map] 2 (#$ . 1891)])
(defalias 'ediff-reload-keymap #[nil "\301\302 \207" [ediff-mode-map nil ediff-set-keys] 1 nil nil])
#@56 Set up the keymap used in the control buffer of Ediff.
(defalias 'ediff-setup-keymap #[nil "\306 \307!\210\310\311\312#\210\310\313\312#\210\310\314\315#\210\310\316\315#\210\310\317\315#\210\310\320 \205- \315#\210\310\321\315#\210\310\322\315#\210\310\323\324#\210\310\325\324#\210\310\326\327#\210\310\330\331#\210\310\332\333#\210\310\334\333#\210\310\335\336#\210\310\337\340#\210\310\341\342#\210\310\343\344#\210\310\345\346#\210\310\347\350#\210\n\204\215 \310\351\352#\210 \203\227 \310\353\354#\210\310\355\356#\210\310\357\360#\210\310\361\360#\210\310\362\360#\210\310\363\360#\210\310\364\360#\210\310\365\366#\210\310\367\366#\210\310\370\371#\210\310\372\373#\210\310\374\375#\210\310\376\377#\210\310\201B \201C #\210\310\201D \201E #\210\n\204\310\201F \201G #\210\310\201H \331#\210\310\201I \331#\210\310\201J \331#\210\f\203\202\310\201K \201L #\210\310\201H \201M #\210\310\201I \201N #\210\310\201J \201O #\210\310\201P \201Q #\210\310\201R \201S #\210\310\201T \331#\210\310\201U \201V #\210\310\201W \201X #\210\310\201Y \201Z #\210\202
\203\365\310\201[ \201\\ #\210\310\201] \201^ #\210\310\201_ \201M #\210\310\201` \201N #\210\310\201a \331#\210\310\201b \201c #\210\310\201d \201e #\210\310\201f \201g #\210\310\201h \201g #\210\310\201i \201g #\210\310\201j \201k #\210\202 \310\201H \201\\ #\210\310\201I \201^ #\210\310\201f \201g #\210\310\201h \201g #\210\310\201l \201m #\210\310\201n \331#\210\310\201o \201p #\210\310\201q \201p #\210\310\201r \201s #\210\n\204[\310\201t \201u #\210\310\201v \331#\210\310\201w \201k #\210\310\201x \201k #\210\310\201y \331#\210\310\201z \201{ #\210\310\201| \201{ #\210\310\201} \201{ #\210\310\201~ \201 #\210\201\200 \201\201 !\203\304@\201\202 =\203\304\310\201\203 \201\201 #\210A\203\333\310\201\204 \201{ #\210\310\201\205 \333#\210\310\201\206 \201\207 #\210\300M\210\201\210 \201\211 !\207" [ediff-mode-map ediff-no-emacs-help-in-control-buffer ediff-word-mode ediff-narrow-job ediff-merge-job ediff-3way-comparison-job make-sparse-keymap suppress-keymap define-key [mouse-2] ediff-help-for-quick-help "
" "p" ediff-previous-difference "" [delete] "" [backspace] [33554464] "n" ediff-next-difference " " "j" ediff-jump-to-difference "g" nil "ga" ediff-jump-to-difference-at-point "gb" "q" ediff-quit "D" ediff-show-diff-output "z" ediff-suspend "\f" ediff-recenter "|" ediff-toggle-split "h" ediff-toggle-hilit "@" ediff-toggle-autorefine "%" ediff-toggle-narrow-region "~" ediff-swap-buffers "v" ediff-scroll-vertically "" "^" "\366" "V" "<" ediff-scroll-horizontally ">" "i" ediff-status-info "E" ediff-documentation "?" ediff-toggle-help "!" ediff-update-diffs ediff-job-name ediff-3way-job "M" ediff-show-current-session-meta-buffer "R" ediff-show-registry "*" ediff-make-or-kill-fine-diffs "a" "b" "r" "/" ediff-show-ancestor ediff-copy-A-to-C ediff-copy-B-to-C ediff-restore-diff-in-merge-buffer "s" ediff-shrink-window-C "+" ediff-combine-diffs "$" "$$" ediff-toggle-show-clashes-only "$*" ediff-toggle-skip-changed-regions "&" ediff-re-merge "ab" ediff-copy-A-to-B "ba" ediff-copy-B-to-A "ac" "bc" "c" "ca" ediff-copy-C-to-A "cb" ediff-copy-C-to-B "ra" ediff-restore-diff "rb" "rc" "C" ediff-toggle-read-only "G" ediff-submit-report "#" "#h" ediff-toggle-regexp-match "#f" "#c" ediff-toggle-ignore-case "##" ediff-toggle-skip-similar "o" "A" "B" "w" "wa" ediff-save-buffer "wb" "wd" "=" ediff-inferior-compare-regions fboundp ediff-show-patch-diagnostics epatch "P" "wc" "gc" "m" ediff-toggle-wide-display run-hooks ediff-keymap-setup-hook] 4 (#$ . 2161)])
(defalias 'ediff-setup #[(buffer-A file-A buffer-B file-B buffer-C file-C startup-hooks setup-parameters &optional merge-buffer-file) "\306\307!\210\310\311!!\310\311 !!\n;\203 \310\311\n!! ;\203J \310\311 !!\312\313 !!\2047 \314\315\316\313 !!\"\210\312 !\203J \317 !\203J \314\320\316 !\"\210\321\322\323\"
\211 @\205c \324@!\205c \325\324@!!)\203r r
q\210\326\f!)\202} A\327=\206} \314B!\211 C\211 @\205\223 \324@!\205\223 \325\324@!!)\203}rCq\210\330 \210\331\332!\210\331\333!\210\331\334!\210\331\335!\210\331\336!\210\331\337!\210\331\340!\210\331\341!\210\342!D\203\332 D@@D@AL\210DA\211D\204\307 E\343>FE\344>GE\345>HF\206\363 GIF\206\374 HJE\346>KE\347>LE\350>M\351\352\353E!\"\203 \354 \355 \203)\356\357\360\361\362$\210\363 NG\203\231 \364=\203>O\202?
@P QR\326\321\365\323\"!QrQq\210\366@!\210eb\210@\211 @\205s\324@!\205s\325\324@!!)\203\202r@q\210S)\202\215A\327=\206\215\314B! \210~\210\356\367\370\361\354$\210*\361T
UOVQWCX\371 \210\351\372\f\"\203\276\f\373\224\373\225O\202\277\374Y\373\375Y\351\376Y\"\206\316\373\361O!S]Z\326\321\377\323\"![r[q\210\354\\)
\211 @\205\372\324@!\205\372\325\324@!!)\203 r
q\210]:\203]@\201s \235\203\342]8])\202(A\327=\204(\314B!\210O\211 @\205=\324@!\205=\325\324@!!)\203`rOq\210]:\203\\]@\201s \235\203\\\342]8])\202lA\327=\204l\314B!\210I\203\265Q\211 @\205\206\324@!\205\206\325\324@!!)\203\251rQq\210]:\203\245]@\201s \235\203\245\342]8])\202\265A\327=\204\265\314B!\210R\211 @\205\312\324@!\205\312\325\324@!!)\203R\211 @\205\343\324@!\205\343\325\324@!!)\203rRq\210]:\203]@\201s \235\203\342]8])\202A\327=\204\314B!\210\201t \210J\203\"\201u \202%\201v ^\201w \201x \201y U#\201w \201z \201{ V#\201w \201| \201} W#E_`\203Zab\202^_b\201~ \210a\204l_aU\211 @\205\201\324@!\205\201\325\324@!!)\203\345rUq\210\201 \210\306\201\200 !\210C\211 @\205\252\324@!\205\252\325\324@!!)\203\271rCq\210G)\202\304A\327=\204\307\314B!\203\312\354TCc>\204\331CcBcd\203\341\354T)\202\361A\327=\204\361\314B!\210V\211 @\205\324@!\205\325\324@!!)\203jrVq\210\201 \210\306\201\200 !\210C\211 @\205/\324@!\205/\325\324@!!)\203>rCq\210G)\202IA\327=\204L\314B!\203O\354TCc>\204^CcBcd\203f\354T)\202vA\327=\204v\314B!\210I\203W\211 @\205\220\324@!\205\220\325\324@!!)\203\371rWq\210\201 \210C\211 @\205\263\324@!\205\263\325\324@!!)\203\302rCq\210G)\202\315A\327=\204\320\314B!\203\322~\210\306\201\200 !\210Cc>\204\347CcBcd\203\362\354T\202\365\361T)\202A\327=\204\314B!\210R\211 @\205\324@!\205\325\324@!!)\203iR\211 @\2053\324@!\2053\325\324@!!)\203]rRq\210\201 \210\354T\306\201\200 !\210Cc>\204YCcBc)\202iA\327=\204i\314B!\210^ \n#\210eGf\201\201 g\201\202 \201\203 !\210\201\202 \201\204 !\210I\203\227\201\202 \201\205 !\210H\203\244\201\202 \201\206 !\210\201\207
OQC$\210a@ h\201\210 h!\205\304\201\211 h!)aA@ h\201\210 h!\205\332\201\211 h!)\342a8 h\201\210 h!\205\360\201\211 h!) i j k\212\201\212 l!\210kb\210)\212\201\212 m!\210jb\210)I\203#\212\201\212 n!\210ib\210)+\201\212 o!\210\201\213 \210\306\201\214 !\210\201\215 !\210\201\216 \210\354TCpBp\201\217 \210q\211 @\205e\324@!\205e\325\324@!!)\203s\201\220 q\361r#\210\306\201\221 !\210)\202\211A\327=\204\211\314B!\210C*\207" [file-A file-B file-C merge-buffer-file control-buffer-name buffer-A run-hooks ediff-before-setup-hook ediff-convert-standard-filename expand-file-name file-exists-p file-name-directory error "Directory %s given as place to save the merge doesn't exist" abbreviate-file-name file-directory-p "The merge buffer file %s must not be a directory" ediff-unique-buffer-name "*Ediff Control Panel" "*" get-buffer buffer-name get-buffer-create ediff-quit ediff-mode make-local-variable ediff-use-long-help-message ediff-prefer-iconified-control-frame ediff-split-window-function ediff-default-variant ediff-merge-window-share ediff-window-setup-function ediff-keep-variants window-min-height 2 (ediff-files3 ediff-buffers3) (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-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor) (ediff-windows-wordwise ediff-regions-wordwise ediff-windows-linewise ediff-regions-linewise) (ediff-windows-wordwise ediff-windows-linewise) (ediff-windows-wordwise ediff-regions-wordwise) string-match "buffer" symbol-name t ediff-window-display-p add-hook pre-command-hook ediff-spy-after-mouse nil local mouse-pixel-position default-B "*ediff-merge" insert-buffer-substring local-write-file-hooks ediff-set-merge-mode ediff-choose-syntax-table "<[0-9]*>" 0 "" string-to-number "[0-9]+" "*ediff-errors" buf this-command ediff-KILLED-VITAL-BUFFER control-buffer setup-parameters ediff-job-name ediff-3way-comparison-job ediff-merge-job ediff-merge-with-ancestor-job ediff-3way-job ediff-diff3-job ediff-narrow-job ediff-windows-job ediff-word-mode-job ediff-mouse-pixel-position buffer-B ediff-merge-split-window-function buffer-C ediff-ancestor-buffer major-mode buffer-read-only ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer ediff-control-buffer-suffix ediff-control-buffer-number ediff-error-buffer buffer-undo-list mode-line-format ediff-setup-diff-regions-function ediff-wide-bounds ediff-start-narrowed ediff-narrow-bounds ediff-visible-bounds ediff-this-buffer-ediff-sessions ediff-make-buffers-readonly-at-startup ediff-difference-vector-A ediff-number-of-differences ediff-current-difference overl shift-C shift-B shift-A ediff-window-A ediff-window-B ediff-window-C ediff-control-window ediff-session-registry ediff-meta-buffer ediff-meta-session-number (" A: " " B: " " C: " " Ancestor: ") ediff-save-protected-variables ediff-setup-diff-regions3 ediff-setup-diff-regions ediff-make-bullet-proof-overlay (point-min) (point-max) (point-min) (point-max) (point-min) (point-max) ediff-set-keys ediff-nuke-selective-display ediff-prepare-buffer-hook -1 ediff-make-current-diff-overlay A B C Ancestor ediff-setup-windows ediff-overlayp overlay-start select-window ediff-visible-region startup-hooks ediff-arrange-autosave-in-merge-jobs ediff-refresh-mode-lines ediff-update-registry ediff-update-meta-buffer ediff-startup-hook] 7])
#@35 Set up window for control buffer.
(defalias 'ediff-setup-control-buffer #[(ctl-buf) "\306 \203 q\210\202 \307!\210\310\311 \210\312 \210\nc\210\313 \210\314 \203& \204) \315 \210\316 \210\317\320!\210\321 \210\322 \323\324\f
\314 \205F & \325\322 \326\"\210\314 \203[ \204^ \327 \210eb\210 \320w)\207" [ctl-buf window-min-height ediff-help-message ediff-multiframe ediff-control-window ediff-window-A window-dedicated-p switch-to-buffer 2 erase-buffer ediff-set-help-message shrink-window-if-larger-than-buffer ediff-window-display-p ediff-indent-help-message ediff-set-help-overlays set-buffer-modified-p nil ediff-refresh-mode-lines selected-window format "%S%S%S%S%S%S%S" set-window-dedicated-p t ediff-make-bottom-toolbar ediff-window-B ediff-window-C ediff-split-window-function ediff-wide-display-p ediff-window-config-saved ediff-whitespace] 9 (#$ . 12380)])
(defalias 'ediff-arrange-autosave-in-merge-jobs #[(merge-buffer-file) "\205q ;\203
\306 ;\203E \307 !\210 \f\211 \205) \310
!\205) \311\310
!!)\2039 r\fq\210\312 !\210)\202E \313=\204E \314!\210\f\211 \205V \310
!\205V \311\310
!!)\203f r\fq\210\306\315\316!)\207\313=\206q \314!\207" [ediff-merge-job merge-buffer-file ediff-autostore-merges ediff-merge-store-file ediff-buffer-C buf t ediff-verify-file-merge-buffer get-buffer buffer-name set-visited-file-name ediff-quit error auto-save-mode 1 this-command ediff-KILLED-VITAL-BUFFER buffer-offer-save] 4])
#@217 Recompute difference regions in buffers A, B, and C.
Buffers are not synchronized with their respective files, so changes done
to these buffers are not saved at this point---the user can do this later,
if necessary.
(defalias 'ediff-update-diffs #[nil "\306\307!\206\f \310\311 \")\210\n\211\205 \312 !\205 \313\312 !!)\203- \314\315!\204- \310\316!\210\f\211\205> \312 !\205> \313\312 !!)\203K r\fq\210`)\202T \317=\206T \310
!\320/!\321\f!\3210!\3211!2@2A@\32228\306\211\211\211\211\211\211\211\211 3 4 5 6 7 8 9 : ; < = > ? @ A B CA;\203\245 \323A!A@;\203\261 \323@!@?;\203\275 \323?!?\324\325!\210> D\326D!\205\320 \327D!);= D\326D!\205\342 \327D!)9< D\326D!\205\364 \327D!)7> D\326D!\205\330D!):= D\326D!\205\330D!)8< D\326D!\205*\330D!)6E\203o\331;:\fB$\210\332B\333\"5\331980B$\210\332B\334\"4F\203\213\331761B$\210\332B\335\"3\202\213\332\fA\"5\3320@\"4F\203\213\3321?\"3\336\337\340\"\210\336\341\340\"\210\336\342\340\"\210\336\343\340\"\210\306\211#\306\211GHIJKLM M L K J IK\203\322\344I\345J\306\211KL\346MI543#\210- GN\3475!\210\3474!\2103\203\366\3473!\210F\203O P\350\211 QNW\205\351QP\"\210QT\211Q\202*\210\352\353\354C\"!\210\355\356!.\207" [meta-buf-p this-command ediff-ancestor-buffer buf ediff-buffer-A ediff-KILLED-VITAL-BUFFER nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name y-or-n-p "Ancestor buffer will not be used. Recompute diffs anyway? " "Recomputation of differences canceled" ediff-quit get-buffer-create buffer-file-name 2 file-name-nondirectory ediff-unselect-and-select-difference -1 ediff-overlayp overlay-start overlay-end ediff-wordify ediff-make-temp-file "regA" "regB" "regC" ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-difference-vector-Ancestor ediff-setup-diff-regions3 t ediff-files3 delete-file 0 ediff-set-state-of-diff-in-all-buffers ediff-jump-to-difference ediff-diff-at-point A message "" ediff-tmp-buffer ediff-buffer-B ediff-buffer-C ediff-narrow-bounds file-C file-B file-A end-C beg-C end-B beg-B end-A beg-A overl-C overl-B overl-A buf-C-file-name buf-B-file-name buf-A-file-name tmp-buffer point-A overl ediff-word-mode ediff-3way-job ediff-state-of-merge ediff-killed-diffs-alist ediff-setup-diff-regions-function ediff-3way-comparison-job ediff-merge-job ediff-merge-with-ancestor-job ediff-job-name ediff-number-of-differences ediff-control-buffer ctl-buf n] 18 (#$ . 13849) nil])
#@68 Revert buffers A, B and C. Then rerun Ediff on file A and file B.
(defalias 'ediff-revert-buffers-then-recompute-diffs #[(noconfirm) "\306\307!\206\f \310\311 \")\210\n \f
\211 !\211 \"\205B \312\"!\205B \313\312\"!!)\203U r!q\210\314\315#\"\210)\202` \316=\204` \310$!\210 \211 \"\205u \312\"!\205u \313\312\"!!)\203\210 r q\210\314\315#\"\210)\202\223 \316=\204\223 \310$!\210\203\313 \211 \"\205\255 \312\"!\205\255 \313\312\"!!)\203\300 r q\210\314\315#\"\210)\202\313 \316=\204\313 \310$!\210\203\370 q\210\317 ?!\210\320 !\210\203\357 \321! #\202\372 \322! \"\202\372 \323 . \207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name revert-buffer t ediff-quit ediff-really-quit kill-buffer ediff-merge-buffers-with-ancestor ediff-merge-buffers ediff-update-diffs ediff-keep-variants ediff-ancestor-buffer ediff-merge-with-ancestor-job ediff-merge-job ediff-3way-comparison-job comparison merge ancestor-job ancestor-buf keep-variants ctl-buf bufC bufB bufA buf noconfirm ediff-KILLED-VITAL-BUFFER] 10 (#$ . 16467) "P"])
#@117 Bring the highlighted region of all buffers being compared into view.
Reestablish the default three-window display.
(defalias 'ediff-recenter #[(&optional no-rehighlight) "\306\307!\206\f \310\311 \")\210\306 \211 \205! \312\f!\205! \313\312\f!!)\203a
\211 \2056 \312\f!\2056 \313\312\f!!)\203a +\203U ,\211 \205Q \312\f!\205Q \313\312\f!!)\203a \314
,-$\210\202o \315=\204o \316.\317\320!\"\210)\321 \210\322 \203\303 9\203\303 /9\203\303 \323>\204\231 \324>\203\303 \325\326\327/!\"\204\303 \3300!\203\247 \331\3320!!\210\3301!\203\265 \331\3321!!\210\3302!\203\303 \331\3322!!\210\322 \203\3333!\2034\2043 5\322 \205\352 \3335!\205\352 \3345!\335=)\204\336\337!\203\374 \3373!\210\202\3313!\210\3403!\210\336\341!\203\3413!\2103- 6 7 \211 \205*\312\f!\205*\313\312\f!!)\203\327
\211 \205?\312\f!\205?\313\312\f!!)\203\327+\203^,\211 \205Z\312\f!\205Z\313\312\f!!)\203\3278\204h\3429!\210\343\344!\210\343\345!\210+\203y\343\346!\2106\211 \205\213\312\f!\205\213\313\312\f!!)\203\314r6q\210\347 \210\322 \203\310:\203\3104\204\3103 5\322 \205\274\3335!\205\274\3345!\335=)\204\310\3507 \315=\"\210)\202\327 \315=\204\327\310.!\2108\204\337\351 \2106\211 \205\361\312\f!\205\361\313\312\f!!)\203 r6q\210\352 )\202\n \315=\206\n\310.!*\207" [meta-buf-p this-command buffer-read-only ediff-buffer-A buf ediff-buffer-B nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name ediff-setup-windows ediff-quit message beep 1 ediff-visible-region ediff-window-display-p (ediff-recenter ediff-dir-action ediff-registry-action ediff-patch-action ediff-toggle-wide-display ediff-toggle-multiframe) (ediff-next-difference ediff-previous-difference ediff-jump-to-difference ediff-jump-to-difference-at-point) string-match "^ediff-" symbol-name window-live-p raise-frame window-frame frame-live-p frame-visible-p icon fboundp select-frame-set-input-focus select-frame focus-frame ediff-select-difference ediff-recenter-one-window A B C ediff-recenter-ancestor ediff-reset-mouse ediff-restore-highlighting ediff-refresh-mode-lines ediff-3way-job ediff-buffer-C ediff-control-buffer ediff-KILLED-VITAL-BUFFER last-command ediff-window-A ediff-window-B ediff-window-C ediff-control-frame ediff-use-long-help-message frame control-buf control-frame no-rehighlight ediff-current-difference ediff-multiframe] 6 (#$ . 17718) nil])
(defalias 'ediff-recenter-one-window #[(buf-type) "\306 \211\307Y\205
\nW)\205\244 \310 \f\311=\203
@\2024 \f\312=\203+
A@\2024 \f\313=\2054 \314
8 \315!\205A \316!) \f \317\f \"A* \320 J!\205f J\211 !\203x \"\203x \321!\"\210!\203\237 \322!!\210\323 \210\324\325\f\326\306 $\325\f\327\306 $\325\f\326\306 $$\210\322 !.\207" [n ediff-current-difference ediff-number-of-differences ctl-wind buf-type ediff-narrow-bounds nil 0 selected-window A B C 2 ediff-overlayp overlay-start assoc window-live-p set-window-start select-window ediff-deactivate-mark ediff-position-region ediff-get-diff-posn beg end overl shift ediff-job-name job-name ediff-control-buffer control-buf ediff-window-alist alist window-name window ediff-windows-job] 9])
(defalias 'ediff-recenter-ancestor #[nil "\211\205 \306 !\205 \307\306 !!)\205\221 \310 \211\311Y\205\" \n\fW)\205\221 \312!\313
\211\205G \306 !\205G \307\306 !!)\203\200 rq\210\314\315\316\310$b\210\203| \317!\210\320\314\315\316\310$\314\315\321\310$\314\315\316\310$$\210)\202\214 \322=\204\214 \323!\210\317!,\207" [ediff-ancestor-buffer buf n ediff-current-difference ediff-number-of-differences ediff-job-name get-buffer buffer-name nil 0 ediff-get-visible-buffer-window selected-window ediff-get-diff-posn Ancestor beg select-window ediff-position-region end ediff-quit error ediff-control-buffer ctl-buf job-name ctl-wind window this-command ediff-KILLED-VITAL-BUFFER] 9])
#@101 Toggle vertical/horizontal window split.
Does nothing if file-A and file-B are in different frames.
(defalias 'ediff-toggle-split #[nil "\306\307!\206\f \310\311 \")\210\312\n!\205 \n\312\f!\205 \f \312!\205' \2050 \313 !
\2059 \313
! \205D \313! =\204x \314!\203x \314!\203x \203\211 \314!\203x =\204x =\203\211 \315=\203\203 \316\202\204 \315\202\215 \317\320!\210\321\322!.\207" [meta-buf-p this-command ediff-window-A wind-A ediff-window-B wind-B nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p window-frame frame-live-p split-window-vertically split-window-horizontally message "Buffers being compared are in different frames" ediff-recenter no-rehighlight ediff-window-C wind-C frame-A frame-B frame-C ediff-3way-comparison-job ediff-split-window-function] 3 (#$ . 21688) nil])
#@154 Switch between highlighting using ASCII flags and highlighting using faces.
On a dumb terminal, switches between ASCII highlighting and no highlighting.
(defalias 'ediff-toggle-hilit #[nil "\306\307!\206\f \310\311 \")\210\312\n\313\"\210 \203+ \314 \203+ \f\203+ \315\316!\210\306\317\202r \203: \314 \203:
\317=\204E \314 \204R
\320=\203R \315\321!\210\322\306\211\202r
\322=\203c \315\323!\210\320\306\202r \314 \203r \315\324!\210\325\317\325 \203\200 \f\203\200 \326 \210\202\204 \326\327!\210\312\n\330\"\207" [meta-buf-p this-command ediff-current-difference ediff-use-faces ediff-highlight-all-diffs ediff-highlighting-style nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-unselect-and-select-difference unselect-only ediff-has-face-support-p message "Unhighlighting unselected difference regions" face off "Highlighting with ASCII flags" ascii "ASCII highlighting flags removed" "Re-highlighting all difference regions" t ediff-paint-background-regions unhighlight select-only] 4 (#$ . 22580) nil])
#@26 Toggle auto-refine mode.
(defalias 'ediff-toggle-autorefine #[nil "\305\306!\206\f \307\310 \")\210\n\203 \307\311!\210 \312=\203' \313\314\f\315\"\210\316\317!\207 \313=\2035 \316\320!\210\321\211\207\322\f\323\"\210\316\324!\210\312\211\207" [meta-buf-p this-command ediff-word-mode ediff-auto-refine ediff-current-difference nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" "No fine differences in this mode" nix on ediff-make-fine-diffs noforce message "Auto-refining is ON" "Auto-refining is OFF" off ediff-set-fine-diff-properties t "Refinements are HIDDEN"] 3 (#$ . 23658) nil])
#@48 Show the ancestor buffer in a suitable window.
(defalias 'ediff-show-ancestor #[nil "\305 \210\211\205 \306 !\205 \307\306 !!)\204' \n\203# \310\311!\210\202' \310\312!\210\313\314!\211\2039 \315\316 !!\202= \317\f\")\207" [ediff-ancestor-buffer buf ediff-merge-with-ancestor-job wind ediff-window-C ediff-recenter get-buffer buffer-name error "Lost connection to ancestor buffer...sorry" "Not merging with ancestor" nil ediff-get-visible-buffer-window raise-frame window-frame set-window-buffer] 4 (#$ . 24297) nil])
#@123 Compute fine diffs. With negative prefix arg, kill fine diffs.
In both cases, operates on the current difference region.
(defalias 'ediff-make-or-kill-fine-diffs #[(arg) "\306\307!\206\f \310\311 \")\210\n\312=\203\304 \211 \313
\314
\"A*J\fH\211 \2057 \315\316\317H\")\210
\314
\"A*J\fH\317\306I*\210\f\320
\314
\"A*J\fH\211 \205o \315\316\317H\")\210
\314
\"A*J\fH\317\306I*\210\205\302 \f\321
\314
\"A*J\fH\211 \205\254 \315\316\317H\")\210
\314
\"A*J\fH\317\306I*)\207\n\247\203\n\322W\203 \211 \313
\314
\"A*J\fH\211 \205\362 \315\316\317H\")\210
\314
\"A*J\fH\317\306I*\210\f\320
\314
\"A*J\fH\211 \205*\315\316\317H\")\210
\314
\"A*J\fH\317\306I*\210\205}\f\321
\314
\"A*J\fH\211 \205g\315\316\317H\")\210
\314
\"A*J\fH\317\306I*)\207\323 \207" [meta-buf-p this-command arg ediff-current-difference n buf-type nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" - A assoc mapc ediff-delete-overlay 1 B C 0 ediff-make-fine-diffs ediff-difference-vector-alist alist diff-record ediff-3way-job] 5 (#$ . 24830) "P"])
#@33 Toggle short/long help message.
(defalias 'ediff-toggle-help #[nil "\306\307!\206\f \310\311 \")\210\306\312 \210 ?\313 \210) \203? \314 \203? \f\203?
\314 \205< \315!\205< \316!\317=)\320\321\322!\207" [meta-buf-p this-command buffer-read-only ediff-use-long-help-message ediff-multiframe ediff-control-frame nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" erase-buffer ediff-set-help-message ediff-window-display-p frame-live-p frame-visible-p icon "" ediff-recenter no-rehighlight frame ediff-prefer-iconified-control-frame ediff-window-config-saved] 3 (#$ . 26023) nil])
#@206 Toggle read-only in current buffer.
If buffer is under version control and locked, check it out first.
If optional argument BUF is specified, toggle read-only in that buffer instead
of the current buffer.
(defalias 'ediff-toggle-read-only #[(&optional buf) "\306\307!\206\f \310\311 \")\210\n?\205 p\312 \313>\203 \314\2022 \312 \315>\203* \316\2022 \312 \317>\2052 \320 \n\204; \321 \210\n\204h \314=\203I
\202g \316=\203T 5\202g \320=\203_ 6\202g \322=\205g 7\n\211\205y \323\n!\205y \324\323\n!!)\203xr\nq\210\325\n!\211 8\205\225 \3268!\205\225 \3278! 9:\206\263 \3308!\203\247 \331\202\263 9\203\260 \331\202\263 \332\333! ;\3348!\203 \f\203 $\204\313 \331;\202 \335\336!\210\337\340\341\3428!\"!\203\f\f\211\205\354 \323\n!\205\354 \324\323\n!!)\203\376 r\fq\210\343\344\306 #\210)\202 \345=\204 \310<!\210\202 \331;\335\336!\210\335\336!\210\346\347!\210\350\351!\210;\203D\352\353\354;!\"\203D\212\355 =\356\216\357\360\n!!\210\361;!\210+\202I\310\362\n\"\2108\205t$?\205t \363=\205t\3268!\205t\3278!?\205t\335\336!\210\346\364\3428!\",\202\202 \345=\206\202\310<!*\207" [meta-buf-p this-command buf buf-type ctl-buf ediff-buffer-A nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-last-command-char (97 65) A (98 66) B (99 67) C ediff-recenter Ancestor get-buffer buffer-name buffer-file-name file-exists-p file-writable-p ediff-file-checked-out-p read-only-mode key-binding "" ediff-file-checked-in-p beep 1 y-or-n-p format "File %s is under version control. Check it out? " ediff-abbreviate-file-name ediff-change-saved-variable buffer-read-only ediff-quit message "Boy, this is risky! Don't modify this file..." sit-for 3 string-match "read-only-mode" symbol-name current-window-configuration #[nil "\301!\207" [#1=#:wconfig set-window-configuration] 2] select-window ediff-get-visible-buffer-window command-execute "Don't know how to toggle read-only in buffer %S" ediff-toggle-read-only "Warning: file %s is read-only" ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer file file-writable ediff-toggle-read-only-function toggle-ro-cmd ediff-KILLED-VITAL-BUFFER #1#] 6 (#$ . 26662) nil])
(defalias 'ediff-maybe-checkout #[(buf) "\305\306!!\307\310!\311\n!\205H \312\313!\210\314\315\316\317\n!\"!\205H \211\2050 \320!\2050 \321\320!!)\203? rq\210\322 !)\202H \323=\206H \324\f!*\207" [buf checkout-function file this-command ediff-KILLED-VITAL-BUFFER expand-file-name buffer-file-name key-binding "" ediff-file-checked-in-p beep 1 y-or-n-p format "File %s is under version control. Check it out? " ediff-abbreviate-file-name get-buffer buffer-name command-execute ediff-quit error] 6])
(defalias 'ediff-file-checked-out-p #[(file) "\301\302!?\206 \303!\205 \304\305!\205 \305!\306>\206 \305!;\207" [file featurep vc-hooks vc-backend fboundp vc-state (edited needs-merge)] 2])
(defalias 'ediff-file-checked-in-p #[(file) "\301\302!\205\" \303!\304>\205\" \305\306!\205\" \306!\307>?\205\" \306!;?\207" [file featurep vc-hooks vc-backend (RCS SCCS) fboundp vc-state (edited needs-merge)] 2])
(defalias 'ediff-file-compressed-p #[(file) "\3011 \302\303!0\202 \210\202 \210\304\303!\205 \305\306 \"\207" [file (error) require jka-compr featurep string-match jka-compr-build-file-regexp] 3])
#@44 Rotate the display of buffers A, B, and C.
(defalias 'ediff-swap-buffers #[nil "\306\307!\206\f \310\311 \")\210\312\n!\203x\312 !\203x\f
=\313 \205. \203V \314\n \"\210\314 \f\"\210\314!\"\"\210\202a \314\n\"\"\210\314 \f\"\210 \203t \" \"\202{ \" \" \203\216 #$# $\202\225 $ $ \203\251 %&% &\202\261 & & \203\321 '('()*)*\202\341 ((**\313 \203 \203\372 +,+,\202,, \203\3158@A@E\2022-\203*A@@\3158E\2022A@@D \203H\315.8.@.A@E\202d-\203\\.A@.@\315.8E\202d.A@.@D.\203r\202v..-\203\235/ 0\316\211 12W\205\233\31710\"\2101T\2111\202\205*\210\320\321!\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A ediff-buffer-values-orig-A nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-has-face-support-p set-window-buffer 2 0 ediff-set-state-of-diff-in-all-buffers ediff-recenter no-rehighlight ediff-difference-vector-A ediff-regexp-hide-A ediff-regexp-focus-A ediff-visible-bounds ediff-wide-bounds ediff-current-diff-overlay-A overlay wide-visibility-p focus-regexp hide-regexp diff-vec values buf ediff-3way-comparison-job ediff-buffer-C ediff-window-C ediff-buffer-B ediff-buffer-values-orig-C ediff-buffer-values-orig-B ediff-difference-vector-C ediff-difference-vector-B ediff-regexp-hide-C ediff-regexp-hide-B ediff-regexp-focus-C ediff-regexp-focus-B ediff-current-diff-overlay-C ediff-current-diff-overlay-B ediff-3way-job ediff-narrow-bounds ediff-control-buffer ctl-buf n ediff-number-of-differences] 7 (#$ . 30002) nil])
#@93 Toggle wide/regular display.
This is especially useful when comparing buffers side-by-side.
(defalias 'ediff-toggle-wide-display #[nil "\306\307!\206\f \310\311 \")\210\312 \204 \310\313\314\"\210\315\316!\210\n\f?\211\204b \211 \2056 \317
!\2056 \320\317
!!)\203U r q\210\321\"\210 q\210\306\211\315\316!)\202\223 \322=\206\223 \310!\202\223 \210 \211 \205w \317
!\205w \320\317
!!)\203\211 r q\210\306\315\316!)\202\223 \322=\206\223 \310!)\207" [meta-buf-p this-command ediff-control-buffer ctl-buf ediff-wide-display-p buf nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-window-display-p "%sEmacs is not running as a window application" "" ediff-recenter no-rehighlight get-buffer buffer-name modify-frame-parameters ediff-quit ediff-wide-display-frame ediff-wide-display-orig-parameters ediff-window-B ediff-KILLED-VITAL-BUFFER ediff-make-wide-display-function] 4 (#$ . 31700) nil])
#@148 Switch from multiframe display to single-frame display and back.
To change the default, set the variable `ediff-window-setup-function',
which see.
(defalias 'ediff-toggle-multiframe #[nil "\306\307 \204\f \310\311\312\"\210 \313=\203 \306\314\202r \314=\203N \315 \203' \316 \210 \211 \2058 \317\f!\2058 \320\317\f!!)\203G \321
!\203G \322
\306\"\210\323\313\202r \211 \205_ \317\f!\205_ \320\317\f!!)\203n \321
!\203n \322
\306\"\210\323\313\324\301\"\210\325\326\"\210\315 \205\213 \322\327 \306\"\210\330\331!)\207" [window-setup-func ediff-window-setup-function ediff-multiframe ediff-control-buffer buf ediff-control-window nil ediff-window-display-p error "%sEmacs is not running as a window application" "" ediff-setup-windows-multiframe ediff-setup-windows-plain ediff-in-control-buffer-p ediff-kill-bottom-toolbar get-buffer buffer-name window-live-p set-window-dedicated-p t set-default mapc #[(buf) "\211\205 \306!\205 \307\306!!)\203 rq\210 \310\211)\207\f\311=\206) \312
!\207" [buf window-setup-func ediff-window-setup-function ediff-window-B this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name nil ediff-quit error] 4] selected-window ediff-recenter no-rehighlight ediff-session-registry] 4 (#$ . 32668) nil])
#@163 Enable or disable Ediff toolbar.
Works only in versions of Emacs that support toolbars.
To change the default, set the variable `ediff-use-toolbar-p', which see.
(defalias 'ediff-toggle-use-toolbar #[nil "\302\303!\205( \304 \204 \305\306\307\"\210\300 \203 \310 \210?\311\312 \"\210\313 \205( \314\315!\207" [ediff-use-toolbar-p ediff-session-registry featurep ediff-tbar ediff-window-display-p error "%sEmacs is not running as a window application" #1="" ediff-kill-bottom-toolbar mapc #[(buf) "\211\205 \304!\205 \305\304!!)\203 rq\210\306\211)\207\n\307=\206' \310 !\207" [buf ediff-window-config-saved this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name #1# ediff-quit error] 4] ediff-in-control-buffer-p ediff-recenter no-rehighlight] 3 (#$ . 33933) nil])
(defalias 'ediff-kill-bottom-toolbar #[nil "\300\207" [nil] 1])
(defalias 'ediff-make-bottom-toolbar #[(&optional frame) "\301 \205
\206 \302 \303\207" [frame ediff-window-display-p selected-frame nil] 1])
#@97 Toggle the mode that shows only the merge regions where both variants differ from the ancestor.
(defalias 'ediff-toggle-show-clashes-only #[nil "\304\305!\206\f \306\307 \")\210\n\204 \306\310!\210 ?\211\203! \311\312!\207\311\313!\207" [meta-buf-p this-command ediff-merge-with-ancestor-job ediff-show-clashes-only nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" "This command makes sense only when merging with an ancestor" message "Focus on regions where both buffers differ from the ancestor" "Canceling focus on regions where changes clash"] 4 (#$ . 34934) nil])
#@76 Toggle the mode that skips the merge regions that differ from the default.
(defalias 'ediff-toggle-skip-changed-regions #[nil "\303\304!\206\f \305\306 \")\210\n?\211\203 \307\310!\207\307\311!\207" [meta-buf-p this-command ediff-skip-merge-regions-that-differ-from-default nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" message "Skipping regions that differ from default setting" "Showing regions that differ from default setting"] 4 (#$ . 35554) nil])
#@78 Toggle narrowing in buffers A, B, and C.
Used in ediff-windows/regions only.
(defalias 'ediff-toggle-narrow-region #[nil " =\203\n \306\n!\210 \f=\203
\202 \f\307\310!\207" [ediff-buffer-A ediff-buffer-B ediff-NO-DIFFERENCES ediff-visible-bounds ediff-wide-bounds ediff-narrow-bounds error ediff-recenter no-rehighlight] 2 (#$ . 36061) nil])
(defalias 'ediff-visible-region #[nil " =\206 \n=\206 \n =?\205* \204 \f
@
A@\306
8 \211 \205; \307!\205; \310\307!!)\203p rq\210\311!\203l \312!\205Y \313!) \312!\205i \314!)}\210)\202| \315=\204| \316!\210 \211 \205\220 \307!\205\220 \310\307!!)\203\305 r q\210\311!\203\301 \312!\205\256 \313!) \312!\205\276 \314!)}\210)\202\321 \315=\204\321 \316!\210\205)\311!\205)\n\211 \205\361 \307!\205\361 \310\307!!)\203 r\nq\210 \312!\205\313!) \312!\205\314!)})\202)\315=\206)\316!+\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-narrow-job ediff-wide-bounds ediff-visible-bounds 2 get-buffer buffer-name ediff-overlay-buffer ediff-overlayp overlay-start overlay-end ediff-quit error overl-C overl-B overl-A buf overl this-command ediff-KILLED-VITAL-BUFFER ediff-3way-job] 5])
(defalias 'ediff-operate-on-windows #[(operation arg) "\306!\203\f \306 !\204 \307\310!\210\n\211\205! \311 !\205! \312\311 !!)\203C \f\211\2056 \311 !\2056 \312\311 !!)\203C
\203H \204H \313!\210\314 \315\316 \" \315\317 \"
\211 \205p \315\320 \" !\321!\210\3221\211 \323 \"_!!0\202\215 \210\202\216 \210\321!\210\3241\245 \323 \"_!!0\202\251 \210\202\252 \210 \203\313 \321 !\210\3251\306 \323!\"_!!0\202\312 \210\202\313 \210\321!.\207" [ediff-window-A ediff-window-B ediff-buffer-A buf ediff-buffer-B ediff-3way-job window-live-p ediff-recenter no-rehighlight get-buffer buffer-name error selected-window ediff-get-region-size-coefficient A B C select-window (error) round (error) (error) ediff-buffer-C ediff-KILLED-VITAL-BUFFER wind wind-A wind-B ediff-window-C wind-C operation coefA coefB three-way coefC arg] 5])
#@169 Vertically scroll buffers A, B (and C if appropriate).
With optional argument ARG, scroll ARG lines; otherwise scroll by nearly
the one half of the height of window-A.
(defalias 'ediff-scroll-vertically #[(&optional arg) "\306\307!\206\f \310\311 \")\210\312\n!\203 \312 !\204 \313\314!\210\f\211 \205/ \315
!\205/ \316\315
!!)\203d \211 \205E \315
!\205E \316\315
!!)\203d \203i \211 \205` \315
!\205` \316\315
!!)\204i \310 !\210\317\320 \321>\203u \322\202v \323 \203\211 \324\232\204\211 \325 !\202\271 \306 \324\326\n!\326 !^\203\240 \326 !\202\241 \327^\330\245\331!# \203\266 \330\245\202\270 )\"\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A buf nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-recenter no-rehighlight get-buffer buffer-name ediff-operate-on-windows ediff-last-command-char (118 22) scroll-up scroll-down - prefix-numeric-value window-height 500 2 1 ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-KILLED-VITAL-BUFFER arg default-amount ediff-window-C next-screen-context-lines] 7 (#$ . 38174) "P"])
#@166 Horizontally scroll buffers A, B (and C if appropriate).
If an argument is given, that is how many columns are scrolled, else nearly
the width of the A/B/C windows.
(defalias 'ediff-scroll-horizontally #[(&optional arg) "\306\307!\206\f \310\311 \")\210\312\n!\203 \312 !\204 \313\314!\210\f\211 \205/ \315
!\205/ \316\315
!!)\203d \211 \205E \315
!\205E \316\315
!!)\203d \203i \211 \205` \315
!\205` \316\315
!!)\204i \310 !\210\317\320 \321U\203u \322\202v \323 \203\211 \324\232\204\211 \325 !\202\270 \205\270 \326\n!\326 !^ \203\241 \326!!\202\242 \327^\330\245\331Z \" \203\265 \"\330\245\202\267 \")\"\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A buf nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-recenter no-rehighlight get-buffer buffer-name ediff-operate-on-windows ediff-last-command-char 60 #[(arg) "\302\303!)\207" [arg prefix-arg call-interactively scroll-left] 2] #[(arg) "\302\303!)\207" [arg prefix-arg call-interactively scroll-right] 2] - prefix-numeric-value window-width 500 2 3 ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-KILLED-VITAL-BUFFER arg ediff-control-window ediff-3way-comparison-job ediff-window-C default-amount] 6 (#$ . 39326) "P"])
(defalias 'ediff-position-region #[(beg end pos _job-name) "dV\203 d \203' \306!?\205c \212\307\310 \311Z!\210\311\312`\"\\\313\n!*\207\314\315 \"\210\306!\203` \316\211 \307
!\210`V\203O \f`W\203O `
T\2027 b\210\317\310 S
Z\320]T\311\245!\210*b\207" [end ediff-windows-job amount beg prev-point lines pos-visible-in-window-p move-to-window-line window-height 2 count-lines scroll-up set-window-start selected-window 0 recenter 1 pos] 4])
(defalias 'ediff-get-lines-to-region-end #[(buf-type &optional n ctl-buf) "\204 \n\204\f \n\211 \205 \306\f!\205 \307\306\f!!)\203\262 r\nq\210
\310=\2030 \202N
\311=\203; \202N
\312=\203F \202N
\313=\205N \314
\315
\"A*! \316 ! \317
\320\" \321 \f\211 \205\200 \306\f!\205\200 \307\306\f!!)\203\244 r\fq\210 W\203\233 \322 \" \202\236 \323 )\202\257 \324=\206\257 \325 !.\207 \324=\206\275 \325 !\207" [n ediff-current-difference ctl-buf ediff-control-buffer buf buf-type get-buffer buffer-name A B C Ancestor eval assoc window-start ediff-get-diff-posn end nil count-lines 0 ediff-quit error ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-window-alist alist wind beg lines this-command ediff-KILLED-VITAL-BUFFER] 5])
(defalias 'ediff-get-lines-to-region-start #[(buf-type &optional diff-num ctl-buf) "\204 \n\204\f \n\211 \205 \306\f!\205 \307\306\f!!)\203\265 r\nq\210
\310=\2030 \202N
\311=\203; \202N
\312=\203F \202N
\313=\205N \314
\315
\"A*! \316 !\206l \316 \317\" \320
\321# \f\211 \205\206 \306\f!\205\206 \307\306\f!!)\203\250 r\fq\210 W\203\243 \322e] d^\"\202\244 \323)\202\263 \324=\206\263 \325 !-\207 \324=\206\300 \325 !\207" [diff-num ediff-current-difference ctl-buf ediff-control-buffer buf buf-type get-buffer buffer-name A B C Ancestor eval assoc window-end t ediff-get-diff-posn beg count-lines 0 ediff-quit error ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-window-alist alist wind end this-command ediff-KILLED-VITAL-BUFFER] 5])
(defalias 'ediff-get-region-size-coefficient #[(buf-type op &optional n ctl-buf) "\206 \211\205 \306\n!\205 \307\306\n!!)\203\235 r\206 q\210 \211\204) \f \310Y\2052
W)\203\232 \311=\203A \312\202M \313=\203L \314\202M \315\211 \316 #\317 #]\211\205m \306\n!\205m \307\306\n!!)\203z \320 #\202{ \310]\211 \310V\203\225 #\321\\\322\\\245\202\226 \323*\202\233 \323)\207\324=\206\250 \325 !\207" [ctl-buf ediff-control-buffer buf n ediff-current-difference ediff-number-of-differences get-buffer buffer-name 0 scroll-down ediff-get-lines-to-region-start scroll-up ediff-get-lines-to-region-end #[(_a _b _c) "\300\207" [0] 1] A B C 0.0 0.0 1 ediff-quit error op func ediff-buffer-C max-lines buf-type this-command ediff-KILLED-VITAL-BUFFER] 6])
#@91 Advance to the next difference.
With a prefix argument, go forward that many differences.
(defalias 'ediff-next-difference #[(&optional arg) "\306\307!\206\f \310\311 \")\210\n W\203\364 \n\f\206 \312\\^\306\211\211 \313 \210 Y\204P ! !\211\204P \314 ! \315 !\211 \204P \316 !\210 W\203\352
\204\254 \204\254 \204\254 \"\203\352 \317 !\203\352 \320# $ %\321%$\"A*J H\322H\323=\204\254 &\324>\203\352 \320# $ %\321%$\"A*J H\322H\325=\203\352 T \326 \327\"\330U\203\301 \331\332 \"\210 Y\204P ! !\211\204P \314 ! \315 !\211 \204P \316 !\210\202P \331\333!\210\334 !,\207\313 \210\310\335!\207" [meta-buf-p this-command ediff-current-difference ediff-number-of-differences arg regexp-skip nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" 1 ediff-visible-region ediff-merge-region-is-non-clash-to-skip ediff-skip-merge-region-if-changed-from-default-p ediff-install-fine-diff-if-necessary ediff-merge-region-is-non-clash A assoc 2 t (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) C mod 20 0 message "Skipped over region %d and counting ..." "" ediff-unselect-and-select-difference "At end of the difference list" skip-changed non-clash-skip n ediff-skip-diff-region-function ediff-ignore-similar-regions ediff-difference-vector-alist alist buf-type ediff-job-name] 4 (#$ . 43464) "p"])
#@87 Go to the previous difference.
With a prefix argument, go back that many differences.
(defalias 'ediff-previous-difference #[(&optional arg) "\306\307!\206\f \310\311 \")\210\n\312V\203\361 \312\n \206 \313Z]\306\211\211 \314 \210 \315W\204N ! !\211\204N \316 ! \317 !\211\204N \320 !\210 \312V\203\347 \f\204\251 \204\251
\204\251 \"\203\347 \321 !\203\347 \322# $ %\323%$\"A*J H\324H\325=\204\251 &\326>\203\347 \322# $ %\323%$\"A*J H\324H\327=\203\347 \330 T\331\"\315U\203\273 \332\333 T\"\210 S\211 \315W\204N ! !\211\204N \316 ! \317 !\211\204N \320 !\210\202N \332\334!\210\335 !,\207\314 \210\310\336!\207" [meta-buf-p this-command ediff-current-difference arg regexp-skip skip-changed nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" -1 1 ediff-visible-region 0 ediff-merge-region-is-non-clash-to-skip ediff-skip-merge-region-if-changed-from-default-p ediff-install-fine-diff-if-necessary ediff-merge-region-is-non-clash A assoc 2 t (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) C mod 20 message "Skipped over region %d and counting ..." "" ediff-unselect-and-select-difference "At beginning of the difference list" non-clash-skip n ediff-skip-diff-region-function ediff-ignore-similar-regions ediff-difference-vector-alist alist buf-type ediff-job-name] 5 (#$ . 44964) "p"])
#@113 Go to the difference specified as a prefix argument.
If the prefix is negative, count differences from the end.
(defalias 'ediff-jump-to-difference #[(difference-number) "\305\306!\206\f \307\310 \")\210\n\311W\203 \n\\\202& \n\311V\203% \nS\202& \312\211\312Y\2037 \n X\2037 \313\n!\207\307\f \nT $\207" [meta-buf-p this-command difference-number ediff-number-of-differences ediff-BAD-DIFF-NUMBER nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" 0 -1 ediff-unselect-and-select-difference] 6 (#$ . 46460) "p"])
#@332 Go to difference closest to the point in buffer A, B, or C.
The buffer depends on last command character (a, b, or c) that invoked this
command. For instance, if the command was `ga' then the point value in buffer
A is used.
With a prefix argument, synchronize all files around the current point position
in the specified buffer.
(defalias 'ediff-jump-to-difference-at-point #[(arg) "\306\307!\206\f \310\311 \")\210\312 \313>\203 \314\202, \312 \315>\203$ \316\202, \312 \317>\205, \320\211\314=\2037 \202S \n\316=\203A \f\202S \n\320=\203K
\202S \n\321=\205S #\211 $\211 %\205i \322%!\205i \323\322%!!)\203w r$q\210`)\202\201 \324=\206\201 \310&! '\325\n\306(\205\214 \326# )*)W\211 +\203\312 $\211 %\205\257 \322%!\205\257 \323\322%!!)\203\275 r$q\210d)\202\321 \324=\206\321 \310&!\202\321 \327\n\330)S# \306\211 , -\306\211 . /\306 0+\203\356 \331\332!\210\202\363 \331)!\210\333 ,1-2.3/(\205\266$\211 %\205 \322%!\205 \323\322%!!)\2031r$q\210'Z0)\202< \324=\204<\310&!\210\334-!\210+\203Idb\210\3351Y0\206S\336[u0\202]\210\202^\210\337 \210\334.!\210+\203ndb\210\3401~0\206x\336[u0\202\202\210\202\203\210\337 \210\341/!\203\262\334/!\210+\203\232db\210\3421\2520\206\244\336[u0\202\256\210\202\257\210\337 \210\334,!. \207" [meta-buf-p this-command buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-last-command-char (97 65) A (98 66) B (99 67) C Ancestor get-buffer buffer-name ediff-quit ediff-diff-at-point after ediff-get-diff-posn beg ediff-jump-to-difference -1 selected-window select-window (error) 1 recenter (error) window-live-p (error) ediff-ancestor-buffer buffer buf ediff-KILLED-VITAL-BUFFER pt arg diff-no ediff-number-of-differences past-last-diff ctl-wind wind-A wind-B wind-C shift ediff-window-A ediff-window-B ediff-window-C] 5 (#$ . 47024) "P"])
(defalias 'ediff-diff-at-point #[(buf-type &optional pos which-diff) "\306=\203\n \202% \307=\203 \n\202% \310=\203 \202% \311=\205% \f
S\312\313\211\211\211 \211 \211 \205R \314 !\205R \315\314 !!)\203\370 r q\210 \206a ` W\204s V\203\237 W\203\237 T\316\317 $\316\320 $\202c !\321>\203\273 V\203\273 U\203\273 T!\322=\203\310 T\202\364 !\323=\203\324 \202\364 \324\325 e]\"!\324\325 e]\"!W\203\361 \202\364 T)\202\"\326=\206\327#!.\207" [buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-control-buffer A B C Ancestor -1 0 get-buffer buffer-name ediff-get-diff-posn beg end (after before) after before abs count-lines ediff-quit error ediff-number-of-differences prev-end prev-beg diff-no max-dif-num ctl-buffer buffer buf pos which-diff this-command ediff-KILLED-VITAL-BUFFER] 9])
#@640 Copy buffer-X'th difference region to buffer Y (X,Y are A, B, or C).
If numerical prefix argument, copy the difference specified in the arg.
Otherwise, copy the difference given by `ediff-current-difference'.
This command assumes it is bound to a 2-character key sequence, `ab', `ba',
`ac', etc., which is used to determine the types of buffers to be used for
copying difference regions. The first character in the sequence specifies
the source buffer and the second specifies the target.
If the second optional argument, a 2-character string, is given, use it to
determine the source and the target buffers instead of the command keys.
(defalias 'ediff-diff-to-diff #[(arg &optional keys) "\306\307!\206\f \310\311 \")\210\n\204 \312 \313=\203 \314 \247\203& \315 !\210\n\316H \n\317H \320\f! \320
! \306 \321 \322>\203I \323\202\\ \324>\203T \325\202\\ \326>\205\\ \327\322>\203g \323\202z \324>\203r \325\202z \326>\205z \327#\210\330 -\207" [meta-buf-p this-command keys arg key1 key2 nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" this-command-keys - -1 ediff-jump-to-difference 0 1 ediff-event-key ediff-copy-diff (97 65) A (98 66) B (99 67) C ediff-recenter char1 char2 ediff-verbose-p ediff-current-difference] 5 (#$ . 49899) "P"])
#@121 Copy ARGth difference region from buffer A to B.
ARG is a prefix argument. If nil, copy the current difference region.
(defalias 'ediff-copy-A-to-B #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ab"] 3 (#$ . 51214) "P"])
#@121 Copy ARGth difference region from buffer B to A.
ARG is a prefix argument. If nil, copy the current difference region.
(defalias 'ediff-copy-B-to-A #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ba"] 3 (#$ . 51447) "P"])
#@128 Copy ARGth difference region from buffer A to buffer C.
ARG is a prefix argument. If nil, copy the current difference region.
(defalias 'ediff-copy-A-to-C #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ac"] 3 (#$ . 51680) "P"])
#@128 Copy ARGth difference region from buffer B to buffer C.
ARG is a prefix argument. If nil, copy the current difference region.
(defalias 'ediff-copy-B-to-C #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "bc"] 3 (#$ . 51920) "P"])
#@121 Copy ARGth difference region from buffer C to B.
ARG is a prefix argument. If nil, copy the current difference region.
(defalias 'ediff-copy-C-to-B #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "cb"] 3 (#$ . 52160) "P"])
#@121 Copy ARGth difference region from buffer C to A.
ARG is a prefix argument. If nil, copy the current difference region.
(defalias 'ediff-copy-C-to-A #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ca"] 3 (#$ . 52393) "P"])
(defalias 'ediff-copy-diff #[(n from-buf-type to-buf-type &optional batch-invocation reg-to-copy) "\306=\203\n \202% \307=\203 \n\202% \310=\203 \202% \311=\205% \f ' (\312 )* +\313\211 , -\313\211 . /\313 0\314\3151($/\314\3161($02\203_ \3133\202i \31713(#2\3171(/0%\211.2\230\203\203 \313)\202
4\204\220 \3201\"\203
\3211\357
\211 5\205\250 \3225!\205\250 \323\3225!!)\203\320 r
q\2106? 70b\2102c\2100/V\203\314 \324/0\"\210*\202\334 8\325=\204\334 \3269!\2104\206\353 \3271.#\211,0\202\f :\330\331:@\332\333:A\334##\210\335\336!\210\337\340!\210\313\211))\210)\203 +\203 \3411(\"\2104\203\3671\211 1\306 ; 1;< = ;\342;=\"A*J1H\211 >\205N\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*\2101\307 ; 1;< = ;\342;=\"A*J1H\211 >\205\221\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*\210*\205\3631\310 ; 1;< = ;\342;=\"A*J1H\211 >\205\331\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*)\202\267)\203\323+\203\3231\211 1\306 ; 1;< = ;\342;=\"A*J1H\211 >\205,\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*\2101\307 ; 1;< = ;\342;=\"A*J1H\211 >\205o\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*\210*\205\3211\310 ; 1;< = ;\342;=\"A*J1H\211 >\205\267\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*)\210\345 \210)\203\262+\204\2621\211 1\306 ; 1;< = ;\342;=\"A*J1H\211 >\205 \343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*\2101\307 ; 1;< = ;\342;=\"A*J1H\211 >\205N\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*\210*\205\2601\310 ; 1;< = ;\342;=\"A*J1H\211 >\205\226\343\344>\336H\")\210;< = ;\342;=\"A*J1H\336\313I*)\210\330\346,\". \207" [to-buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer to-buf A B C Ancestor t nil ediff-get-diff-posn beg end ediff-get-region-contents ediff-test-save-region (error) get-buffer buffer-name kill-region ediff-quit error ediff-save-diff-region message "ediff-copy-diff: %s %s" mapconcat prin1-to-string " " beep 1 sit-for 2 ediff-set-state-of-diff-in-all-buffers assoc mapc ediff-delete-overlay ediff-refresh-mode-lines "%s" ediff-control-buffer ctrl-buf saved-p ediff-3way-job three-way messg ediff-verbose-p reg-to-delete reg-to-delete-beg reg-to-delete-end n reg-to-copy from-buf-type batch-invocation buf buffer-read-only inhibit-read-only this-command ediff-KILLED-VITAL-BUFFER conds buf-type ediff-difference-vector-alist alist diff-record] 8])
(defalias 'ediff-save-diff-region #[(n buf-type reg) "\306 \" \307=\203 \f\202, \310=\203
\202, \311=\203$ \202, \312=\205, \306\nA\"\211 \203C \241\210\202] \n\203S \nBC\244\210\202] BD B\313\314T \203k \315\202o \316 !\227$+\207" [n ediff-killed-diffs-alist n-th-diff-saved buf-type ediff-buffer-A ediff-buffer-B assoc A B C Ancestor message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" "" symbol-name ediff-buffer-C ediff-ancestor-buffer buf this-buf-n-th-diff-saved reg ediff-merge-job] 7])
(defalias 'ediff-test-save-region #[(n buf-type) "\306 \" \307=\203 \f\202, \310=\203
\202, \311=\203$ \202, \312=\205, \306\nA\"\211 \203O \313\314\315T #!\203I \316\202P \317\320!\202P \316+\207" [n ediff-killed-diffs-alist n-th-diff-saved buf-type ediff-buffer-A ediff-buffer-B assoc A B C Ancestor yes-or-no-p format-message "You've previously copied diff region %d to buffer %S. Confirm? " t error "Quit" ediff-buffer-C ediff-ancestor-buffer buf this-buf-n-th-diff-saved] 6])
#@55 Pop last killed Nth diff region from buffer BUF-TYPE.
(defalias 'ediff-pop-diff #[(n buf-type) "\306 \" \307=\203 \f\202, \310=\203
\202, \311=\203$ %\202, \312=\205, & '\306'\nA\" () *+ ,\313\211 - .\313\211 / 0\313 1(A\203[ (A.\202q 2\314V\203l \315\316T #\210\202q \3153!\210\317 \320+$/\317 \321+$0\3221\330 '\211 '\205\234 \323'!\205\234 \324\323'!!)\203\311 r'q\2104? 50b\210.c\2100/V\203\301 \325/0\"\210\326\2111*\202\324 6\327=\206\324 \3157!0\202\354 8\330\3318@\332\3338A\334##\210\335\336!)\2101\203\242\211\307 9 :\306 :\"A*JH\211 ;\205\337\340;\336H\")\210 9 :\306 :\"A*JH\336\313I*\210\310 9 :\306 :\"A*JH\211 ;\205M\337\340;\336H\")\210 9 :\306 :\"A*JH\336\313I*\210)\205\240\311 9 :\306 :\"A*JH\211 ;\205\212\337\340;\336H\")\210 9 :\306 :\"A*JH\336\313I*)\210*\203\2621\203\262\341,\"\210\342 \2101\205\306\343(\n\"\330\344T #.\n\207" [n ediff-killed-diffs-alist n-th-record buf-type ediff-buffer-A ediff-buffer-B assoc A B C Ancestor nil 0 error "Nothing saved for diff %d in buffer %S" ediff-get-diff-posn beg end (error) get-buffer buffer-name kill-region t ediff-quit message "ediff-pop-diff: %s %s" mapconcat prin1-to-string " " beep 1 mapc ediff-delete-overlay ediff-set-state-of-diff-in-all-buffers ediff-refresh-mode-lines delq "Diff region %d in buffer %S restored" ediff-buffer-C ediff-ancestor-buffer buf saved-rec ediff-3way-job three-way ediff-control-buffer ctl-buf ediff-verbose-p saved-diff reg-beg reg-end recovered ediff-number-of-differences ediff-NO-DIFFERENCES buffer-read-only inhibit-read-only this-command ediff-KILLED-VITAL-BUFFER conds ediff-difference-vector-alist alist diff-record] 8 (#$ . 56210)])
#@258 Restore ARGth diff from `ediff-killed-diffs-alist'.
ARG is a prefix argument. If ARG is nil, restore the current-difference.
If the second optional argument, a character, is given, use it to
determine the target buffer instead of (ediff-last-command-char)
(defalias 'ediff-restore-diff #[(arg &optional key) "\306\307!\206\f \310\311 \")\210\n\247\203 \312\n!\210\313 \f\206 \314 \315>\203( \316\202C \f\206. \314 \317>\2037 \320\202C \f\206= \314 \321>\205C \322\"\210\306 \323 )\207" [meta-buf-p this-command arg ediff-current-difference key ediff-verbose-p nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-jump-to-difference ediff-pop-diff ediff-last-command-char (97 65) A (98 66) B (99 67) C ediff-recenter] 4 (#$ . 57961) "P"])
#@102 Restore ARGth diff in the merge buffer.
ARG is a prefix argument. If nil, restore the current diff.
(defalias 'ediff-restore-diff-in-merge-buffer #[(arg) "\301\302\"\207" [arg ediff-restore-diff 99] 3 (#$ . 58754) "P"])
#@112 Toggle between focusing and hiding of difference regions that match
a regular expression typed in by the user.
(defalias 'ediff-toggle-regexp-match #[nil "\306\307!\206\f \310\311 \")\210\312\211\211\306\211\211 \" #$%=\203+ \313 \314=\204: $&=\203E \313 \315=\203E \316\317!\210\320\211$\202:\313 \315=\203\301 &$\321\322\323'\"!#\321\322\324(\"!\")\203o \321\322\325*\"!+\326=\203 \327\330\331\202\205 \330\327\326\332\322\333\f\"!\203\226 \316\334\f\"\210\202\236 \n+\316\334 \"\210#\312\230\204\251 #'\"\312\230\204\264 \"(
\312\230\206:
\211*\202:\313 \314=\205:%$\321\322\335,\"!#\321\322\336-\"!\")\203\353 \321\322\337.\"!/\326=\203\373 \327\330\331\202\330\327\326\332\322\340\f\"!\203\316\341\f\"\210\202\n/\316\341 \"\210#\312\230\204%#,\"\312\230\2040\"-
\312\230\206:
\211..\207" [meta-buf-p this-command alt-connective alt-msg-connective msg-connective regexp-C nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" "" ediff-last-command-char 102 104 message "Selective browsing by regexp turned off" ediff-show-all-diffs read-string format "Ignore A-regions matching this regexp (default %s): " "Ignore B-regions matching this regexp (default %s): " "Ignore C-regions matching this regexp (default %s): " and "BOTH" "ONE OF" or y-or-n-p "Ignore regions that match %s regexps, OK? " "Will ignore regions that match %s regexps" "Focus on A-regions matching this regexp (default %s): " "Focus on B-regions matching this regexp (default %s): " "Focus on C-regions matching this regexp (default %s): " "Focus on regions that match %s regexps, OK? " "Will focus on regions that match %s regexps" regexp-B regexp-A ediff-skip-diff-region-function ediff-focus-on-regexp-matches-function ediff-hide-regexp-matches-function ediff-regexp-hide-A ediff-regexp-hide-B ediff-3way-comparison-job ediff-regexp-hide-C ediff-hide-regexp-connective ediff-regexp-focus-A ediff-regexp-focus-B ediff-regexp-focus-C ediff-focus-regexp-connective] 6 (#$ . 58983) nil])
(defalias 'ediff-toggle-skip-similar #[nil "\304\305!\206\f \306\307 \")\210\n\310=\204 \306\311!\210 ?\211\203# \312\313!\207\312\314!\207" [meta-buf-p this-command ediff-auto-refine ediff-ignore-similar-regions nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" on "Can't skip over whitespace regions: first turn auto-refining on" message "Skipping regions that differ only in white space & line breaks" "Skipping over white-space differences turned off"] 4 nil nil])
#@454 Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
Regions to be ignored according to this function are those where
buf A region doesn't match `ediff-regexp-focus-A' and buf B region
doesn't match `ediff-regexp-focus-B'.
This function returns nil if the region number N (specified as
an argument) is not to be ignored and t if region N is to be ignored.
N is a region number used by Ediff internally. It is 1 less
the number seen by the user.
(defalias 'ediff-focus-on-regexp-matches #[(n) "\211\204 \306Y\205 \nW)\205
\211 \2057 \307!\2057 \310\307!!)\203\\ rq\210\214\311\312\313\f$\311\312\314\f$}\210eb\210\315\316\317#*\202g \320=\206g \321 ! \211 \205~ \307!\205~ \310\307!!)\203\243 r q\210\214\311\322\313\f$\311\322\314\f$}\210eb\210\315\316\317#*\202\256 \320=\206\256 \321 ! !\205\372 \"\211 \205\312 \307!\205\312 \310\307!!)\203\357 r\"q\210\214\311\323\313\f$\311\323\314\f$}\210eb\210\315\316\317#*\202\372 \320=\206\372 \321 ! #\324!\203$ #F\202$ E!.?\207" [n ediff-current-difference ediff-number-of-differences ediff-control-buffer ctl-buf ediff-regexp-focus-A 0 get-buffer buffer-name ediff-get-diff-posn A beg end re-search-forward nil t ediff-quit error B C eval regex-A ediff-regexp-focus-B regex-B ediff-regexp-focus-C regex-C ediff-buffer-A buf this-command ediff-KILLED-VITAL-BUFFER reg-A-match ediff-buffer-B reg-B-match ediff-3way-comparison-job ediff-buffer-C reg-C-match ediff-focus-regexp-connective] 7 (#$ . 61572)])
#@410 Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
Regions to be ignored are those where buf A region matches
`ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
This function returns nil if the region number N (specified as
an argument) is not to be ignored and t if region N is to be ignored.
N is a region number used by Ediff internally. It is 1 less
the number seen by the user.
(defalias 'ediff-hide-regexp-matches #[(n) "\211\204 \306Y\205 \nW)\205
\211 \2057 \307!\2057 \310\307!!)\203\\ rq\210\214\311\312\313\f$\311\312\314\f$}\210eb\210\315\316\317#*\202g \320=\206g \321 ! \211 \205~ \307!\205~ \310\307!!)\203\243 r q\210\214\311\322\313\f$\311\322\314\f$}\210eb\210\315\316\317#*\202\256 \320=\206\256 \321 ! !\205\372 \"\211 \205\312 \307!\205\312 \310\307!!)\203\357 r\"q\210\214\311\323\313\f$\311\323\314\f$}\210eb\210\315\316\317#*\202\372 \320=\206\372 \321 ! #\324!\203$ #F\202$ E!.\207" [n ediff-current-difference ediff-number-of-differences ediff-control-buffer ctl-buf ediff-regexp-hide-A 0 get-buffer buffer-name ediff-get-diff-posn A beg end re-search-forward nil t ediff-quit error B C eval regex-A ediff-regexp-hide-B regex-B ediff-regexp-hide-C regex-C ediff-buffer-A buf this-command ediff-KILLED-VITAL-BUFFER reg-A-match ediff-buffer-B reg-B-match ediff-3way-comparison-job ediff-buffer-C reg-C-match ediff-hide-regexp-connective] 7 (#$ . 63122)])
#@495 Finish an Ediff session and exit Ediff.
Unselects the selected difference, if any, restores the read-only and modified
flags of the compared file buffers, kills Ediff buffers for this session
(but not buffers A, B, C).
If `ediff-keep-variants' is nil, the user will be asked whether the buffers
containing the variants should be removed (if they haven't been modified).
If it is t, they will be preserved unconditionally. A prefix argument,
temporarily reverses the meaning of this variable.
(defalias 'ediff-quit #[(reverse-default-keep-variants) "\306\307!\206\f \310\311 \")\210p\312 \313 \314\315\316
\211 \205, \317!\205, \320\317!!)\2034 \321\2025 \322\"!\203H \323\322!\210\fq\210\324!\202S \325 !\210\326 !\210\323\322!+\207" [meta-buf-p this-command minibuffer-auto-raise ctl-frm ctl-buf ediff-meta-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" selected-frame t y-or-n-p format "Quit this Ediff session%s? " get-buffer buffer-name " & show containing session group" "" message ediff-really-quit select-frame raise-frame buf reverse-default-keep-variants] 7 (#$ . 64619) "P"])
(defalias 'ediff-really-quit #[(reverse-default-keep-variants) "\306 \210\307\310\311\"\210\307\312\311\"\210\307\313\311\"\210\307\314\311\"\210\315 \210\203# \202% \316 \210\317\320 \"\210\317\321 \"\210\f
56\322 \205b 7\323=\205b \3248!\203R \3258!\202b \3249!\203` \3259!\202b \326 : ; 4 < =\3271\260 >\211 ?\205\205 \330?!\205\205 \331\330?!!)\203\241 r>q\210\332=@\"@\333\334!\210\333\335!)\202\254 A\336=\206\254 \337B!0\202\264 \210\202\265 \210\3401\371 C\211 ?\205\316 \330?!\205\316 \331\330?!!)\203\352 rCq\210\332=@\"@\333\334!\210\333\335!)\202\365 A\336=\206\365 \337B!0\202\375 \210\202\376 \210\3411BD\211 ?\205\330?!\205\331\330?!!)\2033rDq\210\332=@\"@\333\334!\210\333\335!)\202>A\336=\206>\337B!0\202F\210\202G\210\3421\213E\211 ?\205`\330?!\205`\331\330?!!)\203|rEq\210\332=@\"@\333\334!\210\333\335!)\202\207A\336=\206\207\337B!0\202\217\210\202\220\210\332\fF\"F\343 \210\344 \210\3451\257G\346>\205\253\347\350!0\202\263\210\202\264\210\347\351!\210\352\353H\203\305I?\202\307I\"\210\347\354!\210\355<\356;#\210\357 \206\334::\322 \203\366\360:!\203\3667\203\366\361:\362\363#\210\347\364!-\207" [ediff-quit-widened ediff-wide-bounds ediff-visible-bounds ediff-narrow-bounds ediff-control-buffer ediff-meta-buffer ediff-unhighlight-diffs-totally ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-difference-vector-Ancestor ediff-delete-temp-files ediff-visible-region mapc #[(overl) "\301!\205 \302!\207" [overl ediff-overlayp ediff-delete-overlay] 2] #[(overl) "\301!\205 \302!\207" [overl ediff-overlayp ediff-delete-overlay] 2] ediff-window-display-p t window-live-p window-frame next-frame (error) get-buffer buffer-name delq kill-local-variable mode-line-buffer-identification mode-line-format ediff-quit error (error) (error) (error) ediff-update-registry ediff-restore-protected-variables (quit) (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) run-hooks ediff-quit-merge-hook ediff-cleanup-hook ediff-janitor ask ediff-quit-hook ediff-update-meta-buffer nil ediff-good-frame-under-mouse frame-live-p set-mouse-position 2 1 after-quit-hook-internal ediff-after-quit-hook-internal ediff-meta-session-number ediff-grab-mouse ediff-window-A ediff-window-B warp-frame session-number meta-buffer control-buffer ediff-buffer-A buf ediff-this-buffer-ediff-sessions this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-session-registry ediff-job-name reverse-default-keep-variants ediff-keep-variants] 7])
(defalias 'ediff-good-frame-under-mouse #[nil "\304 @\305\306\211\307 !\211\203 \310\311\312 !!!\313\314\n\"?\205% ,\207" [obj-ok frame buf-name frame-or-win mouse-position "" nil frame-live-p buffer-name window-buffer frame-selected-window string-match "Minibuf"] 5])
(defalias 'ediff-delete-temp-files #[nil ";\203 \303!\203 \304!\210 ;\203 \303 !\203 \304 !\210\n;\205, \303\n!\205, \304\n!\207" [ediff-temp-file-A ediff-temp-file-B ediff-temp-file-C file-exists-p delete-file] 2])
(defalias 'ediff-cleanup-mess #[nil "\n\f \306 ! !\307\"!\203& \310\"!\2021 \307#!\2051 \310#! $%\211 &\211 &\205K \311&!\205K \312\311&!!)\205U \313\311&!!)\210'\211 &\211 &\205o \311&!\205o \312\311&!!)\205y \313\311&!!)\210(\211 &\211 &\205\223 \311&!\205\223 \312\311&!!)\205\235 \313\311&!!)\210)\211 &\211 &\205\267 \311&!\205\267 \312\311&!!)\205\301 \313\311&!!)\210*\211 &\211 &\205\333 \311&!\205\333 \312\311&!!)\205\345 \313\311&!!)\210+\211 &\211 &\205\377 \311&!\205\377 \312\311&!!)\205 \313\311&!!)\210,\211 &\211 &\205#\311&!\205#\312\311&!!)\205-\313\311&!!)\210\314\315!\203Y
\211 &\211 &\205M\311&!\205M\312\311&!!)\205W\313\311&!!)\210\316 \203m\317 !\203m\320 !\210\202y\307 !\203y\321 !\210\316 \203\203-\204\206\322 \210 \211 &\211 &\205\236\311&!\205\236\312\311&!!)\205\250\313\311&!!)\210\317$!\203\266\323$!\210\3241\307\306 !\206\303\325 !0\202\313\210\202\314\210\3261\377\306 !\206\373\306 !\203\370 \211 &\205\360\311&!\205\360\312\311&!!)\203\370. \210\325 !0\202\210\202\210!\203G\3271B\306
!\206>\306 !\204 \306 !\203;
\211 &\2053\311&!\2053\312\311&!!)\203;. \210\325
!0\202F\210\202G\210\330 \210\331\332!.\207" [ediff-buffer-A buff-A ediff-buffer-B buff-B ediff-buffer-C buff-C ediff-get-visible-buffer-window window-live-p window-frame get-buffer buffer-name kill-buffer boundp ediff-patch-diagnostics ediff-window-display-p frame-live-p delete-frame delete-window ediff-kill-bottom-toolbar select-frame (error) switch-to-buffer (error) (error) balance-windows message "" ediff-control-buffer ctl-buf ctl-wind ediff-control-frame ctl-frame ediff-3way-job three-way-job ediff-window-A ediff-window-B main-frame ediff-diff-buffer buf ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-tmp-buffer ediff-error-buffer ediff-msg-buffer ediff-debug-buffer ediff-multiframe ediff-split-window-function] 4])
#@510 Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
In merge jobs, buffer C is not deleted here, but rather according to
`ediff-quit-merge-hook'.
ASK non-nil means ask the user whether to keep each unmodified buffer, unless
KEEP-VARIANTS is non-nil, in which case buffers are never killed.
A side effect of cleaning up may be that you should be careful when comparing
the same buffer in two separate Ediff sessions: quitting one of them might
delete this buffer in another session as well.
(defalias 'ediff-janitor #[(ask keep-variants) "\306\307 \n$\210\306 \310 \n$\210\f\203 \306
\311 \n$\207\306 \312 \n$\207" [ediff-buffer-A ask keep-variants ediff-buffer-B ediff-merge-job ediff-ancestor-buffer ediff-dispose-of-variant-according-to-user A B Ancestor C ediff-buffer-C] 5 (#$ . 70990)])
(defalias 'ediff-dispose-of-variant-according-to-user #[(buff bufftype ask keep-variants) "\211\205 \306 !\205 \307\306 !!)\203\347 \211\205& \306 !\205& \307\306 !!)\2033 rq\210\n)\202< \310=\204? \311\f!\203\347 \312!\313!\314! \315!\203q \211\205f \306 !\205f \307\306 !!)\203q \316\"\210\211\205\202 \306 !\205\202 \307\306 !!)\203\222 rq\210\317\320!\210)\202\234 \310=\204\234 \311\f!\210\211\211\205\257 \306 !\205\257 \307\306 !!)\205\270 \321\306 !!)\210\211\205\314 \306 !\205\314 \307\306 !!)\203\334 rq\210\317
!)\202\345 \310=\206\345 \311\f!+\207\211\205\370 \306 !\205\370 \307\306 !!)?\2068\2068\314!\2068\203\322\323\324\307!#!?\2068\211\211\205.\306 !\205.\307\306 !!)\2057\321\306 !!)\207" [buff buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER modified-p get-buffer buffer-name ediff-quit error ediff-get-visible-buffer-window buffer-base-buffer buffer-modified-p window-live-p set-window-buffer set-buffer-modified-p nil kill-buffer y-or-n-p format "Kill buffer %S [%s]? " base wind keep-variants ask bufftype] 7])
#@674 Default hook to run on quitting a merge job.
This can also be used to save merge buffer in the middle of an Ediff session.
If the optional SAVE-AND-CONTINUE argument is non-nil, save merge buffer and
continue. Otherwise:
If `ediff-autostore-merges' is nil, this does nothing.
If it is t, it saves the merge buffer in the file `ediff-merge-store-file'
or asks the user, if the latter is nil. It then asks the user whether to
delete the merge buffer.
If `ediff-autostore-merges' is neither nil nor t, the merge buffer is saved
only if this merge job is part of a group, i.e., was invoked from within
`ediff-merge-directories', `ediff-merge-directory-revisions', and such.
(defalias 'ediff-maybe-save-and-delete-merge #[(&optional save-and-continue) " \203 \306\202\n \n\n\205 ;\203 \307\f \310 $\202 \n\306=\2031 \311\312!\307\f \313 $\202
\211 \205E \314!\205E \315\314!!)\205
\211 \205] \314!\205] \315\314!!)\203p r
q\210\313 \316>*\202{ \317=\204~ \320!\205 \313*\207" [ediff-merge-store-file save-and-continue ediff-autostore-merges merge-store-file ediff-buffer-C ediff-meta-buffer t ediff-write-merge-buffer-and-maybe-kill show-file read-file-name "Save the result of the merge in file: " nil get-buffer buffer-name (ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ediff-merge-filegroups-with-ancestor) ediff-quit error buf metajob ediff-metajob-name this-command ediff-KILLED-VITAL-BUFFER] 6 (#$ . 72927)])
(defalias 'ediff-write-merge-buffer-and-maybe-kill #[(buf file &optional show-file save-and-continue) "\306! =\204V \307\310\"\311 \210\312\313\n\"\210 r\314
!q\210p\315 \210\f\316\211&'\317\211(\317 ) *\320 \210\321\322!\210+\211 + ,\323\324!\210\323\n!\210\323\324!\210\325+!\210+\326\327!)\207 \211\205g \330 !\205g \331\330 !!)\203\353 r q\210\332!\203~ \333\307\334\"!\205\351 \211\205\217 \330 !\205\217 \331\330 !!)\203\242 r q\210\335!\210\336 \210)\202\256 -\337=\204\256 \340.!\210/\203\300 \312\341\"\210\342\316!\210\326\343!\2100?\205\351 \333\344!\205\351 \211\211\205\337 \330 !\205\337 \331\330 !!)\205\350 \345\330 !!))\207-\337=\206\366 \340.!\207" [file buf warn-message default-directory #1=#:old-dir ediff-msg-buffer find-buffer-visiting format "Another buffer is visiting file %s. Too dangerous to save the merge buffer" beep message "%s" get-buffer-create kill-all-local-variables nil t erase-buffer run-hooks temp-buffer-setup-hook princ "\n\n" internal-temp-output-buffer-show sit-for 2 get-buffer buffer-name file-exists-p y-or-n-p "File %s exists, overwrite? " set-visited-file-name save-buffer ediff-quit error "Merge buffer saved in: %s" set-buffer-modified-p 3 "Merge buffer saved. Now kill the buffer? " kill-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output this-command ediff-KILLED-VITAL-BUFFER show-file save-and-continue] 5])
(defalias 'ediff-default-suspend-function #[nil "\n\f \306 ! \306 ! \306
! \307\310!\205 \307\311!\205' \312 \203M \313 !\203M \314 !\210\202P \315 \210\203Z \315!\210\203d \315!\210 \203n \315 !\210 \203x \315 !\210\203\202 \315!\210\203\214 \315!\210\316!\203\241 \317!\210\320 \210\315 \210\202\277 \211 !\205\265 \321!!\205\265 \322\321!!!)\203\277 q\210\315 \210\316!\203\324 \317!\210\320 \210\315 \210\202\362 \211 !\205\350 \321!!\205\350 \322\321!!!)\203\362 q\210\315 \210\316!\203\317!\210\320 \210\315 \202#
\211 !\205\321!!\205\322\321!!!)\205#
q\210\315 .\f\207" [ediff-buffer-A buf-A ediff-buffer-B buf-B ediff-buffer-C buf-C ediff-get-visible-buffer-window boundp ediff-patchbufer ediff-patch-diagnostics ediff-window-display-p frame-live-p iconify-frame bury-buffer window-live-p select-window delete-other-windows get-buffer buffer-name buf-A-wind buf-B-wind buf-C-wind buf-patch buf-patch-diag ediff-error-buffer buf-err ediff-diff-buffer buf-diff ediff-custom-diff-buffer buf-custom-diff ediff-fine-diff-buffer buf-fine-diff ediff-control-frame buf] 4])
#@178 Suspend Ediff.
To resume, switch to the appropriate `Ediff Control Panel'
buffer and then type \[ediff-recenter]. Ediff will automatically set
up an appropriate window config.
(defalias 'ediff-suspend #[nil "\302\303!\206\f \304\305 \")\210\306\307!\210\310\311!\207" [meta-buf-p this-command nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" run-hooks ediff-suspend-hook message "To resume, type M-x eregistry and select the desired Ediff session"] 3 (#$ . 77096) nil])
#@122 Show the names of the buffers or files being operated on by Ediff.
Hit \[ediff-recenter] to reset the windows afterward.
(defalias 'ediff-status-info #[nil "\306\307!\206\f \310\311 \")\210\212\312 \210)\nr\313\f!q\210p\314 \210 \306\211@\315\211A\315 B C\316 \210\317\320!\210+\211 D\211 E\211 F\205P \321F!\205P \322\321F!!)\203` rEq\210\323 \210)\202k \324=\204k \310G!\210\325 \210\326\327 !\210\326\330!\210H\211 F\205\214 \321F!\205\214 \322\321F!!)\203\261 rHq\210@\203\245 \326\331\332@\"!\210\202\255 \326\331\333\322 \"!\210)\202\274 \324=\204\274 \310G!\210I\211 F\205\321 \321F!\205\321 \322\321F!!)\203\366 rIq\210@\203\352 \326\331\334@\"!\210\202\362 \326\331\335\322 \"!\210)\202 \324=\204\310G!\210J\203KK\211 F\205\321F!\205\322\321F!!)\203@rKq\210@\2034\326\331\336@\"!\210\202<\326\331\337\322 \"!\210)\202K \324=\204K\310G!\210\326\331\340L\211 F\205c\321F!\205c\322\321F!!)\203p\341\322L!P\202q\342\"!\210\326\331\343M\211 F\205\214\321F!\205\214\322\321F!!)\203\231\341\322M!P\202\232\342\"!\210H\211 F\205\262\321F!\205\262\322\321F!!)\203\304rHq\210\344e`\"T)\202\316 \324=\206\316\310G! NI\211 F\205\345\321F!\205\345\322\321F!!)\203\367rIq\210\344e`\"T)\202 \324=\206\310G! O\306 P\326\345\346N\"!\210\326\345\347O\"!\210J\203VK\211 F\2050\321F!\2050\322\321F!!)\203BrKq\210\344e`\"T)\202L \324=\206L\310G!P\326\345\350P\"!\210+\326\331\351Q\352W\203e\353\202tQRY\203q\354\202tQT\"!\210\326\331\355S\203\203\356\202\204\357\"!\210T\203\225U\203\225\326\360!\210V\203\243T\203\243\326\361!\210W\362=\203\261\326\363!\210\202\353WX=\203\314\326\364!\210\326\345\365YZ[$!\210\202\353W\\=\203\347\326\366!\210\326\345\365]^_$!\210\202\353\326\367!\210\326\345\370\371\372!\"!\210\373D!\210+\374`!\203\375`!\210\376a!\205\377a!\207" [meta-buf-p this-command default-directory #1=#:old-dir ediff-msg-buffer buffer-read-only nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-skip-unsuitable-frames get-buffer-create kill-all-local-variables t erase-buffer run-hooks temp-buffer-setup-hook get-buffer buffer-name fundamental-mode ediff-quit raise-frame princ ediff-version "\n\n" format "File A = %S\n" "Buffer A = %S\n" "File B = %S\n" "Buffer B = %S\n" "File C = %S\n" "Buffer C = %S\n" "Customized diff output %s\n" " in buffer " " is not available" "Plain diff output %s\n" count-lines format-message "Buffer A's point is on line %d\n" "Buffer B's point is on line %d\n" "Buffer C's point is on line %d\n" "\nCurrent difference number = %S\n" 0 start end "\n%s regions that differ in white space & line breaks only" "Ignoring" "Showing" "\nFocusing on regions where both buffers differ from the ancestor" "\nSkipping merge regions that differ from default setting" ediff-show-all-diffs "\nSelective browsing by regexp is off\n" "\nIgnoring regions that match" "\n regexp `%s' in buffer A %S\n regexp `%s' in buffer B\n" "\nFocusing on regions that match" "\nSelective browsing via a user-defined method.\n" "\nBugs/suggestions: type `%s' while in Ediff Control Panel." substitute-command-keys "\\[ediff-submit-report]" internal-temp-output-buffer-show frame-live-p ediff-reset-mouse window-live-p select-window buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output buf ediff-KILLED-VITAL-BUFFER ediff-buffer-A ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-custom-diff-buffer ediff-diff-buffer A-line B-line C-line ediff-current-difference ediff-number-of-differences ediff-ignore-similar-regions ediff-merge-job ediff-show-clashes-only ediff-skip-merge-regions-that-differ-from-default ediff-skip-diff-region-function ediff-hide-regexp-matches-function ediff-regexp-hide-A ediff-hide-regexp-connective ediff-regexp-hide-B ediff-focus-on-regexp-matches-function ediff-regexp-focus-A ediff-focus-regexp-connective ediff-regexp-focus-B ediff-control-frame ediff-control-window] 7 (#$ . 77617) nil])
(defalias 'ediff-select-difference #[(n) "\211\205 \306 !\205 \307\306 !!)\205\235 \n\211\205& \306 !\205& \307\306 !!)\205\235 \211\2042 \f \310Y\205;
W)\205\235 \311 \203P \203P \312 !\210\202\224 \313=\203\224 \314\315 $\210\314\316\n $\210\203u \314\317 $\210\211\205\207 \306 !\205\207 \307\306 !!)\203\224 \314\320 $\210\321 !\210 \322\323!\207" [ediff-buffer-A buf ediff-buffer-B n ediff-current-difference ediff-number-of-differences get-buffer buffer-name 0 ediff-has-face-support-p ediff-highlight-diff ascii ediff-place-flags-in-buffer A B C Ancestor ediff-install-fine-diff-if-necessary run-hooks ediff-select-hook ediff-use-faces ediff-highlighting-style ediff-control-buffer ediff-3way-job ediff-buffer-C ediff-ancestor-buffer] 6])
(defalias 'ediff-unselect-difference #[(n) "\211\204 \306Y\205 \nW)\205\263 \307 \203$ \203$ \310 \210\202\253 \f\311=\203\253 \312
\313 \314\"A*JH\306H\"\210\312\315 \314\"A*JH\306H\"\210\203y \312\316 \314\"A*JH\306H\"\210 \211 \205\216 \317 !\205\216 \320\317 !!)\203\253 \312 \321 \314\"A*JH\306H\"\210\322 \323\"\210\324\325!\207" [n ediff-current-difference ediff-number-of-differences ediff-use-faces ediff-highlighting-style ediff-buffer-A 0 ediff-has-face-support-p ediff-unhighlight-diff ascii ediff-remove-flags-from-buffer A assoc B C get-buffer buffer-name Ancestor ediff-set-fine-diff-properties t run-hooks ediff-unselect-hook ediff-difference-vector-alist alist buf-type ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-ancestor-buffer buf] 6])
(defalias 'ediff-unselect-and-select-difference #[(n &optional flag no-recenter) "\n\204\n \306\307!\210) \310\216
\311=\204 \312 !\210
\313=\204# \314!\210\211*\207" [n ediff-current-difference no-recenter ediff-control-buffer control-buf flag ediff-recenter no-rehighlight #[nil "\211\205 \304 !\205 \305\304 !!)\203 rq\210\306 )\207\n\307=\206& \310 !\207" [control-buf buf this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-refresh-mode-lines ediff-quit error] 4] select-only ediff-unselect-difference unselect-only ediff-select-difference] 2])
(defalias 'ediff-highlight-diff-in-one-buffer #[(n buf-type) "\306=\203\n \202% \307=\203 \n\202% \310=\203 \202% \311=\205% \f\211 \2055 \312
!\2055 \313\312
!!)\205\360 \306=\203C \202^ \307=\203M \n\202^ \310=\203W \202^ \311=\205^ \f\211 \211 \205q \312
!\205q \313\312
!!)\203 rq\210d)\202\212 \314=\206\212 \315! \316\317 # \316\320 # \232\203\250 \321\202\251 \322 \\^ ! \"\323\"\"A*J #\324# $\210\325#\326 #\210\327$ \"\323\"\"A*J H\322H\330\".\207" [buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf A B C Ancestor get-buffer buffer-name ediff-quit error ediff-get-diff-posn beg end 1 0 assoc ediff-move-overlay ediff-overlay-put ediff-diff-num ediff-set-overlay-face nil buff this-command ediff-KILLED-VITAL-BUFFER last n begin xtra end-hilit ediff-current-diff-overlay-alist alist current-diff-overlay ediff-difference-vector-alist] 6])
(defalias 'ediff-unhighlight-diff-in-one-buffer #[(buf-type) "\306=\203\n \202% \307=\203 \n\202% \310=\203 \202% \311=\205% \f\211 \2055 \312
!\2055 \313\312
!!)\205\230 \314\"A*J \314\"A*JH\315H \316\317\211#\210\320\321 \205\226 \205\226 \205\226 \211\322!\203\212 \202\214 \314\"A,\"*\207" [buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf A B C Ancestor get-buffer buffer-name assoc 0 ediff-move-overlay 1 ediff-set-overlay-face ediff-has-face-support-p cl-oddp ediff-current-diff-overlay-alist alist ediff-difference-vector-alist ediff-current-difference overlay current-diff-overlay ediff-use-faces ediff-highlight-all-diffs dif-num ediff-even-diff-face-alist ediff-odd-diff-face-alist] 6])
(defalias 'ediff-unhighlight-diffs-totally-in-one-buffer #[(buf-type) "\306\307!\210\310 \2052 \2052 \311\n \312\n\f\"A*\211 J \313\314!\210\315!\203. \316!\210
\317L+\207" [ediff-use-faces inhibit-quit buf-type ediff-current-diff-overlay-alist alist current-diff-overlay-var ediff-unselect-and-select-difference -1 ediff-has-face-support-p t assoc ediff-paint-background-regions unhighlight ediff-overlayp ediff-delete-overlay nil current-diff-overlay] 4])
#@51 Put face on diff N. Invoked for X displays only.
(defalias 'ediff-highlight-diff #[(n) "\301\302\"\210\301\303\"\210\301\304\"\210\301\305\"\207" [n ediff-highlight-diff-in-one-buffer A B C Ancestor] 3 (#$ . 86066)])
#@43 Remove overlays from buffers A, B, and C.
(defalias 'ediff-unhighlight-diff #[nil "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [ediff-unhighlight-diff-in-one-buffer A B C Ancestor] 2 (#$ . 86294)])
(defalias 'ediff-unhighlight-diffs-totally #[nil "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [ediff-unhighlight-diffs-totally-in-one-buffer A B C Ancestor] 2])
(defalias 'ediff-minibuffer-with-setup-hook '(macro . #[(fun &rest body) "\302\303\304 BB BBB\207" [fun body if (fboundp 'minibuffer-with-setup-hook) minibuffer-with-setup-hook] 5]))
(defalias 'ediff-read-file-name #[(prompt default-dir default-file &optional no-dirs) "\306\307\310\206 \203 \311 !\206 \n!!! \203 \312 ! \313\230\203& \314\315\316!\2055 \316 \2053 C\"\314 \315\317!\203t \320\314 \321\322\216\323\324
\"\210\325\326\327 \203\\ \330 \331Q\202` \330\331Q# \206g \332 \205o \311 !%+\202\230 \325\326\327 \203\204 \330 \331Q\202\210 \330\331Q# \206\217 \332 \205\227 \311 !%\310 \"\333 !\203\257 \203\257 \310\312 ! \" \203\277 \333 !\203\277 \334\335 \"\210 *\207" [default-dir default-file default-directory f defaults #1=#:setup-hook file-name-as-directory ediff-abbreviate-file-name expand-file-name file-name-directory file-name-nondirectory "" nil fboundp dired-dwim-target-defaults minibuffer-with-setup-hook #[nil "\205 \211\207" [defaults minibuffer-default] 2] #[nil "\302\303\"\210 \207" [#1# #2=#:fun remove-hook minibuffer-setup-hook] 3] #[nil "\301\302\"\207" [#1# remove-hook minibuffer-setup-hook] 3] add-hook minibuffer-setup-hook read-file-name format "%s%s " " (default " "):" t file-directory-p error "File %s is a directory" #2# prompt no-dirs] 7])
(defalias 'ediff-make-temp-file #[(buff &optional prefix given-file start end) "\306\206 \307!\211 \310\211 \311\312!\203( \312 \204( G\313V\203( \314\313O P\nP\206U \315
\316\"\203F \317!\202U \203Q \317
\320\"\202U \317! \211 \205k \321 !\205k \322\321 !!)\203\235 r q\210\323 \203 \202\200 e \203\212 \202\213 d
\310\324%\210\325
\"\210\326
!)\202\250 !\327=\206\250 \330\"!-\207" [prefix p short-p ediff-coding-system-for-write coding-system-for-write f ediff-convert-standard-filename "ediff" nil fboundp msdos-long-file-names 2 0 find-file-name-handler insert-file-contents ediff-make-empty-tmp-file keep-name get-buffer buffer-name write-region no-message set-file-modes expand-file-name ediff-quit error short-f ediff-temp-file-prefix given-file buff buf start end ediff-temp-file-mode this-command ediff-KILLED-VITAL-BUFFER] 7])
(defalias 'ediff-make-empty-tmp-file #[(proposed-name &optional keep-proposed-name) "\3041/ \305 !\204 \n\204 \306!\307\310!r q\210\311\216\312\313\314 \314\315\314\316&\210+\3140\2023 \210\202 \204 )\207" [proposed-name file keep-proposed-name #1=#:temp-buffer (file-already-exists) file-exists-p make-temp-name generate-new-buffer " *temp*" #[nil "\301!\205 \302!\207" [#1# buffer-name kill-buffer] 2] write-region "" nil silent excl] 8])
(defalias 'ediff-verify-file-buffer #[(&optional file-magic) "\302p!\203, \303 \205H \304\305\306\307 #!\203' \3101 \311 0\207\210\312 \210\313\314\"\207\315\316\"\207\304\305\317\307 $!\203D \203? \320 \210\321\322\211\"\207\315\323\"\207" [buffer-file-name file-magic verify-visited-file-modtime buffer-modified-p yes-or-no-p format "Buffer %s has been modified. Save it in file %s? " buffer-name (error) save-buffer beep message "Couldn't save %s" error "Buffer is out of sync for file %s" "File %s was modified since visited by buffer %s. REVERT file %s? " erase-buffer revert-buffer t "Buffer out of sync for file %s"] 6])
(defalias 'ediff-verify-file-merge-buffer #[(file) ";\205 \306!\307\211?\206n \310\311\312\n!# r\313
!q\210p\314 \210\f\307\211 \315\211 \315 \316 \210\317\320!\210+\211 !\321\322!\210\321 !\210\321\322!\210\323 !\210+\324\325\326 \"!\203k r\nq\210\327 \210\330p!)\202n \331\332!*\207" [file warn-message buff default-directory #1=#:old-dir ediff-msg-buffer find-buffer-visiting nil format "Buffer %s is visiting %s. Save and kill the buffer? " buffer-name get-buffer-create kill-all-local-variables t erase-buffer run-hooks temp-buffer-setup-hook princ "\n\n" internal-temp-output-buffer-show y-or-n-p message "%s" save-buffer kill-buffer error "Too dangerous to merge versions of a file visited by another buffer" buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output] 5])
(defalias 'ediff-filename-magic-p #[(file) "\301!\206 \302!\207" [file ediff-file-compressed-p ediff-file-remote-p] 2])
#@335 Safe way of saving buffers A, B, C, and the diff output.
`wa' saves buffer A, `wb' saves buffer B, `wc' saves buffer C,
and `wd' saves the diff output.
With prefix argument, `wd' saves plain diff output.
Without an argument, it saves customized diff argument, if available
(and plain output, if customized output was not generated).
(defalias 'ediff-save-buffer #[(arg) "\306\307!\206\f \310\311 \")\210\312 \210\313 \314>\203\264 \313 \315>\203# \316\2026 \313 \317>\203. \320\2026 \313 \321>\2056 \322\316=\203? \n\202%\313 \315>\203J \316\202] \313 \317>\203U \320\202] \313 \321>\205] \322\320=\203f \202%\313 \315>\203q \316\202\204 \313 \317>\203| \320\202\204 \313 \321>\205\204 \322\322=\203\215 \f\202%\313 \315>\203\230 \316\202\253 \313 \317>\203\243 \320\202\253 \313 \321>\205\253 \322\323=\205%
\202%\313 \324=\205%\325\326!\210\327\330!\210 \203\346 \211 !\205\335 \331!!\205\335 \332\331!!!)\203\346 \202%\"\211 !\205\373 \331!!\205\373 \332\331!!!)\203\"\202% \211 !\205\331!!\205\332\331!!!)\203\" \202%\310\333!\211 !\2058\331!!\2058\332\331!!!)\203Zr\313 \314>\203\340\313 \315>\203O\316\202b\313 \317>\203Z\320\202b\313 \321>\205b\322\316=\203k\n\202Q\313 \315>\203v\316\202\211\313 \317>\203\201\320\202\211\313 \321>\205\211\322\320=\203\222 \202Q\313 \315>\203\235\316\202\260\313 \317>\203\250\320\202\260\313 \321>\205\260\322\322=\203\271\f\202Q\313 \315>\203\304\316\202\327\313 \317>\203\317\320\202\327\313 \321>\205\327\322\323=\205Q
\202Q\313 \324=\205Q\325\326!\210\327\330!\210 \203 \211 !\205 \331!!\205 \332\331!!!)\203 \202Q\"\211 !\205'\331!!\205'\332\331!!!)\2030\"\202Q \211 !\205E\331!!\205E\332\331!!!)\203N \202Q\310\333!q\210\334 #\335 *\207 \336=\206d\310$!\207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-compute-custom-diffs-maybe ediff-last-command-char (97 98 99) (97 65) A (98 66) B (99 67) C Ancestor 100 message "Saving diff output ..." sit-for 1 get-buffer buffer-name "Output from `diff' not found" 2 save-buffer ediff-quit arg ediff-diff-buffer buf ediff-custom-diff-buffer window-min-height ediff-KILLED-VITAL-BUFFER] 4 (#$ . 90957) "P"])
(defalias 'ediff-clone-buffer-for-region-comparison #[(buff region-name) "\306 \"\307\310\211\211 \211 '\211 (\205\" \311(!\205\" \312\311(!!)\2032 r'q\210\307))\202> *\313=\204> \314+!\210\315'!\210\316'!\317\f!\210\320 \210\321 \204W \322 \210\323 \210\324 \210\325 \210\326 \327\330! ,r,q\210\331\216\332 \210\333\334\312'!\"c\210\211 (\205\217 \311(!\205\217 \312\311(!!)\203\244 rq\210\333\335\336\337!\336\340!#)\202\257 *\313=\206\257 \314+!c\210eb\210p\341 \n\"\210\342 \210\343\f!\203\310 \317\f!\210\3441\322 \345 0\202\366 \210'\211 (\211 (\205\353 \311(!\205\353 \312\311(!!)\205\365 \346\311(!!)\210+'-\207" [buff region-name msg-buf other-wind wind pop-up-windows ediff-make-cloned-buffer t nil get-buffer buffer-name ediff-quit error pop-to-buffer ediff-get-visible-buffer-window select-window delete-other-windows mark push-mark ediff-activate-mark split-window-vertically ediff-select-lowest-window selected-window generate-new-buffer " *temp*" #[nil "\301!\205 \302!\207" [#1=#:temp-buffer buffer-name kill-buffer] 2] erase-buffer format "\n ******* Mark a region in buffer %s (or confirm the existing one) *******\n" "\n When done, type %s Use %s to abort\n " ediff-format-bindings-of exit-recursive-edit abort-recursive-edit set-window-buffer shrink-window-if-larger-than-buffer window-live-p (quit) recursive-edit kill-buffer cloned-buff buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER #1#] 6])
(defalias 'ediff-clone-buffer-for-window-comparison #[(buff wind region-name) "\306 \"\211\211\205 \307 !\205 \310\307 !!)\203$ r\nq\210\311)\202/
\312=\204/ \313
!\210\314\n\"\210\n)\207" [buff region-name cloned-buff buf ediff-temp-indirect-buffer this-command ediff-make-cloned-buffer get-buffer buffer-name t ediff-quit error set-window-buffer ediff-KILLED-VITAL-BUFFER wind] 4])
(defalias 'ediff-buffer-type #[(buffer) " =\203 \305\207\n=\203 \306\207 =\203 \307\207\f=\203 \310\207\311\207" [buffer ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer A B C Ancestor nil] 2])
(defalias 'ediff-clone-buffer-for-current-diff-comparison #[(buff reg-name) "\306 \"\307!\310 \311\" \310 \312\" \n\211 \205' \313!\205' \314\313!!)\203= r\nq\210\fb\210\315
!\210\316)\202I \317=\204I \320!\210\n,\207" [buff reg-name cloned-buff buf-type reg-start reg-end ediff-make-cloned-buffer ediff-buffer-type ediff-get-diff-posn beg end get-buffer buffer-name set-mark t ediff-quit error buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER] 4])
(defalias 'ediff-make-cloned-buffer #[(buff region-name) "\302\303;\203\f \202 \304! P!\"\207" [buff region-name ediff-make-indirect-buffer generate-new-buffer-name buffer-name] 5])
(defalias 'ediff-make-indirect-buffer #[(base-buf indirect-buf-name) "\302 \303#\207" [base-buf indirect-buf-name make-indirect-buffer clone] 4])
(defalias 'ediff-compute-custom-diffs-maybe #[nil "\306!\306 !\307\211 \211 \203 \310
!\203 \311
!\203 \312!\f\2030 \310\f!\2030 \311\f!\2034 \312 !\211 \205I \313!\205I \314\313!!)\204U \315\316\317\320\"!\211 \205j \313!\205j \314\313!!)\203} rq\210\307\321 \210)\202\211 \322=\204\211 \323 !\210\324 \325 \206\226
\n\206\233 \f&\210\326\327!\203\255 rq\210\327 \210) \203\273 \310 !\203\273 \330 !\210\n\205\310 \310\n!\205\310 \330\n!,\207" [ediff-buffer-A ediff-buffer-B file-B file-A buf-B-file-name buf-A-file-name buffer-file-name nil file-exists-p ediff-file-remote-p ediff-make-temp-file get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-custom-diff" "*" erase-buffer ediff-quit error ediff-exec-process synchronize fboundp diff-mode delete-file ediff-custom-diff-buffer buf buffer-read-only this-command ediff-KILLED-VITAL-BUFFER ediff-custom-diff-program ediff-custom-diff-options] 8])
(defalias 'ediff-show-diff-output #[(arg) "\306\307!\206\f \310\311 \")\210\312 \210\212\313\314!\210)\n\2034 \211 \205, \315\f!\205, \316\315\f!!)\2034 \202n
\211 \205E \315\f!\205E \316\315\f!!)\203M
\202n \211 \205^ \315\f!\205^ \316\315\f!!)\203f \202n \317 \210\320\321!\210\306\211 \203\245 \f\211 \205\204 \315\f!\205\204 \316\315\f!!)\203\223 r\fq\210eb\210)\202\236 \322=\204\236 \310!\210\323\f!\210\324 \210)\325!\203\262 \326!\210\327!\205\275 \330!\207" [meta-buf-p this-command arg ediff-diff-buffer buf ediff-custom-diff-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-compute-custom-diffs-maybe ediff-skip-unsuitable-frames ok-unsplittable get-buffer buffer-name beep message "Output from `diff' not found" ediff-quit switch-to-buffer raise-frame frame-live-p ediff-reset-mouse window-live-p select-window ediff-KILLED-VITAL-BUFFER ediff-control-frame ediff-control-window] 4 nil "P"])
#@289 Compare regions in an active Ediff session.
Like `ediff-regions-linewise' but is called from under an active Ediff session on
the files that belong to that session.
After quitting the session invoked via this function, type C-l to the parent
Ediff Control Panel to restore highlighting.
(defalias 'ediff-inferior-compare-regions #[nil "\306\307\310\311E\312\313\211\211\211\211\211\211 9 : ; <=\211 >\204' =>>\314Y\2053 >?W)\203@ \315=\312\"\210\316 \210\317\320!\210@\321>\203\222 A<\307=\203^ B\322;\202Q<\310=\203n C\323;\202Q<\306\232\204\201 \324\325!\210\326\327!\210\330\331!\210\312 D\326\332!\210\333\334 !<)\202N @\335>\203H<;>\203\277 \336<;\";\337<E F G\340GF\"A*!\202\357 <\306\232\204\330 \324\325!\210\326\341\342\343;\344#\"\210\330\331!\210\312 D\326\345\342\343;\344#\"\210\333\334 !<)\202\231 \306<<;>\203\336<;\";\337<E F G\340GF\"A*!\202Q<\306\232\2041\324\325!\210\326\341\342\343;\344#\"\210\330\331!\210\312 D\326\346\342\343;\347#\"\210\333\334 !<)\202\362 BC\313;=\211 >\204]=>>\314Y\205i>?W)\203v\350\351!\203v\31299\203\202\352 \353\"\202\206\354 \353\"\211\211 H\205\233\355H!\205\233\356\355H!!)\203\304r q\210\357 \360
b\210\361 \210` b\210\313\210m\204\276\313u\210`)\202\320I\362=\204\320\363J!\2109\203\334\352\364\"\202\340\354\364\"\211\211 H\205\365\355H!\205\365\356\355H!!)\203 rq\210\357 \360 \fb\210\361 \210`\nb\210\313\210m\204\313u\210`)\202*I\362=\204*\363J!\210\365
\f\n\3139\203;\366\202<\3679\205B\312\3708BC&\n.\n\207" [bufB bufA endB endA begB begA "" 65 66 67 t nil 0 ediff-set-fine-diff-properties ediff-unhighlight-diff ediff-paint-background-regions unhighlight (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) (66) (65) beep 1 message "Valid values are A or B" sit-for 2 "Which buffer to compare to the merge buffer (A or B)? " capitalize read-char-exclusive (ediff-files3 ediff-buffers3) delq eval assoc "Valid values are %s" mapconcat char-to-string " or " "Enter the 1st buffer you want to compare (%s): " "Enter the 2nd buffer you want to compare (%s): " "/" y-or-n-p "Compare currently highlighted difference regions? " ediff-clone-buffer-for-current-diff-comparison "-Region.A-" ediff-clone-buffer-for-region-comparison get-buffer buffer-name region-beginning region-end beginning-of-line ediff-quit error "-Region.B-" ediff-regions-internal ediff-regions-wordwise ediff-regions-linewise ediff-split-window-function use-current-diff-p zmacs-regions possibilities answer ediff-current-difference n ediff-number-of-differences ediff-job-name ediff-buffer-C ediff-buffer-A ediff-buffer-B cursor-in-echo-area ediff-buffer-alist alist buf-type buf this-command ediff-KILLED-VITAL-BUFFER] 13 (#$ . 98164) nil])
(defalias 'ediff-remove-flags-from-buffer #[(buffer overlay) "\211\205 \306 !\205 \307\306 !!)\203( rq\210\310\311 \312\313#\210\311 \314\313#*\207\f\315=\2061 \316
!\207" [buffer buf inhibit-read-only overlay this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name t ediff-overlay-put before-string nil after-string ediff-quit error] 5])
(defalias 'ediff-place-flags-in-buffer #[(buf-type buffer ctl-buffer diff) "\211\205 \306 !\205 \307\306 !!)\203 rq\210\310\n \f#)\207
\311=\206* \312 !\207" [buffer buf buf-type ctl-buffer diff this-command get-buffer buffer-name ediff-place-flags-in-buffer1 ediff-quit error ediff-KILLED-VITAL-BUFFER] 5])
(defalias 'ediff-place-flags-in-buffer1 #[(buf-type ctl-buffer diff-no) "\211\205 \306 !\205 \307\306 !!)\203, rq\210\n \310\n\f\"A*J
H\311H)\2027 \312=\2067 \313! \314\n\315
$ \316\211 \316 b\210n\211\205b \306 !\205b \307\306 !!)\203\201 rq\210\317=\205} \203{ \202} )\202\214 \312=\206\214 \313!\320\321#\210\314\n\322
$\211b\210n\211\205\265 \306 !\205\265 \307\306 !!)\203\324 rq\210\317=\205\320 \203\316 \202\320 )\202\337 \312=\206\337 \313!\320\323#-\207" [ctl-buffer buf buf-type ediff-difference-vector-alist alist diff-no get-buffer buffer-name assoc 0 ediff-quit error ediff-get-diff-posn beg nil ascii ediff-overlay-put before-string end after-string this-command ediff-KILLED-VITAL-BUFFER curr-overl before after beg-of-line flag ediff-highlighting-style ediff-before-flag-bol ediff-before-flag-mol ediff-after-flag-eol ediff-after-flag-mol] 6])
(defalias 'ediff-empty-diff-region-p #[(n buf-type) "\303=\203 ?\206\" \304\303\305\n#\304\303\306\n#U\207\304\305\n#\304\306\n#U\207" [buf-type ediff-3way-comparison-job n C ediff-get-diff-posn beg end] 5])
(defalias 'ediff-whitespace-diff-region-p #[(n buf-type) "\306=\203 ?\206\244 \307\n\"\206\244 \310\304\n#\310\303\n# \311=\203(
\202F \312=\2033 \202F \306=\203> \202F \313=\205F \211 \205Y \314!\205Y \315\314!!)\203\230 r\311=\203h
\202\206 \312=\203s \202\206 \306=\203~ \202\206 \313=\205\206 q\210\212\fb\210\316w\210` Y*\202\243 \317=\206\243 \320!*\207" [buf-type ediff-3way-job n end beg ediff-buffer-A C ediff-empty-diff-region-p ediff-get-diff-posn A B Ancestor get-buffer buffer-name nil ediff-quit error ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf ediff-whitespace this-command ediff-KILLED-VITAL-BUFFER] 6])
(defalias 'ediff-get-region-contents #[(n buf-type ctrl-buf &optional start end) "\211\205 \306 !\205 \307\306 !!)\203C rq\210\n\310=\203# \202? \n\311=\203- \f\202? \n\312=\2037
\202? \n\313=\205? )\202N \314=\206N \315!\211\205^ \306 !\205^ \307\306 !!)\203\316 r\211\205t \306 !\205t \307\306 !!)\203\246 rq\210\n\310=\203\206 \202\242 \n\311=\203\220 \f\202\242 \n\312=\203\232
\202\242 \n\313=\205\242 )\202\261 \314=\206\261 \315!q\210\206\277 \316\n\317$\206\313 \316\n\320${)\207\314=\206\331 \315!\207" [ctrl-buf buf buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C get-buffer buffer-name A B C Ancestor ediff-quit error ediff-get-diff-posn beg end ediff-ancestor-buffer this-command ediff-KILLED-VITAL-BUFFER start n] 7])
(defalias 'ediff-get-diff-posn #[(buf-type pos &optional n control-buf) "\306 \204 p \211\205 \307\n!\205 \310\307\n!!)\203e r q\210 \204' \f \311W\2043
Y\203K
\311V\203F \312 T
$\210\202K \312!\210 \313\"A*J H\311H)\202q \314=\204q \312!\210\315!\211\205\204 \307\n!\205\204 \310\307\n!!)\204\215 \312!\210\316=\203\246 \317!\205\242 \320!)\202\265 \317!\205\264 \321!))\207" [diff-overlay control-buf buf n ediff-current-difference ediff-number-of-differences nil get-buffer buffer-name 0 error assoc ediff-quit ediff-overlay-buffer beg ediff-overlayp overlay-start overlay-end ediff-BAD-DIFF-NUMBER this-command ediff-NO-DIFFERENCES buf-type ediff-difference-vector-alist alist ediff-KILLED-VITAL-BUFFER pos overl] 6])
(defalias 'ediff-restore-highlighting #[(&optional ctl-buf) "\206 p\211\205 \306 !\205 \307\306 !!)\2036 r\206 pq\210\310 \2031 \n\2031 \2031 \311 \210\312\f!)\207
\313=\206@ \314
!\207" [ctl-buf buf ediff-use-faces ediff-highlight-all-diffs ediff-current-difference this-command get-buffer buffer-name ediff-has-face-support-p ediff-paint-background-regions ediff-select-difference ediff-quit error ediff-KILLED-VITAL-BUFFER] 4])
(defalias 'ediff-clear-diff-vector #[(vec-var &optional fine-diffs-also) "\301J!\203
\302\303J\"\210\304L\207" [vec-var vectorp mapc #[(elt) "\303\304H!\210 \205 \211\205 \305\303\n\306H\")\207" [elt fine-diffs-also diff-record ediff-delete-overlay 0 mapc 1] 5] nil] 3])
(defalias 'ediff-make-bullet-proof-overlay #[(beg end buff) "\211\205 \306 !\205 \307\306 !!)\205h \310\211\205( \306 !\205( \307\306 !!)\203] rq\210\311 !\204: \312 !\311\f!\204D \312\f!\313 \f\310\314%\315\n\316\310#\210\315\n\317\320#\210\n)\202g
\321=\206g \322!)\207" [buff buf overl beg end this-command get-buffer buffer-name nil number-or-marker-p eval make-overlay rear-advance ediff-overlay-put evaporate ediff-diff-num 0 ediff-quit error ediff-KILLED-VITAL-BUFFER] 7])
(defalias 'ediff-make-current-diff-overlay #[(type) "\306 \205a \307 \n\"A*\310=\203 \f\2026 \311=\203#
\2026 \312=\203. \2026 \313=\2056 \307 \n\"A* \211 \314dd#L\210\315J\"\210\316J\317#+\207" [type ediff-current-diff-overlay-alist alist buf-type ediff-buffer-A ediff-buffer-B ediff-has-face-support-p assoc A B C Ancestor ediff-make-bullet-proof-overlay ediff-set-overlay-face ediff-overlay-put ediff ediff-buffer-C ediff-ancestor-buffer ediff-current-diff-face-alist face buffer overlay ediff-control-buffer] 6])
(defalias 'ediff-other-buffer #[(excl-buff-lst) "<\204 C\306 \307 \244\306 @\310 \311\312\" @\211 \2050 \313!\2050 \314\313!!)\2048 \315\202q @\211 \205M \313!\205M \314\313!!)\203\\ r@q\210)\202g \316=\206g \317!\320=\203p \321\202q \322 \311\323 \" \324\310 \" \310 \204\222 \fG\325V\203\222 \f \203\235 @\202\261 \324\310\311\326 \"\"\211 \203\260 @\202\261 \327. \207" [excl-buff-lst all-buffers selected-buffers preferred-buffer visible-dired-buffers excl-buff-name-list ediff-get-selected-buffers buffer-list nil mapcar #[(b) ";\203 \207\301!\205 \302!\207" [b bufferp buffer-name] 2] get-buffer buffer-name unknown ediff-quit error dired-mode yes no #[(x) "\306! \235\203\n \307\207\n>\203 \207\310!\204 \307\207 =\203\" \207\f\311=\203Y \211 \2059 \312
!\2059 \306\312
!!)\203G rq\210)\202R \313=\206R \314!\315=\205\333 \207\211 \205j \312
!\205j \306\312
!!)\203x rq\210)\202\203 \313=\206\203 \314!\315=\203\224 \f\204\222 B\307\207\211 \205\245 \312
!\205\245 \306\312
!!)\203\263 rq\210)\202\276 \313=\206\276 \314!\316>\203\305 \207\317\320\306!\"\203\320 \307\207\306!\321\230\203\332 \307\207\207" [x excl-buff-name-list selected-buffers preferred-buffer use-dired-major-mode buf buffer-name nil ediff-get-visible-buffer-window yes get-buffer ediff-quit error dired-mode (rmail-mode vm-mode gnus-article-mode mh-show-mode) string-match "^[ *]" "*scratch*" major-mode this-command ediff-KILLED-VITAL-BUFFER visible-dired-buffers] 5] delq 0 #[(x) "\306! \235\203\n \307\207\n\310=\203? \211\205! \311 !\205! \306\311 !!)\203. rq\210\f)\2028
\312=\2068 \313!\314=\205\204 \207\211\205P \311 !\205P \306\311 !!)\203] rq\210\f)\202g
\312=\206g \313!\314=\203n \307\207\315\316\306!\"\203y \307\207\306!\317\230\203\203 \307\207\207" [x excl-buff-name-list use-dired-major-mode buf major-mode this-command buffer-name nil yes get-buffer ediff-quit error dired-mode string-match "^[ *]" "*scratch*" ediff-KILLED-VITAL-BUFFER] 5] "*scratch*" buf major-mode this-command ediff-KILLED-VITAL-BUFFER use-dired-major-mode significant-buffers clean-significant-buffers less-significant-buffers] 6])
(defalias 'ediff-get-selected-buffers #[nil "\302=\205/ \3031 \304\305!C0\202 \210\306\212db\210\307\310\306\305#\203- \311u\210\304\305! B\202 *\207" [major-mode lis Buffer-menu-mode (error) Buffer-menu-buffer t nil search-backward "\n>" 1] 4])
(defalias 'ediff-unique-buffer-name #[(prefix suffix) "\303 P!\204\f P\207\304\303\305\306\n $!\203 \nT\202 \305\306\n $)\207" [prefix suffix n get-buffer 2 format "%s<%d>%s"] 6])
#@29 Submit bug report on Ediff.
(defalias 'ediff-submit-report #[nil "\306\307!\206\f \310\311 \")\210\312\n \306\211\211 # $ % &\313#\314\315 \210\316 \210\317'!\210\320 \210\321 \210\322c\210\323\324!\203o %\211 (\205R \325(!\205R \304\325(!!)\203Z %q\210\304 \326\327!\210\330\331\332 #\306\321
&\202\302 \333 \210\334\335!\210\336\337!\210%\211 (\205\217 \325(!\205\217 \304\325(!!)\205\302 %\211 (\205\250 \325(!\205\250 \304\325(!!)\203\270 r%q\210\340\341!)\202\302 \342=\206\302 \310)!.\207" [meta-buf-p this-command ediff-control-buffer window-system buffer-name salutation nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" t (ediff-diff-program ediff-diff-options ediff-diff3-program ediff-diff3-options ediff-patch-program ediff-patch-options ediff-shell ediff-use-faces ediff-auto-refine ediff-highlighting-style ediff-buffer-A ediff-buffer-B ediff-control-buffer ediff-forward-word-function ediff-control-frame ediff-control-frame-parameters ediff-control-frame-position-function ediff-prefer-iconified-control-frame ediff-window-setup-function ediff-split-window-function ediff-job-name ediff-word-mode buffer-name ediff-device-type) "\nCongratulations! You may have unearthed a bug in Ediff!\n\nPlease make a concise and accurate summary of what happened\nand mail it to the address above.\n-----------------------------------------------------------\n" ediff-skip-unsuitable-frames ediff-reset-mouse switch-to-buffer erase-buffer delete-other-windows "\nPlease read this first:\n----------------------\n\nSome \"bugs\" may actually be no bugs at all. For instance, if you are\nreporting that certain difference regions are not matched as you think they\nshould, this is most likely due to the way Unix diff program decides what\nconstitutes a difference region. Ediff is an Emacs interface to diff, and\nit has nothing to do with those decisions---it only takes the output from\ndiff and presents it in a way that is better suited for human browsing and\nmanipulation.\n\nIf Emacs happens to dump core, this is NOT an Ediff problem---it is\nan Emacs bug. Report this to Emacs maintainers.\n\nAnother popular topic for reports is compilation messages. Because Ediff\ninterfaces to several other packages and runs under Emacs and XEmacs,\nbyte-compilation may produce output like this:\n\n While compiling toplevel forms in file ediff.el:\n ** reference to free variable pm-color-alist\n ........................\n While compiling the end of the data:\n ** The following functions are not known to be defined:\n xxx, yyy\n ........................\n\nThese are NOT errors, but inevitable warnings, which ought to be ignored.\n\nPlease do not report those and similar things. However, comments and\nsuggestions are always welcome.\n\nMail anyway? (y or n) " y-or-n-p "Mail anyway? " get-buffer require reporter reporter-submit-bug-report "kifer@cs.stonybrook.edu, bug-gnu-emacs@gnu.org" ediff-version bury-buffer beep 1 message "Bug report aborted" ediff-recenter no-rehighlight ediff-quit varlist ediff-device-type ctl-buf reporter-prompt-for-summary-p ediff-msg-buffer buf ediff-KILLED-VITAL-BUFFER] 8 (#$ . 109531) nil])
(defalias 'ediff-choose-syntax-table #[nil "\211\205 \306 !\205 \307\306 !!)\203& rq\210\n\310>?\205\" \311 )\202/ \312=\206/ \313\f!\211?\205a \f\211\205G \306 !\205G \307\306 !!)\203V r\fq\210\311 )\202_ \312=\206_ \313\f!\211\207" [ediff-buffer-A buf major-mode this-command ediff-KILLED-VITAL-BUFFER ediff-syntax-table get-buffer buffer-name (fundamental-mode text-mode indented-text-mode) syntax-table ediff-quit error ediff-buffer-B] 4])
(defalias 'ediff-deactivate-mark #[nil "\300 \207" [deactivate-mark] 1])
(defalias 'ediff-activate-mark #[nil "\302\301!\210\303\211\211\207" [mark-active transient-mark-mode make-local-variable t] 3])
(defalias 'ediff-nuke-selective-display #[nil "\212\214~\210eb\210\304 \305\211 \306=\2036 \307\310\305\306#\2036 \305\210`\311 \210\307\310\306#\203 \312\313!\210\314c\210\202$ \315\n!\210\305\211-\207" [end buffer-read-only mod-p selective-display buffer-modified-p nil t search-forward "
" beginning-of-line delete-char -1 "\n" set-buffer-modified-p] 4])
(defalias 'ediff-save-variables #[(vars) "\301\302\"\207" [vars mapcar #[(v) "\211JB\207" [v] 2]] 3])
(put 'ediff-save-variables 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-restore-variables #[(vars assoc-list) "\205 @\302@ \"AL\210A\211\204 \303\207" [vars assoc-list assoc nil] 5])
(defalias 'ediff-change-saved-variable #[(var value buf-type) " \306\n\"A*J\306\f \"\211 \205
\241*\207" [buf-type ediff-buffer-values-orig-alist alist assoc-list var assoc-elt assoc value] 4])
(defalias 'ediff-save-protected-variables #[nil "\211\205 \306 !\205 \307\306 !!)\203# rq\210\n\310\311 \"*\202, \f\312=\206, \313
!\f
\211\205@ \306 !\205@ \307\306 !!)\203S r
q\210\n\310\311 \"*\202\\ \f\312=\206\\ \313
!\203\223 \211\205u \306 !\205u \307\306 !!)\203\210 rq\210\n\310\311 \"*\202\221 \f\312=\206\221 \313
!\211\205\245 \306 !\205\245 \307\306 !!)\205\332 \211\205\273 \306 !\205\273 \307\306 !!)\203\316 rq\210\n\310\311 \"*\202\327 \f\312=\206\327 \313
!\211\207" [ediff-buffer-A buf ediff-protected-variables vars this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name mapcar #[(v) "\211JB\207" [v] 2] ediff-quit error ediff-buffer-values-orig-A ediff-buffer-B ediff-buffer-values-orig-B ediff-3way-comparison-job ediff-buffer-C ediff-buffer-values-orig-C ediff-ancestor-buffer ediff-buffer-values-orig-Ancestor] 4])
(defalias 'ediff-restore-protected-variables #[nil " \n \f
\211 \205 \306!\205 \307\306!!)\2033 r
q\210\310\f\"\210)\202? \311=\204? \312!\210\211 \205T \306!\205T \307\306!!)\203h rq\210\310 \"\210)\202t \311=\204t \312!\210\203\255 \211 \205\216 \306!\205\216 \307\306!!)\203\241 rq\210\310
\"\210)\202\255 \311=\204\255 \312!\210\211 \205\302 \306!\205\302 \307\306!!)\205\370 \211 \205\333 \306!\205\333 \307\306!!)\203\355 rq\210\310\f\")\202\370 \311=\206\370 \312!,\207" [ediff-buffer-values-orig-A ediff-buffer-values-orig-B ediff-buffer-values-orig-C ediff-buffer-values-orig-Ancestor values-Ancestor values-C get-buffer buffer-name ediff-restore-variables ediff-quit error values-B values-A ediff-buffer-A buf ediff-protected-variables this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-B ediff-3way-comparison-job ediff-buffer-C ediff-ancestor-buffer] 5])
(defalias 'ediff-save-buffer-in-file #[(buffer file) "\211\205 \305 !\205 \306\305 !!)\203 rq\210\307\n!)\207 \310=\206' \311\f!\207" [buffer buf file this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name write-file ediff-quit error] 4])
#@2
(defvar ediff-command-begin-time '(0 0 0) (#$ . 116380))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-command-begin-time put permanent-local t] 4)
(defalias 'ediff-calc-command-time #[nil "\301\232\206 \302\303\304\305!!\"\207" [ediff-command-begin-time (0 0 0) message "Elapsed time: %g second(s)" float-time time-since] 5])
(defalias 'ediff-save-time #[nil "\301 \211\207" [ediff-command-begin-time current-time] 2])
(put 'ediff-save-time 'byte-optimizer 'byte-compile-inline-expand)
#@34 Toggle profiling Ediff commands.
(defalias 'ediff-profile #[nil "\305\306!\206\f \307\310 \")\210\311\312\f\313\232\204* \314 \315\"\210\314\n\316\"\210\317\320\321!\202; \322 \315\323\324$\210\322\n\316\305\324$\210\320\325!*\207" [meta-buf-p this-command post-hook pre-hook ediff-command-begin-time nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" pre-command-hook post-command-hook (0 0 0) remove-hook ediff-save-time ediff-calc-command-time (0 0 0) message "Ediff profiling disabled" add-hook t local "Ediff profiling enabled"] 5 (#$ . 116914) nil])
(defalias 'ediff-print-diff-vector #[(diff-vector-var) "\301\302\303\"!\210\304\305\306!\"\207" [diff-vector-var princ format "\n*** %S ***\n" mapcar #[(overl-vec) "\301\302\303\304\305H\306\"T\305H\307HG\305U\203 \310\202! \311\312\307H\313#\314H\315H\316H&!\207" [overl-vec princ format "Diff %d: Overlay: %S\n Fine diffs: %s\n No-fine-diff-flag: %S\n State-of-diff: %S\n State-of-merge: %S\n" ediff-overlay-get 0 ediff-diff-num 1 "none\n" mapconcat prin1-to-string "\n " 2 3 4] 10] eval] 4])
(defalias 'ediff-debug-info #[nil "\306\307!\206\f \310\311 \")\210\nr\312\f!q\210p\313 \210 \306\211 \314\211 \314 !\315 \210\316\317!\210+\211 \"\211 #\211 $\205K \320$!\205K \321\320$!!)\203[ r#q\210\322 \210)\202f \323=\204f \310%!\210\324\325\326&\"!\210\327\330\331!!\210\327\330\332!!\210\327\330\333!!\210\327\330\334!!\335\"!\210+\207" [meta-buf-p this-command default-directory #1=#:old-dir ediff-debug-buffer buffer-read-only nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer-create kill-all-local-variables t erase-buffer run-hooks temp-buffer-setup-hook get-buffer buffer-name fundamental-mode ediff-quit princ format "\nCtl buffer: %S\n" ediff-print-diff-vector intern "ediff-difference-vector-A" "ediff-difference-vector-B" "ediff-difference-vector-C" "ediff-difference-vector-Ancestor" internal-temp-output-buffer-show buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output buf ediff-KILLED-VITAL-BUFFER ediff-control-buffer] 5 nil nil])
(defalias 'ediff-member #[(elt lis comparison-func) "\203 @\n\"\204 A\211\204 \207" [lis comparison-func elt] 4])
(defalias 'ediff-format-bindings-of #[(func-def) "\303 \304\211$@\211\203 \305\n!\202 \306\307\")\207" [func-def overriding-local-map desc where-is-internal nil key-description format "M-x %s"] 6])
(defalias 'ediff-intersection #[(lis1 lis2 comparison-func) "\304C \203 \305 @\n #\203 @C\244\210 A\211\204 A)\207" [result lis1 lis2 comparison-func a ediff-member] 5])
(defalias 'ediff-union #[(lis1 lis2 comparison-func) "\304C \203 \305 @A\n#\204 @C\244\210 A\211\204 \2039 \305 @A\n#\2042 @C\244\210 A\211\204\" A)\207" [result lis1 comparison-func lis2 a ediff-member] 5])
(defalias 'ediff-set-difference #[(lis1 lis2 comparison-func) "\304C \203' \305 @A\n#\204 \305 @ \n#\204 @C\244\210 A\211\204 A)\207" [result lis1 comparison-func lis2 a ediff-member] 5])
(defalias 'ediff-add-to-history #[(history-var newelt) "\302\303!\203 \303 \"\207 JBL\207" [history-var newelt fboundp add-to-history] 3])
(byte-code "\300\301\302\"\210\303\304!\207" [defalias ediff-copy-list copy-sequence run-hooks ediff-load-hook] 3)
Kontol Shell Bypass