;ELC
;;; Compiled
;;; in Emacs version 26.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 #[128 "\300\207" [nil] 2 "\n\n(fn &rest R)"] 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 #[0 "\302 \210\303\304\305\306!\207" [major-mode mode-name kill-all-local-variables ediff-mode "Ediff" run-hooks ediff-mode-hook] 2 (#$ . 769)])
#@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 (#$ . 1612))
(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 #[0 "\204 \301 \210\302!\207" [ediff-mode-map ediff-setup-keymap use-local-map] 2 (#$ . 1899)])
(defalias 'ediff-reload-keymap #[0 "\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 #[0 "\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-toggle-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 (#$ . 2165)])
#@115
(fn BUFFER-A FILE-A BUFFER-B FILE-B BUFFER-C FILE-C STARTUP-HOOKS SETUP-PARAMETERS &optional MERGE-BUFFER-FILE)
(defalias 'ediff-setup #[2312 "\306\307!\210\310\311 !!\262\310\311!!\262;\203 \310\311!!\262\211;\203P \310\311!!\262\312\313!!\204= \314\315\316\313!!\"\210\312!\203P \317!\203P \314\320\316!\"\210\321\322\323\" \211\205f \324!\205f \325\324!!)\203v r q\210\326!)\202 \327=\206 \314\n!\211\211\205\220 \324!\205\220 \325\324!!)\203 r\211q\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\303!\210\341\203\320 @@@AL\210A\262\202\275 \f\342>\f\343>@\f\344>A
\206\344 @B
\206\354 AC\f\345>D\f\346>E\f\347>F\350\351\352\f!\"\203 \353 \354 \203\355\356\357\360\361$\210\362 G@\203} \363\267\202*\202,\nH I\326\321\364\323\"!\262rq\210\365!\210eb\210\211\211\205Y\324!\205Y\325\324!!)\203gr\211q\210J)\202p \327=\206p\314\n! \210~\210\355\366\367\360\353$\210)\210\360K\nLMN\211O\370 \210\350\371\"\203\242\372\224\372\225O\202\243\373P\372\374P\350\375P\"\206\262\372\360O!S]Q\326\321\376\323\"!RrRq\210\353S)\n\211\205\334\324!\205\334\325\324!!)\203\375r\nq\210T:\203\371T@\377\235\203\371\341T8T)\202 \327=\204\314\n!\210\211\205\324!\205\325\324!!)\203:rq\210T:\2036T@\377\235\2036\341T8T)\202D \327=\204D\314\n!\210B\203\206\211\205[\324!\205[\325\324!!)\203|rq\210T:\203xT@\377\235\203x\341T8T)\202\206 \327=\204\206\314\n!\210I\211\205\230\324!\205\230\325\324!!)\203\331I\211\205\256\324!\205\256\325\324!!)\203\317rIq\210T:\203\313T@\377\235\203\313\341T8T)\202\331 \327=\204\331\314\n!\210\201g \210C\203\351\201h \202\354\201i U\201j \201k \201l L#\201j \201m \201n M#\201j \201o \201p N#EVW\203!XY\202%VY\201q \210X\2043VXL\211\205E\324!\205E\325\324!!)\203\240rLq\210\201r \210\306\201s !\210\211\211\205j\324!\205j\325\324!!)\203xr\211q\210@)\202\201 \327=\204\204\314\n!\203\207\353K\211Z>\204\224\211ZBZ[\203\234\353K)\202\252 \327=\204\252\314\n!\210M\211\205\274\324!\205\274\325\324!!)\203rMq\210\201r \210\306\201s !\210\211\211\205\341\324!\205\341\325\324!!)\203\357r\211q\210@)\202\370 \327=\204\373\314\n!\203\376\353K\211Z>\204 \211ZBZ[\203\353K)\202! \327=\204!\314\n!\210B\203\242N\211\2058\324!\2058\325\324!!)\203\230rNq\210\201r \210\211\211\205W\324!\205W\325\324!!)\203er\211q\210@)\202n \327=\204q\314\n!\203s~\210\306\201s !\210\211Z>\204\206\211ZBZ[\203\221\353K\202\224\360K)\202\242 \327=\204\242\314\n!\210I\211\205\264\324!\205\264\325\324!!)\203\374I\211\205\312\324!\205\312\325\324!!)\203\362rIq\210\201r \210\353K\306\201s !\210\211Z>\204\356\211ZBZ)\202\374 \327=\204\374\314\n!\210U\n #\210\\G]\201t ^\201u \201v !\210\201u \201w !\210B\203-\201u \201x !\210A\203:\201u \201y !\210\201z \n $\210X@ _\201{ _!\205Z\201| _!)XA@ _\201{ _!\205p\201| _!)\341X8 _\201{ _!\205\206\201| _!)\212\201} `!\210b\210)\212\201} a!\210b\210)B\203\260\212\201} b!\210\211b\210)\266\201} c!\210\201~ \210\201 \201\200 \"\210\201\201 !\210\201\202 \210\353K\211dBd\201\203 \210e\211\205\363\324!\205\363\325\324!!)\203\201\204 e\360f#\210\306\201\205 !\210)\202 \327=\204\314\n!\210\207" [buf this-command ediff-KILLED-VITAL-BUFFER window-min-height ediff-job-name ediff-3way-comparison-job 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 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 #s(hash-table size 1 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (default-B 293)) "*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" (" A: " " B: " " C: " " Ancestor: ") 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 ediff-merge-split-window-function 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 ediff-window-A ediff-window-B ediff-window-C ediff-control-window ediff-session-registry ediff-meta-buffer ediff-meta-session-number 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 mapc funcall ediff-arrange-autosave-in-merge-jobs ediff-refresh-mode-lines ediff-update-registry ediff-update-meta-buffer ediff-startup-hook] 18 (#$ . 5826)])
#@49 Set up window for control buffer.
(fn CTL-BUF)
(defalias 'ediff-setup-control-buffer #[257 "\306 \203 \211q\210\202 \307!\210\310\311 \210\312 \210 c\210\313 \210\314 \203& \n\204) \315 \210\316 \210\317\320!\210\321 \210\322 \323\324 \f
\314 \205G \n& \325\322 \326\"\210\314 \203\\ \n\204_ \327 \210eb\210 \320w)\207" [window-min-height ediff-help-message ediff-multiframe ediff-control-window ediff-window-A ediff-window-B 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%S" set-window-dedicated-p t ediff-make-bottom-toolbar ediff-window-C ediff-window-Ancestor ediff-split-window-function ediff-wide-display-p ediff-window-config-saved ediff-whitespace] 11 (#$ . 12298)])
#@26
(fn MERGE-BUFFER-FILE)
(defalias 'ediff-arrange-autosave-in-merge-jobs #[257 "\205p \211;\203
\306\211\n;\203E \307\n!\210\n\262 \211 \205* \310\f!\205* \311\310\f!!)\203: r q\210\312!\210)\202E
\313=\204E \314!\210 \211 \205V \310\f!\205V \311\310\f!!)\203f r q\210\306\315\316!)\207
\313=\206p \314!\207" [ediff-merge-job ediff-autostore-merges ediff-merge-store-file ediff-buffer-C buf this-command t ediff-verify-file-merge-buffer get-buffer buffer-name set-visited-file-name ediff-quit error auto-save-mode 1 ediff-KILLED-VITAL-BUFFER buffer-offer-save] 5 (#$ . 13222)])
#@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 #[0 "\306\307!\206\f \310\311 \")\210\n\211\205 \312 !\205 \313\312 !!)\203, r\nq\210`)\2025 \314=\2065 \315\f!\316
!\317\n!\317+!\317,!\317-!.@.A@\320.8\306\211\211\211\211\211\211\211\211\211\211\211\211;\203k \321!\262;\203w \321!\262;\203\203 \321!\262;\203\217 \321!\262\322\323!\210 /\324/!\205\242 \325/!)\262\f /\324/!\205\264 \325/!)\262\n
/\324/!\205\306 \325/!)\262\f /\324/!\205\330 \325/!)\262 /\324/!\205\352 \326/!)\262 /\324/!\205\374 \326/!)\262
/\324/!\205\326/!)\262\f /\324/!\205 \326/!)\2620\203|\327\f\f\n$\210\330\331\"\262\327\n\n+$\210\330\332\"\2621\203b\327,$\210\330\333\"\2622\203\245\327-$\210\330\334\"\262\202\245\330\n\"\262\330+\"\2621\203\230\330,\"\2622\203\245\330-\"\262\335\336\337\"\210\335\340\337\"\210\335\341\337\"\210\335\342\337\"\210\306342\203\311\202\312#\210 G5\343!\210\343!\210\203\341\343!\210\211\203\351\343!\2101\2036 7\344\211 85W\205\f\34587\"\2108T\2118\202\366*\210\346\347\350\"!\210\351\352!\207" [meta-buf-p this-command ediff-buffer-A buf ediff-KILLED-VITAL-BUFFER ediff-tmp-buffer nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name ediff-quit error 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" "regAncestor" ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-difference-vector-Ancestor delete-file 0 ediff-set-state-of-diff-in-all-buffers ediff-jump-to-difference ediff-diff-at-point A message "" ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-narrow-bounds overl ediff-word-mode ediff-3way-job ediff-merge-with-ancestor-job ediff-killed-diffs-alist ediff-setup-diff-regions-function ediff-number-of-differences ediff-control-buffer ctl-buf n] 28 (#$ . 13820) nil])
#@84 Revert buffers A, B and C. Then rerun Ediff on file A and file B.
(fn NOCONFIRM)
(defalias 'ediff-revert-buffers-then-recompute-diffs #[257 "\306\307!\206\f \310\311 \")\210\n \f
\211 \2051 \312!\2051 \313\312!!)\203D rq\210\314\315 \"\210)\202O \316=\204O \317!\210\211 \205d \312!\205d \313\312!!)\203w rq\210\314\315 \"\210)\202\202 \316=\204\202 \317!\210\211\203\271 \211 \205\233 \312!\205\233 \313\312!!)\203\256 rq\210\314\315 \"\210)\202\271 \316=\204\271 \317!\210\203\342 q\210\320?!\210\321!\210\203\331 \322 #\202\344 \323 \"\202\344 \324 \207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name revert-buffer t ediff-quit error 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 buf ediff-KILLED-VITAL-BUFFER] 15 (#$ . 16169) "P"])
#@142 Bring the highlighted region of all buffers being compared into view.
Reestablish the default window display.
(fn &optional NO-REHIGHLIGHT)
(defalias 'ediff-recenter #[256 "\306\307!\206\f \310\311 \")\210\306 \211 \205! \312\f!\205! \313\312\f!!)\203|
\211 \2056 \312\f!\2056 \313\312\f!!)\203| ,\203U -\211 \205Q \312\f!\205Q \313\312\f!!)\203| .\203p /\211 \205l \312\f!\205l \313\312\f!!)\203| \314
-0$\210\202\212 \315=\204\212 \3161\317\320!\"\210)\321 \210\322 \203\336 9\203\336 29\203\336 \323>\204\264 \324>\203\336 \325\326\3272!\"\204\336 \3303!\203\302 \331\3323!!\210\3304!\203\320 \331\3324!!\210\3305!\203\336 \331\3325!!\210\322 \203,\3336!\203,7\204,6 8\322 \205\3338!\205\3348!\335=)\204,\336\337!\203\3376!\210\202,\3316!\210\3406!\210\336\341!\203,\3416!\21060 \211 \205A\312\f!\205A\313\312\f!!)\203\352
\211 \205V\312\f!\205V\313\312\f!!)\203\352,\203u-\211 \205q\312\f!\205q\313\312\f!!)\203\352\204~\3429!\210\343\344!\210\343\345!\210,\203\217\343\346!\210\211 \211\205\240\312\f!\205\240\313\312\f!!)\203\337r\211q\210\347 \210\322 \203\333:\203\3337\204\3336 8\322 \205\320\3338!\205\320\3348!\335=)\204\333\350 \315=\"\210)\202\352 \315=\204\352\3511!\210\204\361\352 \210\211 \211\205\312\f!\205\313\312\f!!)\203r\211q\210\353 )\202 \315=\206\3511!\207" [meta-buf-p this-command buffer-read-only ediff-buffer-A buf ediff-buffer-B nil ediff-in-control-buffer-p user-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 error ediff-restore-highlighting ediff-refresh-mode-lines ediff-3way-job ediff-buffer-C ediff-merge-with-ancestor-job ediff-ancestor-buffer 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 ediff-current-difference ediff-multiframe] 8 (#$ . 17313) nil])
#@17
(fn BUF-TYPE)
(defalias 'ediff-recenter-one-window #[257 "\306 \211\307Y\205
\nW)\205\216 \310 \311\267\202* @\202+ A@\202+ \312 8\202+ \306 \313\f!\2055 \314\f!)
\315\"A*\316J!\205Q \211J\211\203` \203` \317\"\210\211\203\210 \320!\210\321 \210\322\323\324\306$\323 \325\306$\323\n\324\306 $$\210\320!\266\206\207" [n ediff-current-difference ediff-number-of-differences ediff-narrow-bounds overl ediff-job-name nil 0 selected-window #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 25 B 30 C 36)) 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 ediff-control-buffer ediff-window-alist alist buf-type ediff-windows-job] 16 (#$ . 19848)])
(defalias 'ediff-recenter-ancestor #[0 "\211\205 \306 !\205 \307\306 !!)\205\204 \310 \211\311Y\205\" \n\fW)\205\204 \312!\313
\211\205? \306 !\205? \307\306 !!)\203s rq\210\314\315\316\310$b\210\203o \317!\210\320\314\315\316\310$\314\315\321\310$\314\315\316\310$$\210)\202 \322=\204 \323!\210\317!\266\204\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 this-command ediff-KILLED-VITAL-BUFFER] 13])
#@101 Toggle vertical/horizontal window split.
Does nothing if file-A and file-B are in different frames.
(defalias 'ediff-toggle-split #[0 "\306\307!\206\f \310\311 \")\210\312\n!\205 \n\312 !\205 \312\f!\205# \f\205* \313!\2051 \313!\2058 \313!=\204` \314!\203` \314!\203`
\203q \314!\203` =\204` =\203q \315=\203k \316\202l \315\202u \317\320!\210\321\322!\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-window-C ediff-3way-comparison-job nil ediff-in-control-buffer-p user-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-split-window-function] 8 (#$ . 21354) 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 #[0 "\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 user-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 (#$ . 22163) nil])
#@26 Toggle auto-refine mode.
(defalias 'ediff-toggle-autorefine #[0 "\305\306!\206\f \307\310 \")\210\n\203 \307\311!\210 \312\267\202/ \313\314\f\315\"\210\316\317!\207\316\320!\210\321\211\207\322\f\323\"\210\316\324!\210\325\211\207" [meta-buf-p this-command ediff-word-mode ediff-auto-refine ediff-current-difference nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" "No fine differences in this mode" #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (nix 28 on 39)) 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" nix] 3 (#$ . 23244) nil])
(defalias 'ediff--check-ancestor-exists #[0 "\211\205 \303 !\205 \304\303 !!)\206 \n\203 \305\306!\207\305\307!\207" [ediff-ancestor-buffer buf ediff-merge-with-ancestor-job get-buffer buffer-name user-error "Lost connection to ancestor buffer. This shouldn't happen. Please report this bug to bug-gnu-emacs@gnu.org" "Not merging with ancestor"] 4])
(defalias 'ediff--restore-options-on-exit #[0 "\302\303\"\210\304\305\306\307\"\207" [ediff--show-ancestor-orig ediff-show-ancestor message "Restoring ediff-show-ancestor to %S..." nil remove-hook ediff-quit-hook ediff--restore-options-on-exit] 3])
#@42 Toggle to show/hide the ancestor buffer.
(defalias 'ediff-toggle-show-ancestor #[0 "\304 \210\204 \305\306\307\"\210 ?\211=\203 \310\311\306\307\"\210 \204- \312\n!\210\313 \210\314\315!\207\316 !\211\203: \317\320!!\210\210\313 \210\314\321!\207" [ediff--show-ancestor-orig ediff-show-ancestor ediff-window-Ancestor ediff-ancestor-buffer ediff--check-ancestor-exists add-hook ediff-quit-hook ediff--restore-options-on-exit nil remove-hook delete-window ediff-recenter message "Ancestor buffer is hidden" ediff-get-visible-buffer-window raise-frame window-frame "Showing ancestor buffer"] 5 (#$ . 24589) nil])
#@133 Compute fine diffs. With negative prefix arg, kill fine diffs.
In both cases, operates on the current difference region.
(fn ARG)
(defalias 'ediff-make-or-kill-fine-diffs #[257 "\306\307!\206\f \310\311 \")\210\211\312=\203\276 \n\211\313 \f
\314\f\"A*J H\211 \2056 \315\316\317H\")\210\f
\314\f\"A*J H\317\306I*\210 \320 \f
\314\f\"A*J H\211 \205l \315\316\317H\")\210\f
\314\f\"A*J H\317\306I*\210\205\274 \321 \f
\314\f\"A*J H\211 \205\247 \315\316\317H\")\210\f
\314\f\"A*J H\317\306I*)\207\211\247\203s\211\322W\203s\n\211\313 \f
\314\f\"A*J H\211 \205\353 \315\316\317H\")\210\f
\314\f\"A*J H\317\306I*\210 \320 \f
\314\f\"A*J H\211 \205!\315\316\317H\")\210\f
\314\f\"A*J H\317\306I*\210\205q \321 \f
\314\f\"A*J H\211 \205\\\315\316\317H\")\210\f
\314\f\"A*J H\317\306I*)\207\323 \207" [meta-buf-p this-command ediff-current-difference n buf-type ediff-difference-vector-alist nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" - A assoc mapc ediff-delete-overlay 1 B C 0 ediff-make-fine-diffs alist diff-record ediff-3way-job] 6 (#$ . 25215) "P"])
#@33 Toggle short/long help message.
(defalias 'ediff-toggle-help #[0 "\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 user-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 (#$ . 26422) nil])
#@226 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.
(fn &optional BUF)
(defalias 'ediff-toggle-read-only #[256 "\306\307!\206\f \310\311 \")\210\211?\205 p\312 \313>\203 \314\2022 \312 \315>\203* \316\2022 \312 \317>\2052 \320\2049 \321 \210\204V \211\322\267\202S \n\202T \202T \f\202T
\202T \306\262\211 <\205j \323<!\205j \324\323<!!)\203irq\210\325!\211\205\202 \326!\205\202 \327!=\206\234 \330!\203\221 \331\202\234 \211\203\231 \331\202\234 \332\333!\334!\203 \203 $\204\261 \331\262\202 \335\336!\210\337\340\341\342!\"!\203\366 \211 <\205\325 \323<!\205\325 \324\323<!!)\203\350 rq\210\343\344\306#\210)\202 \345=\204 \346>!\210\202 \331\262\335\336!\210\335\336!\210\347\350!\210\351\352!\210\211\2036\353\354\355!\"\2036\212\356 \357\360\361\362\363!\364\"\365$\216\366\367!!\210\370!\210)\210)\202<\310\371\"\210\205c$?\205c \372=\205c\326!\205c\327!?\205c\335\336!\210\347\373\342!\"\266\203)\202s \345=\206s\346>!\207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer nil ediff-in-control-buffer-p user-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 #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 67 B 71 C 75 Ancestor 79)) 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 error message "Boy, this is risky! Don't modify this file..." sit-for 3 string-match "read-only-mode" symbol-name current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [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" buf ediff-toggle-read-only-function ediff-KILLED-VITAL-BUFFER] 14 (#$ . 27064) nil])
#@12
(fn BUF)
(defalias 'ediff-maybe-checkout #[257 "\303\304!!\305\306!\307!\205F \310\311!\210\312\313\314\315!\"!\205F \211\205. \316!\205. \317\316!!)\203= rq\210\320!)\202F \321=\206F \322\n!\207" [buf 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] 9 (#$ . 29372)])
#@13
(fn FILE)
(defalias 'ediff-file-checked-out-p #[257 "\300\301!?\206 \302!\205 \303\304!\205 \304!\305>\206 \304!;\207" [featurep vc-hooks vc-backend fboundp vc-state (edited needs-merge)] 3 (#$ . 29882)])
#@13
(fn FILE)
(defalias 'ediff-file-checked-in-p #[257 "\300\301!\205\" \302!\303>\205\" \304\305!\205\" \305!\306>?\205\" \305!;?\207" [featurep vc-hooks vc-backend (RCS SCCS) fboundp vc-state (edited needs-merge)] 3 (#$ . 30102)])
#@13
(fn FILE)
(defalias 'ediff-file-compressed-p #[257 "\300\301!\210\302\303 \"\207" [require jka-compr string-match jka-compr-build-file-regexp] 4 (#$ . 30342)])
#@44 Rotate the display of buffers A, B, and C.
(defalias 'ediff-swap-buffers #[0 "\306\307!\206\f \310\311 \")\210\312\n!\203_\312 !\203_\f
=\313 \205. \203H \314\n\"\210\314 \f\"\210\314\"\210\202S \314\n\"\210\314 \f\"\210\203f \202m \203 \202\205 \203\230 \202\237 \203\275 ! !\"#\"#\202\313 !!##\313 \203\352 \203\343 $%$\211%\202\352 %\211%\203\376 \3158@A@E\202&\203A@@\3158E\202A@@D\2030\315'8'@'A@E\202L&\203D'A@'@\315'8E\202L'A@'@D'\203Y\202]'\266&\203\204( )\316\211 *+W\205\202\317*)\"\210*T\211*\202l*\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 user-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 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] 11 (#$ . 30511) nil])
#@93 Toggle wide/regular display.
This is especially useful when comparing buffers side-by-side.
(defalias 'ediff-toggle-wide-display #[0 "\306\307!\206\f \310\311 \")\210\312 \204 \310\313\314\"\210\315\316!\210\n ?\211\204` \211 \211\2055 \317\f!\2055 \320\317\f!!)\203S r\211q\210\321
\"\210\211q\210\306\211\315\316!)\202\221 \322=\206\221 \323!\202\221 \210\211 \211\205u \317\f!\205u \320\317\f!!)\203\207 r\211q\210\306\315\316!)\202\221 \322=\206\221 \323!\207" [meta-buf-p this-command ediff-control-buffer ediff-wide-display-p buf ediff-wide-display-frame nil ediff-in-control-buffer-p user-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 error ediff-wide-display-orig-parameters ediff-window-B ediff-KILLED-VITAL-BUFFER ediff-make-wide-display-function] 5 (#$ . 32124) 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 #[0 "\306C\307 \204\f \310\311\312\"\210\313\267\202T \306\211\314\240\210\315\316!\210\202z \317 \203' \320 \210\n\211\2058 \321 !\2058 \322\321 !!)\203G \323\f!\203G \324\f\306\"\210\325\211\326\240\210\315\327!\210\202z \n\211\205e \321 !\205e \322\321 !!)\203t \323\f!\203t \324\f\306\"\210\325\211\326\240\210\330\300\242\"\210\331\332\333\334\335\336!\337\"\340\341%
\"\210\317 \205\237 \324\342 \306\"\210\343\344!\207" [ediff-window-setup-function ediff-multiframe ediff-control-buffer buf ediff-control-window ediff-session-registry nil ediff-window-display-p user-error "%sEmacs is not running as a window application" "" #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (ediff-setup-windows-multiframe 18 ediff-setup-windows-plain 31)) ediff-setup-windows-plain message "ediff is now in 'plain' mode" ediff-in-control-buffer-p ediff-kill-bottom-toolbar get-buffer buffer-name window-live-p set-window-dedicated-p t ediff-setup-windows-multiframe "ediff is now in 'multiframe' mode" set-default mapc make-byte-code 257 "\211\211\205 \306 !\205 \307\306 !!)\203! r\211q\210\300\242\310\211)\207\f\311=\206* \312
!\207" vconcat vector [buf ediff-window-setup-function ediff-window-B this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name nil ediff-quit error] 4 "\n\n(fn BUF)" selected-window ediff-recenter no-rehighlight] 9 (#$ . 33108) 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 #[0 "\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 user-error "%sEmacs is not running as a window application" #1="" ediff-kill-bottom-toolbar mapc #[257 "\211\211\205 \304!\205 \305\304!!)\203 r\211q\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 "\n\n(fn BUF)"] ediff-in-control-buffer-p ediff-recenter no-rehighlight] 3 (#$ . 34707) nil])
(defalias 'ediff-kill-bottom-toolbar #[0 "\300\207" [nil] 1])
#@24
(fn &optional FRAME)
(defalias 'ediff-make-bottom-toolbar #[256 "\300 \205 \211\206 \301 \262\302\207" [ediff-window-display-p selected-frame nil] 2 (#$ . 35582)])
#@97 Toggle the mode that shows only the merge regions where both variants differ from the ancestor.
(defalias 'ediff-toggle-show-clashes-only #[0 "\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 user-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 (#$ . 35757) nil])
#@76 Toggle the mode that skips the merge regions that differ from the default.
(defalias 'ediff-toggle-skip-changed-regions #[0 "\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 user-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 (#$ . 36380) nil])
#@78 Toggle narrowing in buffers A, B, and C.
Used in ediff-windows/regions only.
(defalias 'ediff-toggle-narrow-region #[0 " =\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 (#$ . 36890) nil])
(defalias 'ediff-visible-region #[0 " =\206 \n=\206 \n =?\205 \204 \f
@
A@\306
8\211 \2055 \307!\2055 \310\307!!)\203g rq\210\311!\203c \312!\205Q \313!) \312!\205` \314!)}\210)\202s \315=\204s \316!\210 \211 \205\207 \307!\205\207 \310\307!!)\203\271 r q\210\311!\203\265 \312!\205\243 \313!) \312!\205\262 \314!)}\210)\202\305 \315=\204\305 \316!\210\205\311!\205\n\211 \205\344 \307!\205\344 \310\307!!)\203r\nq\210\211 \312!\205\372 \313!) \312!\205 \314!)})\202\315=\206\316!\266\203\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 buf overl this-command ediff-KILLED-VITAL-BUFFER ediff-3way-job] 7])
#@22
(fn OPERATION ARG)
(defalias 'ediff-operate-on-windows #[514 "\306!\203\f \306 !\204 \307\310!\210\n\211\205! \311 !\205! \312\311 !!)\203t \f\211\2056 \311 !\2056 \312\311 !!)\203t
\203T \211\205P \311 !\205P \312\311 !!)\203t \203y \203y \211\205p \311 !\205p \312\311 !!)\204y \313 !\210\314 \315\316\"\315\317 \"
\205\223 \205\234 \315\320\f\"\205\245 \315\321
\"\322\n!\210\3231\274 \f\324_!!0\202\300 \210\202\301 \210\322 !\210\3251\330 \f\324_!!0\202\334 \210\202\335 \210\203\374 \322!\210\3261\367 \f\324_!!0\202\373 \210\202\374 \210\203\322!\210\3271\f\324_!!0\202\210\202\210\322 !\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 Ancestor select-window (error) round (error) (error) (error) ediff-buffer-C ediff-merge-with-ancestor-job ediff-show-ancestor ediff-ancestor-buffer ediff-KILLED-VITAL-BUFFER ediff-window-C ediff-window-Ancestor] 18 (#$ . 38101)])
#@189 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.
(fn &optional ARG)
(defalias 'ediff-scroll-vertically #[256 "\306\307!\206\f \310\311 \")\210\312\n!\203 \312 !\204 \313\314!\210\f\211 \205/ \315
!\205/ \316\315
!!)\203\204 \211 \205E \315
!\205E \316\315
!!)\203\204 \203d \211 \205` \315
!\205` \316\315
!!)\203\204 \203\211 \203\211 \211 \205\200 \315
!\205\200 \316\315
!!)\204\211 \317!!\210\320\321 \322>\203\225 \323\202\226 \324\203\246 \325\232\204\246 \326!\202\345 \306\325\327\n!\327 !^ \203\273 \327\"!\202\274 \330^ \203\316 \203\316 \327#!\202\317 \330^\331\245\332$#\262\203\342 \211\331\245\202\343 \211\262\"\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A buf nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-recenter no-rehighlight get-buffer buffer-name error 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-merge-with-ancestor-job ediff-show-ancestor ediff-ancestor-buffer ediff-KILLED-VITAL-BUFFER ediff-window-C ediff-window-Ancestor next-screen-context-lines] 9 (#$ . 39217) "P"])
#@186 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.
(fn &optional ARG)
(defalias 'ediff-scroll-horizontally #[256 "\306\307!\206\f \310\311 \")\210\312\n!\203 \312 !\204 \313\314!\210\f\211 \205/ \315
!\205/ \316\315
!!)\203\204 \211 \205E \315
!\205E \316\315
!!)\203\204 \203d \211 \205` \315
!\205` \316\315
!!)\203\204 \203\211 \203\211 !\211 \205\200 \315
!\205\200 \316\315
!!)\204\211 \317\"!\210\320\321 \322U\203\225 \323\202\226 \324\203\246 \325\232\204\246 \326!\202\344 #\205\344 \327\n!\327 !^$\203\276 \327%!\202\277 \330^ \203\321 \203\321 \331&!\202\322 \330^\332\245\333Z\203\341 \211\332\245\202\342 \211\262\"\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A buf nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-recenter no-rehighlight get-buffer buffer-name error ediff-operate-on-windows ediff-last-command-char 60 #[257 "\211\301\302!)\207" [prefix-arg call-interactively scroll-left] 3 "\n\n(fn ARG)"] #[257 "\211\301\302!)\207" [prefix-arg call-interactively scroll-right] 3 "\n\n(fn ARG)"] - prefix-numeric-value window-width 500 window-height 2 3 ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-merge-with-ancestor-job ediff-show-ancestor ediff-ancestor-buffer ediff-KILLED-VITAL-BUFFER ediff-control-window ediff-3way-comparison-job ediff-window-C ediff-window-Ancestor] 7 (#$ . 40601) "P"])
#@29
(fn BEG END POS JOB-NAME)
(defalias 'ediff-position-region #[1028 "dV\203 d\262\203) \301!?\205d \212\302\303 \304Z!\210\304\305`\"\\\306!\262)\207\307\310 \"\210\301!\203b \311\211\302!\210`V\203Q \211`W\203Q `\262T\262\2027 b\210\312\303 SZ\313]T\304\245!\266b\207" [ediff-windows-job pos-visible-in-window-p move-to-window-line window-height 2 count-lines scroll-up set-window-start selected-window 0 recenter 1] 9 (#$ . 42166)])
#@37
(fn BUF-TYPE &optional N CTL-BUF)
(defalias 'ediff-get-lines-to-region-end #[769 "\204 \262\211\204 \262\211\211\205 \306\n!\205 \307\306\n!!)\203\227 r\211q\210\310\267\202> \202? \f\202?
\202? \202? \311 \312\"A*J\313!\314\315\"\311\211\205i \306\n!\205i \307\306\n!!)\203\210 rq\210W\203\200 \316\"\262\202\203 \317\262)\211\202\223 \320=\206\223 \321!\266\205)\207\320=\206\242 \321!\207" [ediff-current-difference ediff-control-buffer buf ediff-buffer-A ediff-buffer-B ediff-buffer-C get-buffer buffer-name #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 45 B 49 C 53 Ancestor 57)) nil assoc window-start ediff-get-diff-posn end count-lines 0 ediff-quit error ediff-ancestor-buffer ediff-window-alist alist buf-type this-command ediff-KILLED-VITAL-BUFFER] 12 (#$ . 42626)])
#@44
(fn BUF-TYPE &optional DIFF-NUM CTL-BUF)
(defalias 'ediff-get-lines-to-region-start #[769 "\204 \262\211\204 \262\211\211\205 \306\n!\205 \307\306\n!!)\203\236 r\211q\210\310\267\202> \202? \f\202?
\202? \202? \311 \312\"A*J\313!\206Y \313\314\"\315\316#\211\205q \306\n!\205q \307\306\n!!)\203\217 rq\210\211W\203\212 \317e]d^\"\202\213 \320)\202\232 \321=\206\232 \322!\266\204)\207\321=\206\251 \322!\207" [ediff-current-difference ediff-control-buffer buf ediff-buffer-A ediff-buffer-B ediff-buffer-C get-buffer buffer-name #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 45 B 49 C 53 Ancestor 57)) nil assoc window-end t ediff-get-diff-posn beg count-lines 0 ediff-quit error ediff-ancestor-buffer ediff-window-alist alist buf-type this-command ediff-KILLED-VITAL-BUFFER] 12 (#$ . 43498)])
#@40
(fn BUF-TYPE OP &optional N CTL-BUF)
(defalias 'ediff-get-region-size-coefficient #[1026 "\211\206 \211\205 \306 !\205 \307\306 !!)\203\267 r\211\206 q\210\211\204) \n\310Y\2052 \n\fW)\203\264 \311\267\202D \312\202E \313\202E \314\211\315#\316#]
\211\205a \306 !\205a \307\306 !!)\203m \317#\202n \310]\203\227 \203\227 \211\205\213 \306 !\205\213 \307\306 !!)\203\227 \320#\202\230 \310]\211\310V\203\256 #\321\\\322\\\245\202\257 \323\266\202\202\265 \323)\207\324=\206\302 \325!\207" [ediff-control-buffer buf n ediff-current-difference ediff-number-of-differences ediff-buffer-C get-buffer buffer-name 0 #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (scroll-down 60 scroll-up 64)) ediff-get-lines-to-region-start ediff-get-lines-to-region-end #[771 "\300\207" [0] 4 "\n\n(fn A B C)"] A B C Ancestor 0.0 0.0 1 ediff-quit error ediff-merge-with-ancestor-job ediff-show-ancestor ediff-ancestor-buffer this-command ediff-KILLED-VITAL-BUFFER] 11 (#$ . 44386)])
#@111 Advance to the next difference.
With a prefix argument, go forward that many differences.
(fn &optional ARG)
(defalias 'ediff-next-difference #[256 "\306\307!\206\f \310\311 \")\210\n W\203\327 \n\206 \312\\^\306\211\211\313 \210 Y\204D \f!\211\262\204D \314!\262\315!\211\262\204D \316!\210 W\203\317 \211\204\231 \204\231 \204\231
\203\317 \317!\203\317 \320 \321 \"A*JH\322H\323=\204\231 !\324>\203\317 \320 \321 \"A*JH\322H\325=\203\317 T\262\326\327\"\330U\203\253 \331\332\"\210 Y\204D \f!\211\262\204D \314!\262\315!\211\262\204D \316!\210\202D \331\333!\210\334!\207\313 \210\310\335!\207" [meta-buf-p this-command ediff-current-difference ediff-number-of-differences ediff-skip-diff-region-function ediff-ignore-similar-regions nil ediff-in-control-buffer-p user-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" ediff-difference-vector-alist alist buf-type ediff-job-name] 8 (#$ . 45436) "p"])
#@107 Go to the previous difference.
With a prefix argument, go back that many differences.
(fn &optional ARG)
(defalias 'ediff-previous-difference #[256 "\306\307!\206\f \310\311 \")\210\n\312V\203\327 \312\n\206 \313Z]\306\211\211\314 \210\315W\204D !\211\262\204D \316!\262\317!\211\262\204D \320!\210\312V\203\317 \211\204\227 \204\227 \204\227 \f\203\317 \321!\203\317 \322
\323 \"A*JH\324H\325=\204\227 !\326>\203\317 \322
\323 \"A*JH\324H\327=\203\317 \330T\331\"\315U\203\247 \332\333T\"\210S\262\315W\204D !\211\262\204D \316!\262\317!\211\262\204D \320!\210\202D \332\334!\210\335!\207\314 \210\310\336!\207" [meta-buf-p this-command ediff-current-difference ediff-skip-diff-region-function ediff-ignore-similar-regions ediff-difference-vector-alist nil ediff-in-control-buffer-p user-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" alist buf-type ediff-job-name] 8 (#$ . 46899) "p"])
#@137 Go to the difference specified as a prefix argument.
If the prefix is negative, count differences from the end.
(fn DIFFERENCE-NUMBER)
(defalias 'ediff-jump-to-difference #[257 "\304\305!\206\f \306\307 \")\210\211\310W\203 \n\\\202& \211\310V\203% \211S\202& \311\262\211\311Y\2038 \211\nX\2038 \312!\207\313 T\n$\207" [meta-buf-p this-command ediff-number-of-differences ediff-BAD-DIFF-NUMBER nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" 0 -1 ediff-unselect-and-select-difference error] 6 (#$ . 48356) "p"])
#@342 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.
(fn ARG)
(defalias 'ediff-jump-to-difference-at-point #[257 "\306\307!\206\f \310\311 \")\210\312 \313>\203 \314\202, \312 \315>\203$ \316\202, \312 \317>\205, \320\211\321\267\202B \n\202C \202C \f\202C
\202C \306\211 $\211\205W \322$!\205W \323\322$!!)\203d r\211q\210`)\202n \324=\206n \325%!\326\306\205w \327#&W\211\203\256 \211 $\205\224 \322$!\205\224 \323\322$!!)\203\241 rq\210d)\202\264 \324=\206\264 \325%!\202\264 \330\331S#\306\211\211\211\211\203\305 \332\333!\210\202\312 \332!\210\334 \262'\262(\262)\262 \205\204 \211 $\205\364 \322$!\205\364 \323\322$!!)\203r q\210 Z\262)\202 \324=\204\325%!\210\335!\210\203 db\210\3361-\211\206'\337[u0\2021\210\2022\210\340 \210\335!\210\203Adb\210\3411P\211\206J\337[u0\202T\210\202U\210\340 \210\342!\203\201\335!\210\203jdb\210\3431y\211\206s\337[u0\202}\210\202~\210\340 \210\335!\207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" ediff-last-command-char (97 65) A (98 66) B (99 67) C #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 50 B 54 C 58 Ancestor 62)) get-buffer buffer-name ediff-quit error 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) buf ediff-KILLED-VITAL-BUFFER ediff-number-of-differences ediff-window-A ediff-window-B ediff-window-C] 16 (#$ . 48932) "P"])
#@42
(fn BUF-TYPE &optional POS WHICH-DIFF)
(defalias 'ediff-diff-at-point #[769 "\306\267\202 \202 \202 \n\202 \202 \307\f
S\310\311\211\211\211\211 \2054 \312!\2054 \313\312!!)\203\317 rq\210 \206C `\262\n W\204S V\203} W\203} T\262\262\211\262\314 \315\n$\262\314 \316\n$\262\202E \317>\203\226 V\203\226 U\203\226 T\262\320=\203\242 T\202\313 \321=\203\255 \202\313 \322\323 e]\"!\322\323\fe]\"!W\203\311 \202\313 T)\202\332 \324=\206\332 \325!\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-control-buffer ediff-number-of-differences #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 6 B 10 C 14 Ancestor 18)) nil -1 0 get-buffer buffer-name ediff-get-diff-posn beg end (after before) after before abs count-lines ediff-quit error buf this-command ediff-KILLED-VITAL-BUFFER] 18 (#$ . 50870)])
#@665 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.
(fn ARG &optional KEYS)
(defalias 'ediff-diff-to-diff #[513 "\304\305!\206\f \306\307 \")\210\211\204 \310 \262\311=\203 \312\262\247\203( \313!\210\211\314H\315H\316!\316!\304\317 \320>\203B \321\202S \322>\203L \323\202S \324>\205S \325\320>\203] \321\202n \322>\203g \323\202n \324>\205n \325#\210\326 )\207" [meta-buf-p this-command ediff-verbose-p ediff-current-difference nil ediff-in-control-buffer-p user-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] 11 (#$ . 51812) "P"])
#@131 Copy ARGth difference region from buffer A to B.
ARG is a prefix argument. If nil, copy the current difference region.
(fn ARG)
(defalias 'ediff-copy-A-to-B #[257 "\300\301\"\207" [ediff-diff-to-diff "ab"] 4 (#$ . 53103) "P"])
#@131 Copy ARGth difference region from buffer B to A.
ARG is a prefix argument. If nil, copy the current difference region.
(fn ARG)
(defalias 'ediff-copy-B-to-A #[257 "\300\301\"\207" [ediff-diff-to-diff "ba"] 4 (#$ . 53340) "P"])
#@138 Copy ARGth difference region from buffer A to buffer C.
ARG is a prefix argument. If nil, copy the current difference region.
(fn ARG)
(defalias 'ediff-copy-A-to-C #[257 "\300\301\"\207" [ediff-diff-to-diff "ac"] 4 (#$ . 53577) "P"])
#@138 Copy ARGth difference region from buffer B to buffer C.
ARG is a prefix argument. If nil, copy the current difference region.
(fn ARG)
(defalias 'ediff-copy-B-to-C #[257 "\300\301\"\207" [ediff-diff-to-diff "bc"] 4 (#$ . 53821) "P"])
#@131 Copy ARGth difference region from buffer C to B.
ARG is a prefix argument. If nil, copy the current difference region.
(fn ARG)
(defalias 'ediff-copy-C-to-B #[257 "\300\301\"\207" [ediff-diff-to-diff "cb"] 4 (#$ . 54065) "P"])
#@131 Copy ARGth difference region from buffer C to A.
ARG is a prefix argument. If nil, copy the current difference region.
(fn ARG)
(defalias 'ediff-copy-C-to-A #[257 "\300\301\"\207" [ediff-diff-to-diff "ca"] 4 (#$ . 54302) "P"])
#@75
(fn N FROM-BUF-TYPE TO-BUF-TYPE &optional BATCH-INVOCATION REG-TO-COPY)
(defalias 'ediff-copy-diff #[1283 "\306\267\202 \202 \202 \n\202 \202 \307\f\310
\307\211 '\307\211\211\311 \312\n$\262\311 \313\n$\262\203B \307\262\f\202L \314
#\262 \314
\f %\262 \230\203e \307\262\202\352 \204s \315
\f\"\203\352 \3161\317 \211 (\205\214 \317(!\205\214 \320\317(!!)\203\260 rq\210)? *\211b\210c\210\211V\203\254 \321\"\210*\202\274 +\322=\204\274 \323,!\210 \206\313 \324
\f#\211\2620\202\351 \325\326@\327\330A\331##\210\332\333!\210\334\335!\210\307\211\262\262\210\203\371 \203\371 \336
\"\210 \203\321\f\211 -\337 . -./ 0 .\340.0\"A*J-H\211 1\205)\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*\210-\343 . -./ 0 .\340.0\"A*J-H\211 1\205l\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*\210
\205\315-\344 . -./ 0 .\340.0\"A*J-H\211 1\205\263\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*)\202\212\203\252\203\252\f\211 -\337 . -./ 0 .\340.0\"A*J-H\211 1\205\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*\210-\343 . -./ 0 .\340.0\"A*J-H\211 1\205G\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*\210
\205\250-\344 . -./ 0 .\340.0\"A*J-H\211 1\205\216\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*)\210\345 \210\203\206\204\206\f\211 -\337 . -./ 0 .\340.0\"A*J-H\211 1\205\340\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*\210-\343 . -./ 0 .\340.0\"A*J-H\211 1\205#\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*\210
\205\204-\344 . -./ 0 .\340.0\"A*J-H\211 1\205j\341\3421\333H\")\210./ 0 .\340.0\"A*J-H\333\307I*)\210\325\346\")\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-control-buffer ediff-3way-job #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 6 B 10 C 14 Ancestor 18)) nil t 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 A assoc mapc ediff-delete-overlay B C ediff-refresh-mode-lines "%s" ediff-verbose-p buf buffer-read-only inhibit-read-only this-command ediff-KILLED-VITAL-BUFFER n buf-type ediff-difference-vector-alist alist diff-record] 22 (#$ . 54538)])
#@23
(fn N BUF-TYPE REG)
(defalias 'ediff-save-diff-region #[771 "\306\"\307\267\202 \202 \n\202 \202 \f\202 \310\306A\"\211\203+ \211\241\210\202A \2039 BC\244\210\202A BDB\311\312T
\203P \313\202U \314 !\227$\207" [ediff-killed-diffs-alist ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-merge-job assoc #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 10 B 14 C 18 Ancestor 22)) nil message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" "" symbol-name] 12 (#$ . 57044)])
#@19
(fn N BUF-TYPE)
(defalias 'ediff-test-save-region #[514 "\305\"\306\267\202 \202 \n\202 \202 \f\202 \307\305A\"\211\203; \310\311\312T#!\2035 \313\202< \314\315!\202< \313\207" [ediff-killed-diffs-alist ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer assoc #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 10 B 14 C 18 Ancestor 22)) nil yes-or-no-p format-message "You've previously copied diff region %d to buffer %S. Confirm? " t error "Quit"] 10 (#$ . 57633)])
#@72 Pop last killed Nth diff region from buffer BUF-TYPE.
(fn N BUF-TYPE)
(defalias 'ediff-pop-diff #[514 "\306\"\307\267\202 \202 \n\202 \202 \f\202 \310\306A\"
&\310\211 '\310\211\211A\2038 A\262\202P (\311V\203K \312\313\fT\f#\210\202P \314)!\210\315\n\316
&$\262\315\n\317
&$\262\3201\265 \211 *\205 \321*!\205 \322\321*!!)\203\246 rq\210+? ,b\210c\210V\203\236 \323\"\210\324\211\262*\202\261 -\325=\206\261 \314.!0\202\306 \326\327@\330\331A\332##\210\333\334!\262\210\211\203\234\n\211 /\335 0 /01 2 0\30602\"A*J/H\211 3\205\366 \336\3373\334H\")\21001 2 0\30602\"A*J/H\334\310I*\210/\340 0 /01 2 0\30602\"A*J/H\211 3\2059\336\3373\334H\")\21001 2 0\30602\"A*J/H\334\310I*\210
\205\232/\341 0 /01 2 0\30602\"A*J/H\211 3\205\200\336\3373\334H\")\21001 2 0\30602\"A*J/H\334\310I*)\210\203\253\211\203\253\342 \"\210\343 \210\211\205\302\344\n\"\262 \326\345\fT\f#)\207" [ediff-killed-diffs-alist ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-3way-job assoc #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 10 B 14 C 18 Ancestor 22)) nil 0 user-error "Nothing saved for diff %d in buffer %S" error 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 A mapc ediff-delete-overlay B C ediff-set-state-of-diff-in-all-buffers ediff-refresh-mode-lines delq "Diff region %d in buffer %S restored" ediff-control-buffer ediff-verbose-p ediff-number-of-differences ediff-NO-DIFFERENCES buf buffer-read-only inhibit-read-only this-command ediff-KILLED-VITAL-BUFFER n buf-type ediff-difference-vector-alist alist diff-record] 20 (#$ . 58180)])
#@282 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)
(fn ARG &optional KEY)
(defalias 'ediff-restore-diff #[513 "\304\305!\206\f \306\307 \")\210\247\203 \310!\210\311\n\206 \312 \313>\203( \314\202C \206. \312 \315>\2037 \316\202C \206= \312 \317>\205C \320\"\210\304\321 )\207" [meta-buf-p this-command ediff-current-difference ediff-verbose-p nil ediff-in-control-buffer-p user-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] 6 (#$ . 59990) "P"])
#@112 Restore ARGth diff in the merge buffer.
ARG is a prefix argument. If nil, restore the current diff.
(fn ARG)
(defalias 'ediff-restore-diff-in-merge-buffer #[257 "\300\301\"\207" [ediff-restore-diff 99] 4 (#$ . 60784) "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 #[0 "\306\307!\206\f \310\311 \")\210\312\211\211\306\211\211\n =\203! \313 \314=\204. \n\f=\2038 \313 \315=\2038 \316\317!\210\320\211\202-\313 \315=\203\263 \f\321\322\323
\"!\262\321\322\324\"\"!\262#\203` \321\322\325$\"!\262%\326=\203s \327\262\330\262\331\262\202| \330\262\327\262\326\262\332\322\333\"!\203\215 \316\334\"\210\202\225 \211%\316\334\"\210\312\230\204\235 \312\230\204\246 \"\312\230\206-\211$\202-\313 \314=\205- \321\322\335&\"!\262\321\322\336'\"!\262#\203\334 \321\322\337(\"!\262)\326=\203\357 \327\262\330\262\331\262\202\370 \330\262\327\262\326\262\332\322\340\"!\203 \316\341\"\210\202\211)\316\341\"\210\312\230\204&\312\230\204#'\312\230\206-\211(\207" [meta-buf-p this-command ediff-skip-diff-region-function ediff-focus-on-regexp-matches-function ediff-hide-regexp-matches-function ediff-regexp-hide-A nil ediff-in-control-buffer-p user-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" 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] 10 (#$ . 61017) nil])
(defalias 'ediff-toggle-skip-similar #[0 "\304\305!\206\f \306\307 \")\210\n\310=\204 \311\312!\210 ?\211\203# \313\314!\207\313\315!\207" [meta-buf-p this-command ediff-auto-refine ediff-ignore-similar-regions nil ediff-in-control-buffer-p user-error "%S: This command runs in Ediff Control Buffer only!" on error "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])
#@462 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.
(fn N)
(defalias 'ediff-focus-on-regexp-matches #[257 "\211\211\204 \306Y\205 \nW)\205 \f
\211 \205/ \307!\205/ \310\307!!)\203W rq\210\214\311\312\313$\311\312\314$}\210eb\210\315\316\317#*\202b \320=\206b \321!\211 \205w \307!\205w \310\307!!)\203\237 rq\210\214\311\322\313$\311\322\314 $}\210eb\210\315\316\317#*\202\252 \320=\206\252 \321!\205\367 \211 \205\304 \307!\205\304 \310\307!!)\203\354 r q\210\214\311\323\313 $\311\323\314\n\n$}\210eb\210\315\316\317#*\202\367 \320=\206\367 \321!\324\203 F\202 E!?\266\207\207" [n ediff-current-difference ediff-number-of-differences ediff-control-buffer ediff-regexp-focus-A ediff-regexp-focus-B 0 get-buffer buffer-name ediff-get-diff-posn A beg end re-search-forward nil t ediff-quit error B C eval ediff-regexp-focus-C ediff-buffer-A buf this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-B ediff-3way-comparison-job ediff-buffer-C ediff-focus-regexp-connective] 14 (#$ . 63581)])
#@418 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.
(fn N)
(defalias 'ediff-hide-regexp-matches #[257 "\211\211\204 \306Y\205 \nW)\205 \f
\211 \205/ \307!\205/ \310\307!!)\203W rq\210\214\311\312\313$\311\312\314$}\210eb\210\315\316\317#*\202b \320=\206b \321!\211 \205w \307!\205w \310\307!!)\203\237 rq\210\214\311\322\313$\311\322\314 $}\210eb\210\315\316\317#*\202\252 \320=\206\252 \321!\205\367 \211 \205\304 \307!\205\304 \310\307!!)\203\354 r q\210\214\311\323\313 $\311\323\314\n\n$}\210eb\210\315\316\317#*\202\367 \320=\206\367 \321!\324\203 F\202 E!\266\207\207" [n ediff-current-difference ediff-number-of-differences ediff-control-buffer ediff-regexp-hide-A ediff-regexp-hide-B 0 get-buffer buffer-name ediff-get-diff-posn A beg end re-search-forward nil t ediff-quit error B C eval ediff-regexp-hide-C ediff-buffer-A buf this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-B ediff-3way-comparison-job ediff-buffer-C ediff-hide-regexp-connective] 14 (#$ . 65065)])
#@531 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.
(fn REVERSE-DEFAULT-KEEP-VARIANTS)
(defalias 'ediff-quit #[257 "\305\306!\206\f \307\310 \")\210p\311 \312\313\314\315 \211 \205' \316\f!\205' \317\316\f!!)\203/ \320\2020 \321\"!\203B \322\321!\210q\210\323!\202M \324!\210\325!\210\322\321!)\207" [meta-buf-p this-command minibuffer-auto-raise ediff-meta-buffer buf nil ediff-in-control-buffer-p user-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] 10 (#$ . 66496) "P"])
#@38
(fn REVERSE-DEFAULT-KEEP-VARIANTS)
(defalias 'ediff-really-quit #[257 "\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
\322\3236\"7\324 \205e 8\323=\205e \3259!\203U \3269!\202e \325:!\203c \326:!\202e \327 \3301\250 ;\211 <\205~ \331<!\205~ \332\331<!!)\203\231 r;q\210\333=\"=\334\335!\210\334\336!)\202\244 >\337=\206\244 \340?!0\202\254 \210\202\255 \210\3411\360 @\211 <\205\306 \331<!\205\306 \332\331<!!)\203\341 r@q\210\333=\"=\334\335!\210\334\336!)\202\354 >\337=\206\354 \340?!0\202\364 \210\202\365 \210\34218A\211 <\205\331<!\205\332\331<!!)\203)rAq\210\333=\"=\334\335!\210\334\336!)\2024>\337=\2064\340?!0\202<\210\202=\210\3431\200B\211 <\205V\331<!\205V\332\331<!!)\203qrBq\210\333=\"=\334\335!\210\334\336!)\202|>\337=\206|\340?!0\202\204\210\202\205\210\333\fC\"C\344 \210\345 \210\3461\244D\347>\205\240\350\351!0\202\250\210\202\251\210\350\352!\210\353\354\203\272E?\202\274E\"\210\350\355!\210\356\357#\210\360 \206\316\211\262\324 \203\346\361!\203\3468\203\346\362\363\364#\210\317\365\"\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 #[257 "\300!\205 \301!\207" [ediff-overlayp ediff-delete-overlay] 3 "\n\n(fn OVERL)"] #[257 "\300!\205 \301!\207" [ediff-overlayp ediff-delete-overlay] 3 "\n\n(fn OVERL)"] remq t ediff-window-display-p 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 funcall ediff-after-quit-hook-internal ediff-meta-session-number ediff-grab-mouse ediff-window-A ediff-window-B 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 ediff-keep-variants] 11 (#$ . 67614)])
(defalias 'ediff-good-frame-under-mouse #[0 "\300 @\301\302\211\303!\262\211\203 \262\304\305\306!!!\262\307\310\"?\205$ \207" [mouse-position "" nil frame-live-p buffer-name window-buffer frame-selected-window string-match "Minibuf"] 8])
(defalias 'ediff-delete-temp-files #[0 ";\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 #[0 " \n \306!\f
\307!\203 \310!\202\" \307 !\205\" \310 ! \211 \211 \205: \311 !\205: \312\311 !!)\205D \313\311 !!)\210 \211 \211 \205^ \311 !\205^ \312\311 !!)\205h \313\311 !!)\210 \211 \211 \205\202 \311 !\205\202 \312\311 !!)\205\214 \313\311 !!)\210!\211 \211 \205\246 \311 !\205\246 \312\311 !!)\205\260 \313\311 !!)\210\"\211 \211 \205\312 \311 !\205\312 \312\311 !!)\205\324 \313\311 !!)\210#\211 \211 \205\356 \311 !\205\356 \312\311 !!)\205\370 \313\311 !!)\210$\211 \211 \205\311 !\205\312\311 !!)\205 \313\311 !!)\210\314\315!\203H
\211 \211 \205<\311 !\205<\312\311 !!)\205F\313\311 !!)\210\316 \203Z\317!\203Z\320!\210\202d\307!\203d\321!\210\316 \203n%\204q\322 \210\211 \211 \205\210\311 !\205\210\312\311 !!)\205\222\313\311 !!)\210\317!\203\236\323!\210\3241\261\306!\206\255\325!0\202\265\210\202\266\210\3261\355\306!\206\351\306!\203\345\211 \205\335\311 !\205\335\312\311 !!)\203\345& \210\325!0\202\361\210\202\362\210\2038\32713\306!\206/\306!\204\306!\203+\211 \205#\311 !\205#\312\311 !!)\203+& \210\325!0\2027\210\2028\210\330 \210\331\332!\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer ediff-control-frame ediff-3way-job 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-window-A ediff-window-B 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] 12])
#@534 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.
(fn ASK KEEP-VARIANTS)
(defalias 'ediff-janitor #[514 "\305\306$\210\305 \307$\210\n\203 \305 \310$\207\305\f\311$\207" [ediff-buffer-A ediff-buffer-B ediff-merge-job ediff-ancestor-buffer ediff-buffer-C ediff-dispose-of-variant-according-to-user A B Ancestor C] 7 (#$ . 72644)])
#@40
(fn BUFF BUFFTYPE ASK KEEP-VARIANTS)
(defalias 'ediff-dispose-of-variant-according-to-user #[1028 "\211\205 \304!\205 \305\304!!)\203\337 \211\205& \304!\205& \305\304!!)\2033 rq\210 )\202< \n\306=\204? \307 !\203\337 \310!\311!\312!\313!\203i \211\205` \304!\205` \305\304!!)\203i \314\"\210\211\205{ \304!\205{ \305\304!!)\203\214 rq\210\315\316!\210)\202\226 \n\306=\204\226 \307 !\210\211\211\205\252 \304!\205\252 \305\304!!)\205\263 \317\304!!)\210\211\205\306 \304!\205\306 \305\304!!)\203\325 rq\210\315!)\202\336 \n\306=\206\336 \307 !\207\211\205\360 \304!\205\360 \305\304!!)?\206.\211\206.\312!\206.\203\320\321\322\305!#!?\206.\211\211\205$\304!\205$\305\304!!)\205-\317\304!!)\207" [buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER 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]? "] 11 (#$ . 73450)])
#@708 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.
(fn &optional SAVE-AND-CONTINUE)
(defalias 'ediff-maybe-save-and-delete-merge #[256 "\203 \306\202\n \211\205x \211;\203 \307\n\310$\202x \306=\2031 \311\312!\262\307\n\313$\202x \211 \205B \314\f!\205B \315\314\f!!)\205x \211 \205W \314\f!\205W \315\314\f!!)\203i r q\210\313 \316>*\202t \317=\204w \320!\205x \313)\207" [ediff-merge-store-file ediff-autostore-merges ediff-buffer-C ediff-meta-buffer buf metajob 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 ediff-metajob-name this-command ediff-KILLED-VITAL-BUFFER] 8 (#$ . 74530)])
#@55
(fn BUF FILE &optional SHOW-FILE SAVE-AND-CONTINUE)
(defalias 'ediff-write-merge-buffer-and-maybe-kill #[1026 "\306!=\204N \307\310\"\311 \210\312\313\"\210r\314 !q\210p\315 \210\316\211\317\211\317 &\320 \210\321\322!\210+\211 '\323\324!\210\323!\210\323\324!\210\325!\210)\266\326\327!\207\211 (\205b \330(!\205b \331\330(!!)\203\354 rq\210\332!\203y \333\307\334\"!\205\352 \211 (\205\215 \330(!\205\215 \331\330(!!)\203\240 rq\210\335!\210\336 \210)\202\254 )\337=\204\254 \340*!\210\203\275 \312\341\"\210\342\316!\210\326\343!\210\211?\205\352 \333\344!\205\352 \211 (\211 (\205\337 \330(!\205\337 \331\330(!!)\205\351 \345\330(!!))\207)\337=\206\367 \340*!\207" [default-directory ediff-msg-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks 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 inhibit-read-only standard-output buf this-command ediff-KILLED-VITAL-BUFFER] 10 (#$ . 76051)])
(defalias 'ediff-default-suspend-function #[0 " \n\306!\306!\306!\307\303!\205 \307\304!\205 \f
\310 \2035 \311!\2035 \312!\210\2028 \313 \210\203@ \313!\210\203H \313!\210\203P \313!\210\211\203X \313!\210\203a \313!\210\203i \313!\210\314 !\203~ \315 !\210\316 \210\313 \210\202\236 \211 \205\223 \317!\205\223 \320\317!!)\203\236 q\210\313 \210\314!\203\263 \315!\210\316 \210\313 \210\202\323 \n\211 \205\310 \317!\205\310 \320\317!!)\203\323 \nq\210\313 \210\314!\203\347 \315!\210\316 \210\313 \202 \211 \205\374 \317!\205\374 \320\317!!)\205 q\210\313 \207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-patchbufer ediff-patch-diagnostics ediff-error-buffer ediff-get-visible-buffer-window boundp ediff-window-display-p frame-live-p iconify-frame bury-buffer window-live-p select-window delete-other-windows get-buffer buffer-name ediff-diff-buffer ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-control-frame buf] 16])
#@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 #[0 "\302\303!\206\f \304\305 \")\210\306\307!\210\310\311!\207" [meta-buf-p this-command nil ediff-in-control-buffer-p user-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 (#$ . 78490) 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 #[0 "\306\307!\206\f \310\311 \")\210\212\312 \210)\nr\313 !q\210p\314 \210\306\211\315\211@\315 A B\316 \210\317\320!\210+\211 C\211 D\211\205L \321D!\205L \322\321D!!)\203\\ rCq\210\323 \210)\202g \324=\204g \325E!\210\326 \210\327\330 !\210\327\331!\210F\211 D\205\210 \321D!\205\210 \322\321D!!)\203\253 rFq\210
\203\237 \327\332\333
\"!\210\202\247 \327\332\334\322 \"!\210)\202\266 \324=\204\266 \325E!\210G\211 D\205\313 \321D!\205\313 \322\321D!!)\203\356 rGq\210
\203\342 \327\332\335
\"!\210\202\352 \327\332\336\322 \"!\210)\202\371 \324=\204\371 \325E!\210H\203AI\211 D\205\321D!\205\322\321D!!)\2036rIq\210
\203*\327\332\337
\"!\210\2022\327\332\340\322 \"!\210)\202A \324=\204A\325E!\210\327\332\341J\211 D\205Y\321D!\205Y\322\321D!!)\203f\342\322J!P\202g\343\"!\210\327\332\344K\211 D\205\202\321D!\205\202\322\321D!!)\203\217\342\322K!P\202\220\343\"!\210F\211 D\205\250\321D!\205\250\322\321D!!)\203\272rFq\210\345e`\"T)\202\304 \324=\206\304\325E!G\211 D\205\331\321D!\205\331\322\321D!!)\203\353rGq\210\345e`\"T)\202\365 \324=\206\365\325E!\306\327\346\347\"!\210\327\346\350\"!\210H\203CI\211 D\205 \321D!\205 \322\321D!!)\2030rIq\210\345e`\"T)\202: \324=\206:\325E!\262\327\346\351\"!\210\266\327\332\352L\353W\203S\354\202bLMY\203_\355\202bLT\"!\210\327\332\356N\203q\357\202r\360\"!\210O\203\203P\203\203\327\361!\210Q\203\221O\203\221\327\362!\210R\363=\203\237\327\364!\210\202\331RS=\203\272\327\365!\210\327\346\366TUV$!\210\202\331RW=\203\325\327\367!\210\327\346\366XYZ$!\210\202\331\327\370!\210\327\346\371\372\373!\"!\210\374!\210)\266\375[!\203\365\376[!\210\377\\!\205\201] \\!\207" [meta-buf-p this-command default-directory ediff-msg-buffer buffer-read-only buffer-file-name nil ediff-in-control-buffer-p user-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 error 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 buffer-undo-list inhibit-modification-hooks inhibit-read-only 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 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 select-window] 10 (#$ . 79014) nil])
#@10
(fn N)
(defalias 'ediff-select-difference #[257 "\211\205 \306 !\205 \307\306 !!)\205\235 \n\211\205& \306 !\205& \307\306 !!)\205\235 \211\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\211\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] 7 (#$ . 83062)])
#@10
(fn N)
(defalias 'ediff-unselect-difference #[257 "\211\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] 7 (#$ . 83875)])
#@37
(fn N &optional FLAG NO-RECENTER)
(defalias 'ediff-unselect-and-select-difference #[769 "\211\204\n \302\303!\210) \304\305\306\307\310!\311\"\312$\216\313=\204\" \314!\210\315=\204, \316!\210\211)\207" [ediff-current-difference ediff-control-buffer ediff-recenter no-rehighlight make-byte-code 0 "\300\211\205 \304 !\205 \305\304 !!)\203 r\300q\210\306 )\207\n\307=\206& \310 !\207" vconcat vector [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] 10 (#$ . 84729)])
#@19
(fn N BUF-TYPE)
(defalias 'ediff-highlight-diff-in-one-buffer #[514 "\211\306\267\202 \202 \202 \n\202 \202 \307\211 \205' \310\f!\205' \311\310\f!!)\205\302 \211\312\267\202A \202B \202B \n\202B \202B \307\211 \211\205S \310\f!\205S \311\310\f!!)\203` r\211q\210d)\202j
\313=\206j \314!\315\316#\315\317#\232\203\200 \320\202\201 \321\\^ \322\"A*J\323\n$\210\324\325 #\210\326 \322\"A*J\nH\321H\307\"\266\207\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf this-command #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 6 B 10 C 14 Ancestor 18)) nil get-buffer buffer-name #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 49 B 53 C 57 Ancestor 61)) 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 ediff-KILLED-VITAL-BUFFER ediff-current-diff-overlay-alist alist buf-type ediff-difference-vector-alist] 15 (#$ . 85356)])
#@17
(fn BUF-TYPE)
(defalias 'ediff-unhighlight-diff-in-one-buffer #[257 "\211\306\267\202 \202 \202 \n\202 \202 \307\211 \205' \310\f!\205' \311\310\f!!)\205\213 \211
\312\"A*J \312\"A*JH\313H\314\315\211#\210\316\317 \205\210 \205\210 \205\210 \211 \320!\203z \202| \312\"A,\"\266\202\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf ediff-current-diff-overlay-alist #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 6 B 10 C 14 Ancestor 18)) nil get-buffer buffer-name assoc 0 ediff-move-overlay 1 ediff-set-overlay-face ediff-has-face-support-p cl-oddp alist buf-type ediff-difference-vector-alist ediff-current-difference ediff-use-faces ediff-highlight-all-diffs dif-num ediff-even-diff-face-alist ediff-odd-diff-face-alist] 9 (#$ . 86428)])
#@17
(fn BUF-TYPE)
(defalias 'ediff-unhighlight-diffs-totally-in-one-buffer #[257 "\305\306!\210\307 \205/ \205/ \310\211\n \311\f \"A*\211J\312\313!\210\314!\203) \315!\210\316L)\266\202\207" [ediff-use-faces inhibit-quit ediff-current-diff-overlay-alist alist buf-type ediff-unselect-and-select-difference -1 ediff-has-face-support-p t assoc ediff-paint-background-regions unhighlight ediff-overlayp ediff-delete-overlay nil] 5 (#$ . 87299)])
#@59 Put face on diff N. Invoked for X displays only.
(fn N)
(defalias 'ediff-highlight-diff #[257 "\300\301\"\210\300\302\"\210\300\303\"\210\300\304\"\207" [ediff-highlight-diff-in-one-buffer A B C Ancestor] 4 (#$ . 87753)])
#@43 Remove overlays from buffers A, B, and C.
(defalias 'ediff-unhighlight-diff #[0 "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [ediff-unhighlight-diff-in-one-buffer A B C Ancestor] 2 (#$ . 87987)])
(defalias 'ediff-unhighlight-diffs-totally #[0 "\300\301!\210\300\302!\210\300\303!\210\300\304!\207" [ediff-unhighlight-diffs-totally-in-one-buffer A B C Ancestor] 2])
#@23
(fn FUN &rest BODY)
(defalias 'ediff-minibuffer-with-setup-hook '(macro . #[385 "\300\301\302BBBBB\207" [if (fboundp 'minibuffer-with-setup-hook) minibuffer-with-setup-hook] 7 (#$ . 88368)]))
#@58
(fn PROMPT DEFAULT-DIR DEFAULT-FILE &optional NO-DIRS)
(defalias 'ediff-read-file-name #[1027 "\301\302\303\206 \203 \304!\206 !!!\262\203 \305!\262\306\230\203) \307\262\310\311!\2058 \311\2056 C\"\307\310\312!\203\242 \313\314\315\316\317!\320\"\321$\307C\211\313\314\322\316\317\"\323\"\324$\240\210\313\314\325\316\317!\326\"\324$\216\327\330\242\"\210\331\332\333\n \203\202 \334\n\335Q\202\207 \334 \335Q#\206\221 \336\n\205\233 \304 !%)\266\202\202\316 \331\332\333\203\264 \334\335Q\202\271 \334 \335Q#\206\303 \336\205\315 \304 !%\262\303\"\262\337!\203\351 \203\351 \303\305!\"\262\203\370 \337!\203\370 \340\341\"\210\207" [default-directory 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 make-byte-code 0 "\300\205 \300\211\207" vconcat vector [minibuffer-default] 2 "\302\303\301\242\"\210\300 \207" [remove-hook minibuffer-setup-hook] 3 "\301\302\300\242\"\207" [remove-hook minibuffer-setup-hook] add-hook minibuffer-setup-hook read-file-name format "%s%s " " (default " "):" t file-directory-p user-error "File %s is a directory"] 16 (#$ . 88571)])
#@51
(fn BUFF &optional PREFIX GIVEN-FILE START END)
(defalias 'ediff-make-temp-file #[1281 "\306\206 \307!\211\310\211\311\312!\203$ \312 \204$ G\313V\203$ \314\313O\262\nP\262\nP\262\206O \315\316\"\203@ \317!\202O \203L \317\320\"\202O \317!\262\211\205c \321 !\205c \322\321 !!)\203\224 rq\210\323\203w \202x e\203\202 \202\203 d\310\324%\210\325\f\"\210\326!)\202\236
\327=\206\236 \330!)\207" [ediff-coding-system-for-write coding-system-for-write ediff-temp-file-prefix buf ediff-temp-file-mode this-command 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 ediff-KILLED-VITAL-BUFFER] 16 (#$ . 89844)])
#@51
(fn PROPOSED-NAME &optional KEEP-PROPOSED-NAME)
(defalias 'ediff-make-empty-tmp-file #[513 "\30019 \301!\204 \204 \302!\262\303\304!r\211q\210\305\306\307\310\311!\312\"\313$\216\314\315\316\316\317\316\320&\210*\210\3160\202= \210\202 \204 \211\207" [(file-already-exists) file-exists-p make-temp-name generate-new-buffer " *temp*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [buffer-name kill-buffer] 2 write-region "" nil silent excl] 12 (#$ . 90700)])
#@29
(fn &optional FILE-MAGIC)
(defalias 'ediff-verify-file-buffer #[256 "\301p!\203, \302 \205H \303\304\305\306 #!\203' \3071 \310 0\207\210\311 \210\312\313\"\207\314\315\"\207\303\304\316\306 $!\203D \211\203? \317 \210\320\321\211\"\207\314\322\"\207" [buffer-file-name 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" user-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"] 7 (#$ . 91195)])
#@13
(fn FILE)
(defalias 'ediff-verify-file-merge-buffer #[257 "\211;\205 \306!\307?\206g \310\311\312!#\262r\313 !q\210p\314 \210\307\211\315\211\315 \316 \210\317\320!\210+\211 \321\322!\210\321!\210\321\322!\210\323!\210)\266\324\325\326\"!\203d rq\210\327 \210\330p!)\202g \331\332!\207" [default-directory ediff-msg-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks 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" inhibit-read-only standard-output] 8 (#$ . 91857)])
#@13
(fn FILE)
(defalias 'ediff-filename-magic-p #[257 "\300!\206 \301!\207" [ediff-file-compressed-p ediff-file-remote-p] 3 (#$ . 92696)])
#@345 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).
(fn ARG)
(defalias 'ediff-save-buffer #[257 "\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\211\203\345 \211 !\205\334 \331!!\205\334 \332\331!!!)\203\345 \202$\"\211 !\205\372 \331!!\205\372 \332\331!!!)\203\"\202$ \211 !\205\331!!\205\332\331!!!)\203! \202$\310\333!\211 !\2057\331!!\2057\332\331!!!)\203Xr\313 \314>\203\337\313 \315>\203N\316\202a\313 \317>\203Y\320\202a\313 \321>\205a\322\316=\203j\n\202O\313 \315>\203u\316\202\210\313 \317>\203\200\320\202\210\313 \321>\205\210\322\320=\203\221 \202O\313 \315>\203\234\316\202\257\313 \317>\203\247\320\202\257\313 \321>\205\257\322\322=\203\270\f\202O\313 \315>\203\303\316\202\326\313 \317>\203\316\320\202\326\313 \321>\205\326\322\323=\205O
\202O\313 \324=\205O\325\326!\210\327\330!\210\211\203 \211 !\205\331!!\205\332\331!!!)\203 \202O\"\211 !\205%\331!!\205%\332\331!!!)\203.\"\202O \211 !\205C\331!!\205C\332\331!!!)\203L \202O\310\333!q\210\334 #\335 *\207 \336=\206b\337$!\207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer nil ediff-in-control-buffer-p user-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 error ediff-diff-buffer buf ediff-custom-diff-buffer window-min-height ediff-KILLED-VITAL-BUFFER] 5 (#$ . 92843) "P"])
#@25
(fn BUFF REGION-NAME)
(defalias 'ediff-clone-buffer-for-region-comparison #[514 "\305\"\306\307\211\211\211\205 \310 !\205 \311\310 !!)\203) rq\210\306)\2023 \312=\2043 \313\f!\210\314!\210\315!\262\316!\210\317 \210\320 \204K \321 \210\322 \210\323 \210\324 \210\325 \262\326\327!r\211q\210\330\331\332\333\334!\335\"\336$\216\337 \210\340\341\311!\"c\210\211\205\211 \310 !\205\211 \311\310 !!)\203\237 rq\210\340\342\343\344!\343\345!#)\202\250 \312=\206\250 \313\f!c\210eb\210p\262\346\"\210\347 \210\350!\203\302 \316!\210\3511\314 \352 0\202\352 \210\211\211\205\340 \310 !\205\340 \311\310 !!)\205\351 \353\310 !!)\210*\210)\207" [pop-up-windows buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER 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*" make-byte-code 0 "\301\300!\205 \302\300!\207" vconcat vector [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] 15 (#$ . 95207)])
#@30
(fn BUFF WIND REGION-NAME)
(defalias 'ediff-clone-buffer-for-window-comparison #[771 "\304\"\211\211\205 \305!\205 \306\305!!)\203# r\211q\210\307)\202- \n\310=\204- \311 !\210\312\"\210\211\207" [buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER ediff-make-cloned-buffer get-buffer buffer-name t ediff-quit error set-window-buffer] 7 (#$ . 96696)])
#@15
(fn BUFFER)
(defalias 'ediff-buffer-type #[257 "\211=\203 \304\207\211 =\203 \305\207\211\n=\203 \306\207\211 =\203 \307\207\310\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer A B C Ancestor nil] 3 (#$ . 97084)])
#@22
(fn BUFF REG-NAME)
(defalias 'ediff-clone-buffer-for-current-diff-comparison #[514 "\304\"\305!\306\307\"\306\310\"\211\205 \311!\205 \312\311!!)\2035 rq\210b\210\313!\210\314)\202? \n\315=\204? \316 !\210\207" [buf ediff-temp-indirect-buffer this-command ediff-KILLED-VITAL-BUFFER ediff-make-cloned-buffer ediff-buffer-type ediff-get-diff-posn beg end get-buffer buffer-name set-mark t ediff-quit error] 10 (#$ . 97336)])
#@25
(fn BUFF REGION-NAME)
(defalias 'ediff-make-cloned-buffer #[514 "\300\301;\203\f \202 \302!P!\"\207" [ediff-make-indirect-buffer generate-new-buffer-name buffer-name] 7 (#$ . 97783)])
#@35
(fn BASE-BUF INDIRECT-BUF-NAME)
(defalias 'ediff-make-indirect-buffer #[514 "\300\301#\207" [make-indirect-buffer clone] 6 (#$ . 97981)])
(defalias 'ediff-compute-custom-diffs-maybe #[0 "\306!\306 !\307\211\203 \310!\203 \311!\203 \312!\262\203- \310!\203- \311!\2032 \312 !\262\n\211\205C \313 !\205C \314\313 !!)\204N \315\316\317\320\"!\n\211\205_ \313 !\205_ \314\313 !!)\203p r\nq\210\307\321 \210)\202{
\322=\204{ \323!\210\324\n\325\206\211 \206\220 &\210\326\327!\203\241 r\nq\210\327 \210)\203\257 \310!\203\257 \330!\210\211\205\274 \310!\205\274 \330!\207" [ediff-buffer-A ediff-buffer-B ediff-custom-diff-buffer buf buffer-read-only this-command 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-KILLED-VITAL-BUFFER ediff-custom-diff-program ediff-custom-diff-options] 12])
#@12
(fn ARG)
(defalias 'ediff-show-diff-output #[257 "\306\307!\206\f \310\311 \")\210\312 \210\212\313\314!\210)\211\2034 \n\211\205, \315 !\205, \316\315 !!)\2034 \n\202n \f\211\205E \315 !\205E \316\315 !!)\203M \f\202n \n\211\205^ \315 !\205^ \316\315 !!)\203f \n\202n \317 \210\320\321!\210\306\211\203\243 \211\211\205\203 \315 !\205\203 \316\315 !!)\203\222 r\211q\210eb\210)\202\234 \322=\204\234 \323
!\210\324!\210\325 \210\210\326!\203\260 \327!\210\330!\205\273 \331!\207" [meta-buf-p this-command ediff-diff-buffer buf ediff-custom-diff-buffer ediff-KILLED-VITAL-BUFFER nil ediff-in-control-buffer-p user-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 error switch-to-buffer raise-frame frame-live-p ediff-reset-mouse window-live-p select-window ediff-control-frame ediff-control-window] 6 (#$ . 99029) "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 #[0 "\306\307\310\311E\312\313\211\211\211\211\211\211 \211\204 \n\314Y\205! \n W)\203- \315 \312\"\210\316 \210\317\320!\210\f\321>\203\200
\262 \307=\203K 8\262\322\262 \202@ \310=\203\\ 9\262\323\262 \202@ \306\232\204o \324\325!\210\326\327!\210\330\331!\210\312 :\326\332!\210\333\334 !\262\n)\202: \f\335>\2035 >\203\254 \336\n\n\"\262 ; < =\337=<\"A*J\262\202\334 \306\232\204\305 \324\325!\210\326\340\341\342\f\343#\"\210\330\331!\210\312 :\326\344\341\342\f\343#\"\210\333\334 !\262\n)\202\206 \306\262\n >\203\336\n\n\"\262 ; < =\337=<\"A*J\262\202@ \306\232\204 \324\325!\210\326\340\341\342\f\343#\"\210\330\331!\210\312 :\326\345\341\342\f\346#\"\210\333\334 !\262\n)\202\337 8\2629\262\313\262 \211\204H \n\314Y\205Q\n W)\203^\347\350!\203^\312\262\203j\351\352\"\202n\353\352\"\262\211 >\205\204\354>!\205\204\355\354>!!)\203\261rq\210\356 \262\357 \262b\210\360 \210`\262b\210\313\210m\204\252\313u\210`\262)\202\275?\361=\204\275\362@!\210\203\311\351\363\"\202\315\353\363\"\262\211 >\211\205\343\354>!\205\343\355\354>!!)\203r\211q\210\356 \262\357 \262b\210\360 \210`\262b\210\313\210m\204 \313u\210`\262)\202 ?\361=\204 \362@!\210\364 \313\2031\365\2022\366\2058\312\3677BC&\n)\207" [zmacs-regions ediff-current-difference n ediff-number-of-differences ediff-job-name ediff-buffer-C "" 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 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 ediff-buffer-A ediff-buffer-B cursor-in-echo-area ediff-buffer-alist alist buf-type buf this-command ediff-KILLED-VITAL-BUFFER] 23 (#$ . 100041) nil])
#@23
(fn BUFFER OVERLAY)
(defalias 'ediff-remove-flags-from-buffer #[514 "\211\205 \304!\205 \305\304!!)\203( rq\210\306\307\310\311#\210\307\312\311#*\207\n\313=\2061 \314 !\207" [buf inhibit-read-only this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name t ediff-overlay-put before-string nil after-string ediff-quit error] 7 (#$ . 102953)])
#@40
(fn BUF-TYPE BUFFER CTL-BUFFER DIFF)
(defalias 'ediff-place-flags-in-buffer #[1028 "\211\205 \303!\205 \304\303!!)\203 rq\210\305#)\207 \306=\206) \307\n!\207" [buf this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-place-flags-in-buffer1 ediff-quit error] 9 (#$ . 103318)])
#@36
(fn BUF-TYPE CTL-BUFFER DIFF-NO)
(defalias 'ediff-place-flags-in-buffer1 #[771 "\211\205 \306!\205 \307\306!!)\203, rq\210 \310 \n\"A*JH\311H)\2025 \f\312=\2065 \313
!\314\315$\316\211\211b\210n\262\211\205W \306!\205W \307\306!!)\203v rq\210\317=\205r \203p \202r )\202 \f\312=\206 \313
!\262\320\321#\210\314\322\n$\262b\210n\262\211\205\252 \306!\205\252 \307\306!!)\203\311 rq\210\317=\205\305 \203\303 \202\305 )\202\322 \f\312=\206\322 \313
!\262\320\323#\207" [buf ediff-difference-vector-alist alist buf-type this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name assoc 0 ediff-quit error ediff-get-diff-posn beg nil ascii ediff-overlay-put before-string end after-string ediff-highlighting-style ediff-before-flag-bol ediff-before-flag-mol ediff-after-flag-eol ediff-after-flag-mol] 14 (#$ . 103629)])
#@19
(fn N BUF-TYPE)
(defalias 'ediff-empty-diff-region-p #[514 "\211\301=\203 ?\206\" \302\301\303#\302\301\304#U\207\302\303#\302\304#U\207" [ediff-3way-comparison-job C ediff-get-diff-posn beg end] 7 (#$ . 104516)])
#@19
(fn N BUF-TYPE)
(defalias 'ediff-whitespace-diff-region-p #[514 "\211\306=\203 ?\206~ \307\"\206~ \310\311#\310\312#\313\267\2022 \2023 \n\2023 \2023 \f\2023 \314\211 \205C \315
!\205C \316\315
!!)\203q r\317\267\202^ \202_ \n\202_ \202_ \f\202_ \314q\210\212b\210\314w\210`Y*\202| \320=\206| \321!\266\202\207" [ediff-3way-job ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf C ediff-empty-diff-region-p ediff-get-diff-posn beg end #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 34 B 38 C 42 Ancestor 46)) nil get-buffer buffer-name #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 78 B 82 C 86 Ancestor 90)) ediff-quit error ediff-whitespace this-command ediff-KILLED-VITAL-BUFFER] 8 (#$ . 104746)])
#@48
(fn N BUF-TYPE CTRL-BUF &optional START END)
(defalias 'ediff-get-region-contents #[1283 "\211\205 \306!\205 \307\306!!)\2034 rq\210\310\267\202/ \2020 \n\2020 \2020 \f\2020 \311)\202>
\312=\206> \313!\211\205N \306!\205N \307\306!!)\203\256 r\211\205d \306!\205d \307\306!!)\203\207 rq\210\314\267\202\202 \202\203 \n\202\203 \202\203 \f\202\203 \311)\202\221
\312=\206\221 \313!q\210\206\237 \315\316$\206\253 \315\317${)\207
\312=\206\270 \313!\207" [buf ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer this-command get-buffer buffer-name #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 31 B 35 C 39 Ancestor 43)) nil ediff-quit error #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 114 B 118 C 122 Ancestor 126)) ediff-get-diff-posn beg end ediff-KILLED-VITAL-BUFFER] 12 (#$ . 105580)])
#@45
(fn BUF-TYPE POS &optional N CONTROL-BUF)
(defalias 'ediff-get-diff-posn #[1026 "\306\204 p\262\211\205 \307!\205 \310\307!!)\203c rq\210\204( \262\311W\2044 \nY\203I \n\311V\203E \312 \fT\n$\210\202I \312
!\210 \313\"A*JH\311H\262)\202n \f\314=\204n \312!\210\315!\211\205\201 \307!\205\201 \310\307!!)\204\212 \312!\210\316=\203\242 \211 \317!\205\236 \320!)\202\261 \211 \317!\205\260 \321!)\207" [buf ediff-current-difference ediff-number-of-differences ediff-BAD-DIFF-NUMBER this-command ediff-NO-DIFFERENCES nil get-buffer buffer-name 0 error assoc ediff-quit ediff-overlay-buffer beg ediff-overlayp overlay-start overlay-end ediff-difference-vector-alist alist buf-type ediff-KILLED-VITAL-BUFFER overl] 11 (#$ . 106519)])
#@26
(fn &optional CTL-BUF)
(defalias 'ediff-restore-highlighting #[256 "\211\206 p\211\205 \306!\205 \307\306!!)\2036 r\211\206 pq\210\310 \2031 \2031 \n\2031 \311 \210\312 !)\207\f\313=\206? \314
!\207" [buf ediff-use-faces ediff-highlight-all-diffs ediff-current-difference this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-has-face-support-p ediff-paint-background-regions ediff-select-difference ediff-quit error] 5 (#$ . 107303)])
#@42
(fn VEC-VAR &optional FINE-DIFFS-ALSO)
(defalias 'ediff-clear-diff-vector #[513 "\300J!\203 \301\302\303\304\305\306!\307\"\310\311%J\"\210\312L\207" [vectorp mapc make-byte-code 257 "\302\303H!\210\300\205 \211\211\205 \304\302 \305H\")\207" vconcat vector [diff-record ediff-delete-overlay 0 mapc 1] 5 "\n\n(fn ELT)" nil] 9 (#$ . 107769)])
#@21
(fn BEG END BUFF)
(defalias 'ediff-make-bullet-proof-overlay #[771 "\211\211\205 \303!\205 \304\303!!)\205j \305\211\205' \303!\205' \304\303!!)\203_ rq\210\306!\204: \307!\262\306!\204E \307!\262\310\305\311%\262\312\313\305#\210\312\314\315#\210)\211\202h \316=\206h \317\n!\262\207" [buf this-command ediff-KILLED-VITAL-BUFFER 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] 11 (#$ . 108129)])
#@13
(fn TYPE)
(defalias 'ediff-make-current-diff-overlay #[257 "\306 \205I \211\307\n \"A*\310\267\202& \202' \f\202'
\202' \202' \311\307\n \"A*\312dd#L\210\313J\"\210\314J\315#\266\203\207" [ediff-current-diff-overlay-alist alist buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-has-face-support-p assoc #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (A 21 B 25 C 29 Ancestor 33)) nil ediff-make-bullet-proof-overlay ediff-set-overlay-face ediff-overlay-put ediff ediff-ancestor-buffer ediff-current-diff-face-alist ediff-control-buffer] 9 (#$ . 108650)])
#@22
(fn EXCL-BUFF-LST)
(defalias 'ediff-other-buffer #[257 "\211<\204 \211C\262\304 \305 \244\304 @\306C\307\310\"@\211\205+ \311!\205+ \312\311!!)\2043 \313\202f @\211\205E \311!\205E \312\311!!)\203S r@q\210 )\202\\ \n\314=\206\\ \315 !\316=\203e \317\202f \320\307\321\322\323\324\325\n\n\n\n\n%\326\"\327\330%\"\331\306\"\306\204\224 \242G\332V\203\224 \242\262\203\235 @\202\277 \331\306\307\321\322\333\324\325\f\f\"\334\"\327\330%\f\"\"\211\262\203\276 \211@\202\277 \335\207" [buf major-mode this-command ediff-KILLED-VITAL-BUFFER ediff-get-selected-buffers buffer-list nil mapcar #[257 "\211;\203 \207\300!\205 \301!\207" [bufferp buffer-name] 3 "\n\n(fn B)"] get-buffer buffer-name unknown ediff-quit error dired-mode yes no make-byte-code 257 "\306!\303\235\203\n \307\207\211\300>\203 \207\310!\204 \307\207\211\301=\203 \207\304\311=\203V \211 \211\2057 \312
!\2057 \306\312
!!)\203E r\211q\210)\202P \313=\206P \314!\315=\205\330 \207\211 \211\205g \312
!\205g \306\312
!!)\203u r\211q\210)\202\200 \313=\206\200 \314!\315=\203\222 \304\204\220 \302\302\242B\240\210\307\207\211 \211\205\243 \312
!\205\243 \306\312
!!)\203\261 r\211q\210)\202\274 \313=\206\274 \314!\316>\203\302 \207\317\320\306!\"\203\315 \307\207\306!\321\230\203\327 \307\207\211\207" vconcat vector [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] 5 "\n\n(fn X)" delq 0 "\306!\300\235\203\n \307\207\301\310=\203= \211\211\205! \311\n!\205! \306\311\n!!)\203. r\211q\210 )\2027 \f\312=\2067 \313
!\314=\205\201 \207\211\211\205N \311\n!\205N \306\311\n!!)\203[ r\211q\210 )\202d \f\312=\206d \313
!\314=\203k \307\207\315\316\306!\"\203v \307\207\306!\317\230\203\200 \307\207\211\207" [buf major-mode this-command ediff-KILLED-VITAL-BUFFER buffer-name nil yes get-buffer ediff-quit error dired-mode string-match "^[ *]" "*scratch*"] "*scratch*"] 21 (#$ . 109281)])
(defalias 'ediff-get-selected-buffers #[0 "\301=\2051 \3021 \303\304!C0\202 \210\305\212db\210\306\307\305\304#\203- \310u\210\303\304!B\262\202 )\211\262\207" [major-mode Buffer-menu-mode (error) Buffer-menu-buffer t nil search-backward "\n>" 1] 5])
#@22
(fn PREFIX SUFFIX)
(defalias 'ediff-unique-buffer-name #[514 "\300P!\204\f P\207\301\300\302\303$!\203 \211T\262\202
\302\303$\207" [get-buffer 2 format "%s<%d>%s"] 9 (#$ . 111646)])
#@29 Submit bug report on Ediff.
(defalias 'ediff-submit-report #[0 "\306\307!\206\f \310\311 \")\210\312\n \306\211\211 %\313\262\314\262\315 \210\316 \210\317&!\210\320 \210\321 \210\322c\210\323\324!\203j \211 '\205N \325'!\205N \326\325'!!)\203U q\210\326 \327\330!\210\331\332\333 \306\321&\202\272 \334 \210\335\336!\210\337\340!\210\211 '\205\211 \325'!\205\211 \326\325'!!)\205\272 \211 '\205\241 \325'!\205\241 \326\325'!!)\203\260 rq\210\341\342!)\202\272 \343=\206\272 \344(!+\207" [meta-buf-p this-command ediff-control-buffer window-system ediff-buffer-name ediff-device-type nil ediff-in-control-buffer-p user-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 ediff-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 zzz\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 buffer-name 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 error reporter-prompt-for-summary-p ediff-msg-buffer buf ediff-KILLED-VITAL-BUFFER] 13 (#$ . 111851) nil])
(defalias 'ediff-choose-syntax-table #[0 "\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 #[0 "\300 \207" [deactivate-mark] 1])
(defalias 'ediff-activate-mark #[0 "\302\301!\210\303\211\211\207" [mark-active transient-mark-mode make-local-variable t] 3])
(defalias 'ediff-nuke-selective-display #[0 "\212\214~\210eb\210\302 \303\211 \304=\2036 \305\306\303\304#\2036 \303\210`\262\307 \210\305\306\304#\203 \310\311!\210\312c\210\202$ \313!\210\303\211)\266\203*\207" [buffer-read-only selective-display buffer-modified-p nil t search-forward "
" beginning-of-line delete-char -1 "\n" set-buffer-modified-p] 7])
#@13
(fn VARS)
(defalias 'ediff-save-variables #[257 "\300\301\"\207" [mapcar #[257 "\211JB\207" [] 3 "\n\n(fn V)"]] 4 (#$ . 116095)])
(put 'ediff-save-variables 'byte-optimizer 'byte-compile-inline-expand)
#@24
(fn VARS ASSOC-LIST)
(defalias 'ediff-restore-variables #[514 "\205 @\300@\"AL\210A\262\202 \207" [assoc] 6 (#$ . 116307)])
#@27
(fn VAR VALUE BUF-TYPE)
(defalias 'ediff-change-saved-variable #[771 "\211\303\n \"A*J\303\"\211\205 \211\241\207" [ediff-buffer-values-orig-alist alist buf-type assoc] 7 (#$ . 116447)])
(defalias 'ediff-save-protected-variables #[0 "\211\205 \306 !\205 \307\306 !!)\203$ rq\210\n\310\311\"\262)\202- \312=\206- \313\f!\f\211\205@ \306 !\205@ \307\306 !!)\203T r\fq\210\n\310\311\"\262)\202] \312=\206] \313\f!
\203\225 \211\205v \306 !\205v \307\306 !!)\203\212 rq\210\n\310\311\"\262)\202\223 \312=\206\223 \313\f!\211\205\247 \306 !\205\247 \307\306 !!)\205\335 \211\205\275 \306 !\205\275 \307\306 !!)\203\321 rq\210\n\310\311\"\262)\202\332 \312=\206\332 \313\f!\211\207" [ediff-buffer-A buf ediff-protected-variables this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-values-orig-A get-buffer buffer-name mapcar #[257 "\211JB\207" [] 3 "\n\n(fn V)"] ediff-quit error 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] 5])
(defalias 'ediff-restore-protected-variables #[0 " \n \f\211 \205 \306
!\205 \307\306
!!)\203' r\fq\210\310 \"\210)\2023 \f\311=\2043 \312
!\210\211 \205E \306
!\205E \307\306
!!)\203X rq\210\310 \"\210)\202d \f\311=\204d \312
!\210\203\232 \211 \205{ \306
!\205{ \307\306
!!)\203\216 rq\210\310 \"\210)\202\232 \f\311=\204\232 \312
!\210\211 \205\254 \306
!\205\254 \307\306
!!)\205\337 \211 \205\302 \306
!\205\302 \307\306
!!)\203\324 rq\210\310 \")\202\337 \f\311=\206\337 \312
!\207" [ediff-buffer-values-orig-A ediff-buffer-values-orig-B ediff-buffer-values-orig-C ediff-buffer-values-orig-Ancestor ediff-buffer-A buf get-buffer buffer-name ediff-restore-variables ediff-quit error ediff-protected-variables this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-B ediff-3way-comparison-job ediff-buffer-C ediff-ancestor-buffer] 8])
#@20
(fn BUFFER FILE)
(defalias 'ediff-save-buffer-in-file #[514 "\211\205 \303!\205 \304\303!!)\203 rq\210\305!)\207 \306=\206' \307\n!\207" [buf this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name write-file ediff-quit error] 6 (#$ . 118420)])
#@2
(defvar ediff-command-begin-time '(0 0 0) (#$ . 118687))
(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 #[0 "\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 #[0 "\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 #[0 "\303\304!\206\f \305\306 \")\210\307\310\n\311\232\204( \312\313\"\210\312\314\"\210\315\316\317!\2029 \320\313\321\322$\210\320\314\303\322$\210\316\323!\207" [meta-buf-p this-command ediff-command-begin-time nil ediff-in-control-buffer-p user-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"] 7 (#$ . 119217) nil])
#@24
(fn DIFF-VECTOR-VAR)
(defalias 'ediff-print-diff-vector #[257 "\300\301\302\"!\210\303\304\305!\"\207" [princ format "\n*** %S ***\n" mapcar #[257 "\300\301\302\303\304H\305\"T\304H\306HG\304U\203 \307\202\" \310\311\306H\312#\313H\314H\315H&!\207" [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] 11 "\n\n(fn OVERL-VEC)"] eval] 5 (#$ . 119802)])
(defalias 'ediff-debug-info #[0 "\306\307!\206\f \310\311 \")\210\nr\312 !q\210p\313 \210\306\211\314\211 \314 !\315 \210\316\317!\210+\211 \"\211 #\211\205G \320#!\205G \321\320#!!)\203W r\"q\210\322 \210)\202b \323=\204b \324$!\210\325\326\327%\"!\210\330\331\332!!\210\330\331\333!!\210\330\331\334!!\210\330\331\335!!\336!\210)\207" [meta-buf-p this-command default-directory ediff-debug-buffer buffer-read-only buffer-file-name nil ediff-in-control-buffer-p user-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 error 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-undo-list inhibit-modification-hooks inhibit-read-only standard-output buf ediff-KILLED-VITAL-BUFFER ediff-control-buffer] 7 nil nil])
#@32
(fn ELT LIS COMPARISON-FUNC)
(defalias 'ediff-member #[771 "\203 \211@\"\204 A\262\202 \207" [] 6 (#$ . 121400)])
#@17
(fn FUNC-DEF)
(defalias 'ediff-format-bindings-of #[257 "\301\302\211$@\211\203 \303!\202 \304\305\"\207" [overriding-local-map where-is-internal nil key-description format "M-x %s"] 6 (#$ . 121531)])
#@34
(fn LIS1 LIS2 COMPARISON-FUNC)
(defalias 'ediff-intersection #[771 "\300C\203 \301@#\203 \211@C\244\210A\262\202 \211A\207" [a ediff-member] 8 (#$ . 121746)])
#@34
(fn LIS1 LIS2 COMPARISON-FUNC)
(defalias 'ediff-union #[771 "\300C\203 \301@A#\204 \211@C\244\210A\262\202 \2038 \301@A#\2041 \211@C\244\210A\262\202 \211A\207" [a ediff-member] 8 (#$ . 121923)])
#@34
(fn LIS1 LIS2 COMPARISON-FUNC)
(defalias 'ediff-set-difference #[771 "\300C\203& \301@A#\204 \301@#\204 \211@C\244\210A\262\202 \211A\207" [a ediff-member] 8 (#$ . 122145)])
#@27
(fn HISTORY-VAR NEWELT)
(defalias 'ediff-add-to-history #[514 "\300\301!\203 \301\"\207JBL\207" [fboundp add-to-history] 5 (#$ . 122340)])
(byte-code "\300\301\302\"\210\303\304!\207" [defalias ediff-copy-list copy-sequence run-hooks ediff-load-hook] 3)
|