;ELC ;;; compiled by kwzh@hal.gnu.ai.mit.edu on Thu Jun 8 22:24:12 1995 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff-util.el ;;; emacs version 19.29.0. ;;; bytecomp version FSF 2.10 ;;; optimization is on. ;;; this file uses opcodes which do not exist in Emacs 18. (if (and (boundp 'emacs-version) (or (and (boundp 'epoch::version) epoch::version) (string-lessp emacs-version "19.28.90"))) (error "`ediff-util.el' was compiled for Emacs 19.29 or later")) (require (quote ediff-init)) #@616 Ediff mode is used by the Ediff file-difference package. It is entered only through one of the following commands: `ediff' `ediff-files' `ediff-buffers' `ediff3' `ediff-files3' `ediff-buffers3' `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' `ediff-revision' Commands: \{ediff-mode-map} (defalias 'ediff-mode #[nil " !" [kill-all-local-variables ediff-mode major-mode "Ediff" mode-name run-hooks ediff-mode-hooks] 2 (#$ . 509)]) #@97 Return string describing the version of Ediff. When called interactively, displays the version. (defalias 'ediff-version #[nil "t ! \f#" [message ediff-version format "Ediff %s of %s" ediff-date] 4 (#$ . 1281) nil]) (byte-code "!!" [require ediff-diff ediff-merg] 2) #@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 (#$ . 1570)) (byte-code "!#" [make-variable-buffer-local ediff-mode-map put permanent-local t] 4) #@36 Set up Ediff keymap, if necessary. (defalias 'ediff-set-keys #[nil " !" [ediff-mode-map ediff-setup-keymap use-local-map] 2 (#$ . 1833)]) (defalias 'ediff-reload-keymap #[nil " " [nil ediff-mode-map ediff-set-keys] 1 nil nil]) #@56 Set up the keymap used in the control buffer of Ediff. (defalias 'ediff-setup-keymap #[nil "  ! # # # # \n(# # # # # # # # # # # #w #\" # # # # # # # # # # # # # # # # #=+ # # @# AB# CD# EF# GH#I JK# LK# MK# NK# O# PK# QK# RS# TS# US# VW# X# Y# RS# TS# Z[# \\# ]^# _^# `a# b# cW# dW# e# fg# hg# ig#jQ kg# l# mn# o# pq# Mrs!" [make-sparse-keymap ediff-mode-map suppress-keymap define-key "p" ediff-previous-difference "" [backspace] [delete] "" ediff-no-emacs-help-in-control-buffer "n" ediff-next-difference " " "j" ediff-jump-to-difference "g" nil "ga" ediff-jump-to-difference-at-point "gb" "q" ediff-quit "z" ediff-suspend "\f" ediff-recenter "|" ediff-toggle-split "h" ediff-toggle-hilit ediff-word-mode "@" ediff-toggle-autorefine ediff-narrow-job "%" ediff-toggle-narrow-region "~" ediff-swap-buffers "v" ediff-scroll-vertically "" "^" "" "V" "<" ediff-scroll-horizontally ">" "i" ediff-status-info "D" ediff-documentation "?" ediff-toggle-help "!" ediff-update-diffs "*" ediff-make-or-kill-fine-diffs "a" "b" "r" ediff-merge-job #[(arg) " \"" [ediff-diff-to-diff arg "ac"] 3 nil "P"] #[(arg) " \"" [ediff-diff-to-diff arg "bc"] 3 nil "P"] #[(arg) " \"" [ediff-restore-diff arg 99] 3 nil "P"] "s" ediff-shrink-window-C "+" ediff-combine-diffs "$" ediff-toggle-show-clashes-only "&" ediff-re-merge ediff-3way-comparison-job "ab" ediff-diff-to-diff "ba" "ac" "bc" "c" "ca" "cb" "ra" ediff-restore-diff "rb" "rc" "C" ediff-toggle-read-only #[(arg) " \"" [ediff-diff-to-diff arg "ab"] 3 nil "P"] #[(arg) " \"" [ediff-diff-to-diff arg "ba"] 3 nil "P"] "G" ediff-submit-report "#" "#h" ediff-toggle-regexp-match "#f" "##" ediff-toggle-skip-similar "o" "A" "B" "w" "wa" ediff-save-buffer "wb" "wd" ediff-3way-job "wc" "gc" "m" ediff-toggle-wide-display "k" "kkk" ediff-reload-keymap run-hooks ediff-keymap-setup-hooks] 4 (#$ . 2079)]) (require (quote ediff-wind)) (defalias 'ediff-setup #[(buffer-A file-A buffer-B file-B buffer-C file-C startup-hooks setup-parameters) " !\n! ; !\"p = != !!=̎ q!)G=G!)p!!!ӎq @@@ALAp>>>> >\">$!!!!!!7)=- ./(01\"!00q.!p.$.!$.!!$.q5).=.!) \"*: ;-<0=>@\"bAAOeBCADCEC\"|AO!S]FāG\"!Hp  ! !!I qJ@KLJ8J)=!)p--!-!!M-qJ@KLJ8J)=!)Xp0L0!L0!!LN0qJ@KHLJ8J)W=W!)O hPkQRSTU;#SVW<#SXY=#EZ[\\]Z]^ \\Z\\p;+;!+;!!+_;q` ab!p!!!cq)=!)d:e>'eBe)6=6!)p<eBe)=!) p==!=!!h=q` ab!e>eBe)\f=\f!)R \n #iGjklmn!mo!;mp!qErMst !nqZrbst !u>nv w -0$\\@xyx!qzx!{x!)\\A@xyx!qzx!{x!)L\\8xyx!qzx!{x!)|}~!~b)!}b)!|b)+! =p!!!qp!!!=!!WB!*=!)a\" d:)=!)*" [expand-file-name file-A file-B file-C ediff-unique-buffer-name "*Ediff Control Panel" "*" control-buffer-name StartBuffer buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) get-buffer-create this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" control-buffer ((set-buffer StartBuffer)) ediff-mode setup-parameters ediff-job-name (ediff-files3 ediff-buffers3) ediff-3way-comparison-job (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-job (ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor) ediff-merge-with-ancestor-job ediff-3way-job ediff-diff3-job (ediff-windows-wordwise ediff-regions-wordwise ediff-windows-linewise ediff-regions-linewise) ediff-narrow-job (ediff-windows-wordwise ediff-windows-linewise) ediff-windows-job (ediff-windows-wordwise ediff-regions-wordwise) ediff-word-mode-job make-local-variable ediff-prefer-long-help-message ediff-prefer-iconified-control-frame ediff-split-window-function ediff-default-variant ediff-merge-window-share ediff-window-setup-function default-B buffer-B buf ediff-merge-split-window-function buffer-C ediff-ancestor-buffer "*ediff-merge" insert-buffer ((set-buffer StartBuffer)) major-mode add-hook local-write-file-hooks ediff-set-merge-mode nil buffer-read-only ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer string-match "<[0-9]*>" 0 "" ediff-control-buffer-suffix string-to-number "[0-9]+" ediff-control-buffer-number "*ediff-errors" ediff-error-buffer ((set-buffer StartBuffer)) mode-line-format (" A: " " B: " " C: ") 2 ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-save-protected-variables ediff-setup-diff-regions3 ediff-setup-diff-regions ediff-setup-diff-regions-function ediff-make-bullet-proof-overlay (point-min) (point-max) (point-min) (point-max) (point-min) (point-max) ediff-wide-bounds ediff-start-narrowed ediff-narrow-bounds ediff-visible-bounds ediff-set-keys ((set-buffer StartBuffer)) ediff-nuke-selective-display run-hooks ediff-prepare-buffer-hooks ((set-buffer StartBuffer)) t ediff-this-buffer-control-sessions ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-difference-vector-A ediff-number-of-differences -1 ediff-current-difference ediff-make-current-diff-overlay A B C ediff-emacs-p window-system device-type selected-device (tty stream) ediff-init-var-faces ediff-setup-windows overl ediff-overlayp overlay-start extent-start-position shift-C shift-B shift-A select-window ediff-window-A ediff-window-B ediff-window-C ediff-control-window ediff-visible-region system-type emx ediff-custom-diff-buffer ((set-buffer StartBuffer)) get-buffer-process proc processp process-status run message "Waiting for the diff program to quit" sleep-for 1 startup-hooks ediff-startup-hooks ediff-refresh-mode-lines] 7]) #@35 Set up window for control buffer. (defalias 'ediff-setup-control-buffer #[(ctl-buf) " ! \nq\n! c * - ! NR !k_c !>?k &ebw)" [window-dedicated-p selected-window ctl-buf switch-to-buffer 2 window-min-height erase-buffer ediff-set-help-message ediff-help-message shrink-window-if-larger-than-buffer ediff-window-display-p ediff-multiframe ediff-indent-help-message set-buffer-modified-p nil ediff-refresh-mode-lines ediff-control-window format "%S%S%S%S%S%S%S" ediff-window-A ediff-window-B ediff-window-C ediff-split-window-function ediff-emacs-p window-system device-type selected-device (tty stream) ediff-wide-display-p ediff-window-config-saved ediff-whitespace] 9 (#$ . 8958)]) (defalias 'ediff-help-message-line-length #[nil "eb\f!i)" [ediff-prefer-long-help-message next-line 1 nil] 2]) (defalias 'ediff-indent-help-message #[nil " ! Z]ĥ \"eb`dW)cyy+" [0 window-width selected-window ediff-help-message-line-length 2 shift make-string 32 str 1] 3]) (defalias 'ediff-set-help-message #[nil "9: I \n \fQI *\n\fQI7\n\fQI D\n\n\fQI\n \fQ\f b 9\\ :b  ;m w{ ! !>\f!" [ediff-long-help-message-custom ediff-word-mode ediff-long-help-message-head ediff-long-help-message-word-mode ediff-long-help-message-tail ediff-narrow-job ediff-long-help-message-narrow2 ediff-merge-job ediff-long-help-message-merge ediff-diff3-job ediff-long-help-message-compare3 ediff-long-help-message-compare2 ediff-long-help-message ediff-brief-help-message-custom ediff-emacs-p window-system device-type selected-device (tty stream) ediff-multiframe ediff-brief-message-string ediff-brief-help-message ediff-prefer-long-help-message ediff-help-message run-hooks ediff-display-help-hooks] 3]) #@217 Recompute difference regions in buffers A, B, and C. Buffers are not synchronized with their respective files, so changes done to these buffers are not saved at this point---the user can do this later, if necessary. (defalias 'ediff-update-diffs #[nil "p  ! !!Ď q`)' ='!)\n! !6 !! !C !!!P!!@A@8щ !\"!%%!'%!%!)%%!'%!%!)%%!'%!%!)%%!'%!%!)%%!'%!%!)%%!<'8%!<%!), !$p!t!!t!!!t!q!)~ =~!) !$p!!!!!!!q!) =!)3!$p!!!!!!!q!) =!)p \" !\" !!\" q !), =,!)p T !T !!T q!)^ =^!)3p!!!q!) =!)\"\"\">?@@?AB?C@?#*:GDE!E!E!3FGHIHDWJIG\"ITI))KLM\"\"!NO!." [StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" get-buffer-create ediff-tmp-buffer file-name-nondirectory buffer-file-name ediff-buffer-B ediff-buffer-C ediff-narrow-bounds 2 nil file-C file-B file-A end-C beg-C end-B beg-B end-A beg-A overl-C overl-B overl-A buf-C-file-name buf-B-file-name buf-A-file-name tmp-buffer point-A ediff-unselect-and-select-difference -1 overl ediff-overlayp ediff-emacs-p overlay-start extent-start-position overlay-end extent-end-position ediff-word-mode ediff-wordify ((set-buffer StartBuffer)) ediff-make-temp-file "regA" ((set-buffer StartBuffer)) "regB" ediff-3way-job ((set-buffer StartBuffer)) "regC" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-killed-diffs-alist ediff-setup-diff-regions-function ediff-job-name ediff-merge-job ediff-setup-diff-regions3 ediff-files3 ediff-number-of-differences delete-file ediff-control-buffer ctl-buf 0 n ediff-set-state-of-diff-in-all-buffers ediff-jump-to-difference ediff-diff-at-point A message ""] 17 (#$ . 10878) nil]) #@67 Revert buffers A, B and C. Then rerun Ediff on file A and file B. (defalias 'ediff-revert-buffers-then-recompute-diffs #[(noconfirm) " \n \f  \n \f pB!B!!Bӎq\")M=M!)pv!v!!vێq\")=!)p  ! !!܎ q\")=!) \fq  !\n #\" ." [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer ediff-ancestor-buffer ediff-merge-with-ancestor-job ediff-merge-job ediff-3way-comparison-job comparison merge ancestor-job ancestor-buf ctl-buf bufC bufB bufA StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) revert-buffer t noconfirm this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-really-quit kill-buffer ediff-merge-buffers-with-ancestor ediff-merge-buffers ediff-update-diffs] 8 (#$ . 13244) "P"]) #@117 Bring the highlighted region of all buffers being compared into view. Reestablish the default three-window display. (defalias 'ediff-recenter #[(&optional no-rehighlight) "\\!\\!!\\ \\ !\\ !!\\\nN \\ !\\ !!\\   $j=j!\") x| ! !>99>>!\"!!!!!$!$!!%!%!! !U !>U'!U'( !L*. !>?L(!LF(!L(!=)U'!'- .!!!  ! !!\n  ! !!/0/Y/2W)30!!!\n! ! !>9'(   !< !>?<(!<6(!<(!=)-(T(P ![([ (gk !x| !>(#) != ! p@..!.!!A.qB )=C!+" [ediff-xemacs-p t synchronize-minibuffers nil ediff-disturbed-overlays buffer-read-only ediff-buffer-A get-buffer buffer-name ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-setup-windows ediff-control-buffer this-command ediff-quit message "You've killed an essential Ediff buffer---Please quit Ediff" beep 1 ediff-visible-region ediff-emacs-p window-system device-type selected-device (tty stream) last-command (ediff-recenter 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 ediff-window-A raise-frame window-frame ediff-window-B ediff-window-C frame-live-p ediff-control-frame frame (tty stream) frame-iconified-p frame-visible-p icon control-frame control-buf n ediff-current-difference 0 ediff-number-of-differences no-rehighlight ediff-select-difference ediff-recenter-one-window A B C ediff-multiframe frame-selected-window selected-frame (tty stream) set-mouse-position ns unfocus-frame StartBuffer ((set-buffer StartBuffer)) ediff-refresh-mode-lines error] 6 (#$ . 14217) nil]) (defalias 'ediff-recenter-one-window #[(buf-type) " \n=\f@#\n=\fA@#\n=#\f8!<\n8!<!) \n\"!J!ZJll \"! \n$\n$\n$$ !." [selected-window ctl-wind buf-type A ediff-narrow-bounds B C 2 overl ediff-overlayp ediff-emacs-p overlay-start extent-start-position shift ediff-job-name job-name ediff-control-buffer control-buf intern format "ediff-window-%S" window-name window-live-p window ediff-windows-job set-window-start select-window ediff-deactivate-mark ediff-position-region ediff-get-diff-posn beg nil end] 9]) #@102 Toggle vertical/horizontal window split. Does nothing if file-A and file-B are in different frames. (defalias 'ediff-toggle-split #[nil " !  !  ! \n \n!\f)\f! 4!\n =h!h !h\fy\n!h\n=h \n=y =sςt }!!." [window-live-p ediff-window-A wind-A ediff-window-B wind-B ediff-window-C wind-C window-frame frame-A frame-B frame-C frame-live-p ediff-3way-comparison-job ediff-split-window-function split-window-vertically split-window-horizontally message "Buffers being compared are in different frames" ediff-recenter no-rehighlight] 2 (#$ . 16911) nil]) #@154 Switch between highlighting using ASCII flags and highlighting using faces. On a dumb terminal, switches between ASCII highlighting and no highlighting. (defalias 'ediff-toggle-hilit #[nil " \f !   !>: =4!\n\"̉\n\"\n\"TT!mc!m!!\"\"\"\"\"!\"\"\"\"\"\"\"\n\"" [ediff-emacs-p window-system device-type selected-device (tty stream) ediff-highlighting-style ascii message "ASCII highlighting flags removed" ediff-unselect-and-select-difference ediff-current-difference unselect-only off select-only ediff-use-faces ediff-highlight-all-diffs "Unhighlighting unselected difference regions" nil "Highlighting with ASCII flags" "Re-highlighting all difference regions" t face-differs-from-default-p ediff-odd-diff-face-A-var copy-face ediff-odd-diff-face-A ediff-odd-diff-face-B ediff-odd-diff-face-B-var ediff-odd-diff-face-C ediff-odd-diff-face-C-var ediff-even-diff-face-A ediff-even-diff-face-A-var ediff-even-diff-face-B ediff-even-diff-face-B-var ediff-even-diff-face-C ediff-even-diff-face-C-var default] 3 (#$ . 17542) nil]) #@26 Toggle auto-refine mode. (defalias 'ediff-toggle-autorefine #[nil "! =\"! =(!̉\"!ĉ" [ediff-word-mode error "No fine differences in this mode" ediff-auto-refine nix on ediff-make-fine-diffs ediff-current-difference noforce message "Auto-refining is ON" "Auto-refining is OFF" off ediff-set-fine-diff-properties default "Refinements are HIDDEN"] 3 (#$ . 18727) nil]) #@123 Compute fine diffs. With negative prefix arg, kill fine diffs. In both cases, operates on the currrent difference region. (defalias 'ediff-make-or-kill-fine-diffs #[(arg) "=\n \"!J H # H\") \"!J HI*  \"!J H M H\") \"!J HI*  \"!J H | H\") \"!J HI*)W\n \"!J H  H\") \"!J HI*  \"!J H  H\") \"!J HI*  \"!J H  H\") \"!J HI*) " [arg - ediff-current-difference n A buf-type intern format "ediff-difference-vector-%S" diff-record mapcar ediff-delete-overlay 1 nil B ediff-3way-job C 0 ediff-make-fine-diffs] 6 (#$ . 19140) "P"]) #@33 Toggle short/long help message. (defalias 'ediff-toggle-help #[nil " ? ) z  !z )- !>z\nz \f DH !w TX !>?w\f!wq\f!w\f!=)!" [nil buffer-read-only erase-buffer ediff-prefer-long-help-message ediff-set-help-message ediff-emacs-p window-system device-type selected-device (tty stream) ediff-multiframe ediff-control-frame frame (tty stream) frame-live-p ediff-xemacs-p frame-iconified-p frame-visible-p icon ediff-prefer-iconified-control-frame "" ediff-window-config-saved ediff-recenter no-rehighlight] 2 (#$ . 19827) nil]) #@206 Toggle read-only in current buffer. If buffer is under version control and locked, check it out first. If optional argument BUF is specified, toggle read-only in that buffer instead of the current buffer. (defalias 'ediff-toggle-read-only #[(&optional buf) "?p  >ł- >&ǂ- >-=7\n~ >AłR >KǂR >R=\\ ~ >fłw >pǂw >w=~\fp !!!Ўq!!!;!!P!)؂؂!;!!?P!) !!\"!up f !f !!f q >Oł` >Yǂ` >`#)q&=q!)!!!!!\")\"?&=!!?!!#,&=!*" [buf ctl-buf ediff-recenter last-command-char (97 65) A (98 66) B (99 67) C ediff-buffer-A ediff-buffer-B ediff-buffer-C StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) buffer-file-name file file-exists-p file-writable-p file-writable ediff-toggle-read-only-function ",v" toggle-read-only key-binding "" toggle-ro-cmd buffer-read-only beep 1 y-or-n-p format "File %s is under version control. Check it out? " abbreviate-file-name ((set-buffer StartBuffer)) ediff-change-saved-variable nil this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" message "Boy, this is risky! Better don't change this file..." sit-for 3 string-match "toggle-read-only" symbol-name ((command-execute toggle-ro-cmd)) "Don't know how to toggle read-only in buffer %S" ediff-toggle-read-only "Warning: file %s is read-only"] 6 (#$ . 20437) nil]) (defalias 'ediff-file-checked-out-p #[(file) ";!!P!" [file file-exists-p file-writable-p ",v"] 3]) (put (quote ediff-file-checked-out-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-file-checked-in-p #[(file) ";!!?P!" [file file-exists-p file-writable-p ",v"] 3]) (put (quote ediff-file-checked-in-p) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@44 Rotate the display of buffers A, B, and C. (defalias 'ediff-swap-buffers #[nil " !\n! \f  =\n\" & !?\n3 7 !>??g \"\n \"\"r \"\n \" ! !\"#\"#!!##\n !0\n   !>0($%$%0%%D 8 @ A@E`'X A@ @ 8E` A@ @D v(8(@(A@E'(A@(@(8E(A@(@D( (.')*,-W,*\",T,))!" [window-live-p ediff-window-A ediff-window-B ediff-buffer-A ediff-buffer-values-orig-A ediff-difference-vector-A ediff-regexp-hide-A ediff-regexp-focus-A ediff-visible-bounds ediff-wide-bounds ediff-emacs-p window-system device-type selected-device (tty stream) ediff-current-diff-overlay-A overlay wide-visibility-p focus-regexp hide-regexp diff-vec values buf ediff-3way-comparison-job set-window-buffer 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 2 ediff-3way-job ediff-narrow-bounds ediff-control-buffer ctl-buf 0 n ediff-number-of-differences ediff-set-state-of-diff-in-all-buffers ediff-recenter no-rehighlight] 8 (#$ . 22490) nil]) #@93 Toggle wide/regular display. This is especially useful when comparing buffers side-by-side. (defalias 'ediff-toggle-wide-display #[nil "  Ă\"! \n?\ntp  f !f !!fΎ q\"RԂS! q!)p=p!) ܂!p   ! !!ݎ q!)=!))" [ediff-window-display-p error "%sEmacs is not running as a window application" ediff-emacs-p "" "X" ediff-recenter no-rehighlight ediff-control-buffer ctl-buf ediff-wide-display-p StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) modify-frame-parameters ediff-wide-display-frame ediff-wide-display-orig-parameters sit-for ediff-xemacs-p 0.40000000000000002 0 nil ediff-window-B this-command ediff-quit "You've killed an essential Ediff buffer---Please quit Ediff" ediff-make-wide-display-function 0.40000000000000002 ((set-buffer StartBuffer))] 4 (#$ . 23945) nil]) #@136 Switch from the multiframe display to single-frame display and back. This is primarily for debugging, but one can use it for fun, too. (defalias 'ediff-toggle-multiframe #[nil "  Ă\"=)=)\n!" [ediff-window-display-p error "%sEmacs is not running as a window application" ediff-emacs-p "" "X" ediff-window-setup-function ediff-setup-windows-multiframe ediff-setup-windows-plain nil ediff-window-B ediff-recenter no-rehighlight] 3 (#$ . 24858) nil]) #@95 Toggle the mode where only the regions where both buffers differ with the ancestor are shown. (defalias 'ediff-toggle-show-clashes-only #[nil "! ?!!" [ediff-merge-with-ancestor-job error "This command makes sense only when merging with an ancestor" ediff-show-clashes-only message "Focus on regions where both buffers differ from the ancestor" "Canceling focus on regions where changes clash"] 3 (#$ . 25349) nil]) #@78 Toggle narrowing in buffers A, B, and C. Used in ediff-windows/regions only. (defalias 'ediff-toggle-narrow-region #[nil " =\n!\f = !" [ediff-buffer-A ediff-buffer-B error "Buffers A and B are the same. Can't narrow to two different regions" ediff-visible-bounds ediff-wide-bounds ediff-narrow-bounds ediff-recenter no-rehighlight] 2 (#$ . 25788) nil]) (defalias 'ediff-visible-region #[nil " =\n=\n =?W \f @ A@ 8 p\n!!!͎q !\\X!\\!) !xt!x!)})=!)p\n ! !!َ q!!!)!!!)})=!)Vp\n\nK\n!K\n!!Kێ\nq!)%!)!)!EA!E!)})U=U!)+" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-narrow-job ediff-wide-bounds ediff-visible-bounds 2 overl-C overl-B overl-A StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) overl ediff-overlayp ediff-emacs-p overlay-start extent-start-position overlay-end extent-end-position this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ediff-3way-job ((set-buffer StartBuffer))] 4]) (defalias 'ediff-operate-on-windows #[(operation arg) " !\f\n!! A !A !!AA!A!!A E\nE!  \n !׏!ُz!ۏ!-" [window-live-p ediff-window-A ediff-window-B ediff-recenter no-rehighlight ediff-buffer-A get-buffer buffer-name ediff-buffer-B ediff-3way-job ediff-buffer-C error "You've killed an essential Ediff buffer---Please quit Ediff" selected-window wind wind-A wind-B ediff-window-C wind-C three-way select-window nil (funcall operation arg) ((error)) (funcall operation arg) ((error)) (funcall operation arg) ((error))] 3]) #@153 Vertically scroll buffers A, B (and C if appropriate). With optional argument ARG, scroll ARG lines; otherwise scroll by nearly the height of window-A. (defalias 'ediff-scroll-vertically #[(&optional arg) " !\f\n!! Q !Q !!QQ!Q!!Q U\nQ\n!Q\n!!U!>aЂbuӚu! !\n! !^^ZZܥ)\"" [window-live-p ediff-window-A ediff-window-B ediff-recenter no-rehighlight ediff-buffer-A get-buffer buffer-name ediff-buffer-B ediff-3way-job ediff-buffer-C error "You've killed an essential Ediff buffer---Please quit Ediff" ediff-operate-on-windows last-command-char (118 22) scroll-up scroll-down arg - prefix-numeric-value nil default-amount window-height ediff-window-C 123 next-screen-context-lines 1 2] 6 (#$ . 27630) "P"]) #@166 Horizontally scroll buffers A, B (and C if appropriate). If an argument is given, that is how many columns are scrolled, else nearly the width of the A/B/C windows. (defalias 'ediff-scroll-horizontally #[(&optional arg) " !\f\n!! Q !Q !!QQ!Q!!Q U\nQ\n!Q\n!!U!UaЂbuӚu!?? !\n!!^^ڥZڥ)\"" [window-live-p ediff-window-A ediff-window-B ediff-recenter no-rehighlight ediff-buffer-A get-buffer buffer-name ediff-buffer-B ediff-3way-job ediff-buffer-C error "You've killed an essential Ediff buffer---Please quit Ediff" ediff-operate-on-windows last-command-char 60 scroll-left scroll-right arg - prefix-numeric-value ediff-control-window window-width ediff-3way-comparison-job ediff-window-C 500 2 3 default-amount] 6 (#$ . 28448) "P"]) (defalias 'ediff-position-region #[(beg end pos job-name) "dVd )!?q Z!`\"\\!*  \"!n̉ !`VY `WY` T< b !SZ]Tť!*b" [end ediff-windows-job pos-visible-in-window-p move-to-window-line window-height 2 count-lines amount scroll-up set-window-start selected-window beg 0 prev-point lines recenter 1 pos] 3]) #@89 Advance to the next difference. With a prefix argument, go back that many differences. (defalias 'ediff-next-difference #[(&optional arg) " W \n\n\\^ Y,!,! W { g\fb\f!b\f!!b\"!JHHc\"{\"!JHHT\"U\" Y,!,!,!!* !" [ediff-current-difference ediff-number-of-differences arg 1 nil regexp-skip n ediff-skip-diff-region-function ediff-install-fine-diff-if-necessary ediff-show-clashes-only string-match "prefer" ediff-buffer-C get-buffer buffer-name intern format "ediff-difference-vector-%S" C 4 "" ediff-ignore-similar-regions A 2 mod 20 0 message "Skipped over region %d and counting ..." ediff-unselect-and-select-difference ediff-visible-region error "At end of the difference list"] 7 (#$ . 29662) "P"]) #@88 Go to the previous difference. With a prefix argument, go back that many differences. (defalias 'ediff-previous-difference #[(&optional arg) "V\n\nZ]W,!,!V {\ng b !b !!b\"!JHHc\"{\"!JHHT\"UT\"SW,!,!,!!* !" [ediff-current-difference -1 arg 1 nil regexp-skip n 0 ediff-skip-diff-region-function ediff-install-fine-diff-if-necessary ediff-show-clashes-only string-match "prefer" ediff-buffer-C get-buffer buffer-name intern format "ediff-difference-vector-%S" C 4 "" ediff-ignore-similar-regions A 2 mod 20 message "Skipped over region %d and counting ..." ediff-unselect-and-select-difference ediff-visible-region error "At beginning of the difference list"] 7 (#$ . 30498) "P"]) #@54 Go to the difference specified as a prefix argument. (defalias 'ediff-jump-to-difference #[(difference-number) "SY\nTW!\"" [difference-number -1 ediff-number-of-differences ediff-unselect-and-select-difference error "Bad difference number, %d"] 4 (#$ . 31316) "p"]) #@154 Go to difference closest to the point in buffer A, B, or C. The type of buffer depends on last command character (a, b, or c) that invoked this command. (defalias 'ediff-jump-to-difference-at-point #[nil ">\n‚>Ă>!!)" [last-command-char (97 65) A (98 66) B (99 67) C buf-type ediff-jump-to-difference ediff-diff-at-point] 3 (#$ . 31607) nil]) (defalias 'ediff-diff-at-point #[(buf-type &optional pos) "=\n\n=\f=Sʉ \f p!!!֎qZ`Wl\fVWT\f  $\f$ \\ Z!\fZ!WT)=!. " [buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C ediff-control-buffer ediff-number-of-differences -1 0 end beg prev-end prev-beg diff-no max-dif-num ctl-buffer buffer StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) pos ediff-get-diff-posn abs this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 8]) #@621 Copy buffer-X'th diff to buffer Y (X,Y are A, B, or C). If numerical prefix argument, copy this diff specified in the arg. Otherwise, copy the difference given by `ediff-current-difference'. This command assumes it is bound to a 2-character key sequence, `ab', `ba', `ac', etc., which is used to determine the types of buffers to be used for copying difference regions. The first character in the sequence specifies the source buffer and the second specifies the target. If the second optional argument, a 2-character string, is given, use it to determine the source and the target buffers instead of the command keys. (defalias 'ediff-diff-to-diff #[(arg &optional keys) " \n\n!HHN  D 92 ND :D @9D @N)N !O \f  } 9k N} :} @9} @N)! \f>т\f>ӂ\f> >т >ӂ >#!," [keys this-command-keys arg ediff-jump-to-difference 0 key1 1 key2 ediff-xemacs-p obj event-symbol-elements event-key char1 char2 ediff-copy-diff ediff-current-difference (97 65) A (98 66) B (99 67) C ediff-recenter no-rehighlight] 6 (#$ . 32615) "P"]) (defalias 'ediff-copy-diff #[(n from-buf-type to-buf-type &optional batch-invocation reg-to-copy) "=\n\n=\f=  \f  $ $W Ή pp  ! !!ߎ q=\n=\f=) =!)p  ! !! q=\n=\f=) =!)!p O !O !!O q=7\nK=B\fK=K)Y =Y!)!!p  ! !! q=\n=\f=) =!)q $ ${) =!.  pp 5 !5 !!5ߎ q=\n1=(\f1=1)? =?!)Xp  ! !! q=m\n=x\f=) =!)!Xp  ! !! q=\n=\f=) =!)!!Xp * !* !!* q=\n&=\f&=&)4 =4!)qE $S ${)b =b!.(w )\"폈   \")=\"!JH22H\")\"!JHI*\"!JH22H\")\"!JHI*\f9\"!JH2)2H\")\"!JHI*)  \"!JH2j2H\")\"!JHI*\"!JH22H\")\"!JHI*\f\"!JH22H\")\"!JHI*)   \"!JH22H\")\"!JHI*\"!JH2D2H\")\"!JHI*\f\"!JH2z2H\")\"!JHI*)!. " [to-buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C to-buf ediff-control-buffer ctrl-buf t saved-p ediff-3way-job three-way nil messg ediff-verbose-p reg-to-delete reg-to-delete-beg reg-to-delete-end ediff-get-diff-posn beg n end reg-to-copy from-buf-type start buf-type StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-disturbed-overlays batch-invocation ediff-test-save-region conds (byte-code "p n !n !!nĎ q ?*b!b !<!SVj\"jVe\"j!*y=y!)#‡" [StartBuffer to-buf get-buffer buffer-name ((set-buffer StartBuffer)) buffer-read-only inhibit-read-only ediff-xemacs-p reg-to-delete-end insert-before-markers "@" reg-to-copy delete-char 1 reg-to-delete-beg kill-region ediff-move-disturbed-overlays this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" batch-invocation ediff-save-diff-region n to-buf-type reg-to-delete messg] 4) ((error (byte-code "\n@\nA##!! ʇ" [message "ediff-copy-diff: %s %s" conds mapconcat prin1-to-string " " beep 1 sit-for 2 nil saved-p] 7))) ediff-set-state-of-diff-in-all-buffers intern format "ediff-difference-vector-%S" diff-record mapcar ediff-delete-overlay 1 ediff-refresh-mode-lines message] 7]) (defalias 'ediff-save-diff-region #[(n buf-type reg) " \n\"\f=#\f=#\f=#\n  A\"\f:\f T J   BCT   BD\nB T\fbтf\f!$+" [assoc n ediff-killed-diffs-alist n-th-diff-saved buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C buf this-buf-n-th-diff-saved reg message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" ediff-merge-job "" symbol-name] 7]) (defalias 'ediff-test-save-region #[(n buf-type) " \n\"\f=#\f=#\f=#\n  A\"\fF T\f#!@ЂG!G+" [assoc n ediff-killed-diffs-alist n-th-diff-saved buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C buf this-buf-n-th-diff-saved yes-or-no-p format "You've previously copied diff region %d to buffer %S. Confirm " t error "Quit"] 6]) #@55 Pop last killed Nth diff region from buffer BUF-TYPE. (defalias 'ediff-pop-diff #[(n buf-type) " \n\"\f=#\f=#\f=#\n  A\"\f \fAR\fAgVc T\f#g!\f $\f $⏈\f \f\"!J H&&H\")\f\"!J HI* \f\"!J H&&H\")\f\"!J HI*  \f\"!J H&&H\")\f\"!J HI*) \" 0\f \" T\f#.\n" [assoc n ediff-killed-diffs-alist n-th-record buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C buf saved-rec ediff-3way-job three-way ediff-control-buffer ctl-buf nil ediff-verbose-p saved-diff reg-beg reg-end recovered ediff-number-of-differences 0 error "Nothing saved for diff %d in buffer %S" "No differences found" ediff-get-diff-posn beg end ediff-disturbed-overlays conds (byte-code "p q !q !!qĎ q ?*b!b !<!SVj\"jVe\"j!*|=|!)‡" [StartBuffer buf get-buffer buffer-name ((set-buffer StartBuffer)) buffer-read-only inhibit-read-only ediff-xemacs-p reg-end insert-before-markers "@" saved-diff delete-char 1 reg-beg kill-region ediff-move-disturbed-overlays t recovered this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 3) ((error (byte-code "\n@\nA##!" [message "ediff-pop-diff: %s %s" conds mapconcat prin1-to-string " " beep 1] 7))) intern format "ediff-difference-vector-%S" diff-record mapcar ediff-delete-overlay 1 ediff-set-state-of-diff-in-all-buffers ediff-refresh-mode-lines delq message "Diff region %d in buffer %S restored"] 6 (#$ . 37656)]) #@247 Restore ARGth diff from `ediff-killed-diffs-alist'. ARG is a prefix argument. If ARG is nil, restore current-difference. If the second optional argument, a character, is given, use it to determine the target buffer instead of last-command-char (defalias 'ediff-restore-diff #[(arg &optional key) "! \f >ǂ1\f >&ɂ1\f+ >1\"!" [arg ediff-jump-to-difference ediff-pop-diff ediff-current-difference key last-command-char (97 65) A (98 66) B (99 67) C ediff-recenter no-rehighlight] 4 (#$ . 39310) "P"]) #@112 Toggle between focusing and hiding of difference regions that match a regular expression typed in by the user. (defalias 'ediff-toggle-regexp-match #[nil "=\n=*=5\n=5!Љ*\n=\"!\"!^\"!=nt\f #!\n \"\f\" * *\n=*#\"!%\"!'\"!(=\f #!\n( \"\n\f\"# % * '." ["" nil alt-connective alt-msg-connective msg-connective regexp-C regexp-B regexp-A ediff-skip-diff-region-function ediff-focus-on-regexp-matches last-command-char 102 ediff-hide-regexp-matches 104 message "Selective browsing by regexp turned off" ediff-show-all-diffs read-string format "Ignore A-regions matching this regexp (default \"%s\"): " ediff-regexp-hide-A "Ignore B-regions matching this regexp (default \"%s\"): " ediff-regexp-hide-B ediff-3way-comparison-job "Ignore C-regions matching this regexp (default \"%s\"): " ediff-regexp-hide-C ediff-hide-regexp-connective and "BOTH" "ONE OF" or y-or-n-p "Hiding diff regions that match %s regexps. Use %s instead? " "Hiding diff regions that match %s regexps" "Focus on A-regions matching this regexp (default \"%s\"): " ediff-regexp-focus-A "Focus on B-regions matching this regexp (default \"%s\"): " ediff-regexp-focus-B "Focus on C-regions matching this regexp (default \"%s\"): " ediff-regexp-focus-C ediff-focus-regexp-connective "Focusing on diff regions that match %s regexps. Use %s instead? " "Focusing on diff regions that match %s regexps"] 6 (#$ . 39851) nil]) (defalias 'ediff-toggle-skip-similar #[nil "=\n!\f?!!" [ediff-auto-refine on error "Can't skip over whitespace regions: first turn auto-refining on" ediff-ignore-similar-regions message "Skipping regions that differ only in white space & line breaks" "Skipping over white-space differences turned off"] 3 nil nil]) #@456 Focus on diffs that match regexp `ediff-regexp-focus-A/B'. Regions to be ignored according to this function are those where buf A region doesn't match `ediff-regexp-focus-A' and buf B region doesn't match `ediff-regexp-focus-B'. This function returns nil if the region number N (specified as an argument) is not to be ignored and t if region N is to be ignored. N is a region number used by Ediff internally. It is 1 less the number seen by the user. (defalias 'ediff-focus-on-regexp-matches #[(n) " Y W) \f \n p\f X !X !!XЎ q $b $#)b=b!)p\f!!!ݎq $b  $#)=!) p\f!!!!!!!q $b  $#)=!)$ &$F&E!.?" [n ediff-current-difference 0 ediff-number-of-differences ediff-control-buffer ctl-buf ediff-regexp-focus-A regex-A ediff-regexp-focus-B regex-B ediff-regexp-focus-C regex-C StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) ediff-get-diff-posn A beg re-search-forward end t this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" reg-A-match ediff-buffer-B ((set-buffer StartBuffer)) B reg-B-match ediff-3way-comparison-job ediff-buffer-C ((set-buffer StartBuffer)) C reg-C-match eval ediff-focus-regexp-connective] 8 (#$ . 41802)]) #@409 Hide diffs that match regexp `ediff-regexp-hide-A/B/C'. Regions to be ignored are those where buf A region matches `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'. This function returns nil if the region number N (specified as an argument) is not to be ignored and t if region N is to be ignored. N is a region number used by Ediff internally. It is 1 less the number seen by the user. (defalias 'ediff-hide-regexp-matches #[(n) " Y W)\n\f \n p\f X !X !!XЎ q $b $#)b=b!)p\f!!!ݎq $b  $#)=!) p\f!!!!!!!q $b  $#)=!)$ &$F&E!." [n ediff-current-difference 0 ediff-number-of-differences ediff-control-buffer ctl-buf ediff-regexp-hide-A regex-A ediff-regexp-hide-B regex-B ediff-regexp-hide-C regex-C StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) ediff-get-diff-posn A beg re-search-forward end t this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" reg-A-match ediff-buffer-B ((set-buffer StartBuffer)) B reg-B-match ediff-3way-comparison-job ediff-buffer-C ((set-buffer StartBuffer)) C reg-C-match eval ediff-hide-regexp-connective] 8 (#$ . 43183)]) #@220 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). (defalias 'ediff-quit #[nil "!!\f " [y-or-n-p "Do you really want to exit Ediff? " message "" ediff-really-quit] 3 (#$ . 44509) nil]) (defalias 'ediff-really-quit #[nil "!!!\"\"\" \n* \f. \f  \" \"֏؏ڏ) !!" [ediff-unhighlight-diffs-totally-in-one-buffer A B C ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-delete-temp-files ediff-quit-widened ediff-wide-bounds ediff-visible-bounds ediff-narrow-bounds ediff-visible-region mapcar #[(overl) " ! !" [ediff-overlayp overl ediff-delete-overlay] 2] #[(overl) " ! !" [ediff-overlayp overl ediff-delete-overlay] 2] ediff-control-buffer control-buffer nil (byte-code "p - !- !!-Ď q\"!!)8 =8!)‡" [StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) delq control-buffer ediff-this-buffer-control-sessions kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 3) ((error)) (byte-code "p - !- !!-Ď q\"!!)8 =8!)‡" [StartBuffer ediff-buffer-B get-buffer buffer-name ((set-buffer StartBuffer)) delq control-buffer ediff-this-buffer-control-sessions kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 3) ((error)) (byte-code "p % !% !!%Ď q!!)0=0!)‡" [StartBuffer ediff-buffer-C get-buffer buffer-name ((set-buffer StartBuffer)) kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 3) ((error)) ediff-restore-protected-variables run-hooks ediff-cleanup-hooks ediff-quit-hooks] 3]) (defalias 'ediff-delete-temp-files #[nil "; !\n;\n! ; !" [ediff-temp-file-A delete-file ediff-temp-file-B ediff-temp-file-C] 2]) (defalias 'ediff-cleanup-mess #[nil " \n \f  \n \f 1 !1 !!1 !!) Q !Q !!Q !!) q !q !!q !!)  ! !! !!)  ! !! !!)  ! !! !!)  ! !! !!)  ! !! !!)  !B-1 !>B!B! a !a !!a !!) ⏈䏈y揈!." [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer ediff-control-frame ediff-3way-job three-way-job ctl-frame ctl-buf buff-C buff-B buff-A ediff-diff-buffer buf get-buffer buffer-name kill-buffer ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-tmp-buffer ediff-error-buffer ediff-patch-diagnostics ediff-msg-buffer ediff-debug-buffer ediff-emacs-p window-system device-type selected-device (tty stream) frame-live-p delete-frame delete-other-windows nil (byte-code " !\n !" [ediff-get-visible-buffer-window buff-B switch-to-buffer] 2) ((error)) (byte-code " !\n! !" [ediff-get-visible-buffer-window buff-A buff-B split-window-vertically switch-to-buffer] 2) ((error)) (byte-code " !\n! ! ! " [ediff-get-visible-buffer-window buff-C buff-A buff-B split-window-vertically switch-to-buffer balance-windows] 2) ((error)) message ""] 7]) #@306 Kill buffers A, B, and, possibly, C, if these buffers aren't modified. In merge jobs, buffer C is never deleted. However, the side effect of cleaning up may be that you cannot compare the same buffer in two separate Ediff sessions: quitting one of them will delete this buffer in another session as well. (defalias 'ediff-janitor #[nil "3!3!!3!32\f!2\f!!2\f!!)k!k!!k!kj\f!j\f!!j\f!!)!!!?!\f!\f!!\f!!)  ! !!? ! \f!\f!!\f!!)" [ediff-buffer-A get-buffer buffer-name buffer-modified-p buf kill-buffer ediff-buffer-B ediff-merge-job ediff-ancestor-buffer ediff-buffer-C] 4 (#$ . 48134)]) (defalias 'ediff-default-suspend-hook #[nil "\n\f ! ! ! \n \f 7; !`HL !>`!`!c m!w!!!  !  !!! ! !! !!! ! !! ! !  !   ! !! !.\f" [ediff-buffer-A buf-A ediff-buffer-B buf-B ediff-buffer-C buf-C ediff-get-visible-buffer-window buf-A-wind buf-B-wind buf-C-wind ediff-patch-buf buf-patch ediff-patch-diagnostics buf-patch-diag ediff-error-buffer buf-err ediff-diff-buffer buf-diff ediff-custom-diff-buffer buf-custom-diff ediff-fine-diff-buffer buf-fine-diff ediff-emacs-p window-system device-type selected-device (tty stream) frame-live-p ediff-control-frame iconify-frame bury-buffer window-live-p select-window delete-other-windows get-buffer buffer-name] 3]) #@178 Suspend Ediff. To resume, switch to the appropriate `Ediff Control Panel' buffer and then type \[ediff-recenter]. Ediff will automatically set up an appropriate window config. (defalias 'ediff-suspend #[nil "!!\n\")" [substitute-command-keys "\\[ediff-recenter]" key run-hooks ediff-suspend-hooks message "To resume, switch to Ediff Control Panel and hit `%s'"] 3 (#$ . 49749) nil]) #@122 Show the names of the buffers or files being operated on by Ediff. Hit \[ediff-recenter] to reset the windows afterward. (defalias 'ediff-status-info #[nil " !!p @ !@ !!@Ȏ q 4 \"!< \"!)K =K!)p!!!Ҏq y \"! \"!) =!)p!!!׎q  \"! \"!) =!)p ! !!ڎ qe`\"T) =!)p0!0!!0ݎqe`\"T): =:!) \"!\"!p{!{!!{qe`\"T) =!)  \"!+&W肮&)Yꂮ&T\"!+!!.=!.=!456$!.=!9:;$!!!\"!" [" *ediff-info*" princ ediff-version "\n\n" StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) buffer-file-name format "File A = %S\n" "Buffer A = %S\n" this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ediff-buffer-B ((set-buffer StartBuffer)) "File B = %S\n" "Buffer B = %S\n" ediff-3way-job ediff-buffer-C ((set-buffer StartBuffer)) "File C = %S\n" "Buffer C = %S\n" ((set-buffer StartBuffer)) count-lines A-line ((set-buffer StartBuffer)) B-line nil C-line "Buffer A's point is on line %d\n" "Buffer B's point is on line %d\n" ((set-buffer StartBuffer)) "Buffer C's point is on line %d\n" "\nCurrent difference number = %S\n" ediff-current-difference 0 start ediff-number-of-differences end ediff-ignore-similar-regions "\nSkipping regions that differ only in white space & line breaks" "\nNot skipping regions that differ in white space & line breaks" ediff-skip-diff-region-function ediff-show-all-diffs "\nSelective browsing by regexp is off.\n" ediff-hide-regexp-matches "\nIgnoring regions that match" "\n regexp `%s' in buffer A %S\n regexp `%s' in buffer B\n" ediff-regexp-hide-A ediff-hide-regexp-connective ediff-regexp-hide-B ediff-focus-on-regexp-matches "\nFocusing on regions that match" ediff-regexp-focus-A ediff-focus-regexp-connective ediff-regexp-focus-B "\nSelective browsing via a user-defined method.\n" "\nBugs/suggestions: type `%s' while in Ediff Control Panel." substitute-command-keys "\\[ediff-submit-report]"] 7 (#$ . 50149) nil]) #@28 Jump to Ediff's Info file. (defalias 'ediff-documentation #[nil "  Ǐ*" [ediff-control-window ediff-control-buffer ctl-buf ctl-window ediff-skip-unsuitable-frames nil (byte-code "!!!!" [pop-to-buffer get-buffer-create "*info*" info "ediff" message "Type `i' to search for a specific topic"] 3) ((error (byte-code "!ǂ\"!\n!'\n! !" [beep 1 " *ediff-info*" princ format "\nThe Info file for Ediff does not seem to be installed.\n\nThis file is part of the distribution of %sEmacs.\nPlease contact your system administrator. " ediff-xemacs-p "X" "" window-live-p ctl-window select-window switch-to-buffer ctl-buf] 5)))] 3 (#$ . 52391) nil]) (defalias 'ediff-select-difference #[(n) "!!! ! !!\f, \fY6\fW)D H !{U Y !>{ {\f\f\"\f\"\f\")\f$ \f$\f$\f!!" [ediff-buffer-A get-buffer buffer-name ediff-buffer-B n ediff-current-difference 0 ediff-number-of-differences ediff-emacs-p window-system device-type selected-device (tty stream) ediff-use-faces ediff-highlight-diff-in-one-buffer A B C face ediff-highlighting-style ascii ediff-place-flags-in-buffer ediff-control-buffer ediff-3way-job ediff-buffer-C ediff-install-fine-diff-if-necessary run-hooks ediff-select-hooks] 6]) (defalias 'ediff-unselect-difference #[(n) " Y W)\f ! !I\f, 0 !>I I!!!=\"!JHH\"\"!JHH\"\"!JHH\" \"!" [n ediff-current-difference 0 ediff-number-of-differences ediff-emacs-p window-system device-type selected-device (tty stream) ediff-use-faces ediff-unhighlight-diff-in-one-buffer A B C ediff-highlighting-style ascii ediff-remove-flags-from-buffer ediff-buffer-A intern format "ediff-difference-vector-%S" ediff-buffer-B ediff-3way-job ediff-buffer-C nil ediff-set-fine-diff-properties default run-hooks ediff-unselect-hooks] 7]) (defalias 'ediff-unselect-and-select-difference #[(n &optional flag no-recenter) "\n\n!) ǎ= !=&!*" [n ediff-current-difference no-recenter ediff-recenter no-rehighlight ediff-control-buffer control-buf ((byte-code "p ! !! Ď q )+=+!)‡" [StartBuffer control-buf get-buffer buffer-name ((set-buffer StartBuffer)) ediff-refresh-mode-lines this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 3)) flag select-only ediff-unselect-difference unselect-only ediff-select-difference] 2]) (defalias 'ediff-read-file-name #[(prompt default-dir default-file) " \f\f!!!!\f\f!\fȘ'\n\f;\fQ<# \f\fG\f!% \"\n\n!`\f`\f!\n\"\n\n)" [file-name-as-directory abbreviate-file-name expand-file-name default-dir default-file file-name-directory default-directory file-name-nondirectory "" nil f read-file-name format "%s%s: " prompt " (default " ")" t file-directory-p] 8]) (defalias 'ediff-make-temp-file #[(&optional prefix given-file start end) "\n  PP! !e + ,d% \")" [given-file make-temp-name ediff-temp-file-prefix prefix "_" "ediff_" f write-region start end nil no-message set-file-modes ediff-temp-file-mode] 6]) (defalias 'ediff-protect-metachars #[(str) ">)  #(‰O”OQ•T)" [system-type (emx vax-vms axp-vms) 0 limit string-match ediff-metachars str "\\" nil] 5]) (defalias 'ediff-verify-file-buffer #[(&optional file-magic) "p!3 N Ƃ#!- % ̉\"\"\"!I D ̉\"\"" [verify-visited-file-modtime buffer-modified-p yes-or-no-p format "Buffer out of sync with visited file. %s file %s? " file-magic "Revert" "Save" buffer-file-name save-buffer erase-buffer revert-buffer t error "Buffer out of sync for file %s" "Buffer out of sync with visited file. Revert file %s? "] 5]) (defalias 'ediff-check-for-ascii-flags #[nil "\f\"B!" [eval or mapcar #[(buf) "=!=!!=p2!2!!2Ďq )=<=<!)" [buf get-buffer buffer-name StartBuffer ((set-buffer StartBuffer)) ediff-highlighting-style ascii this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 3] ediff-this-buffer-control-sessions] 5]) (defalias 'ediff-insert-in-front #[(overl &optional flag beg end length) " \"\f B" [ediff-overlay-get overl ediff-diff-num ediff-disturbed-overlays] 3]) (defalias 'ediff-move-disturbed-overlays #[(posn) "\n\"É" [mapcar #[(overl) " \n  !\f ! !)#" [ediff-move-overlay overl posn ediff-overlayp ediff-emacs-p overlay-end extent-end-position] 5] ediff-disturbed-overlays nil] 3]) #@153 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. (defalias 'ediff-save-buffer #[(arg) "p >w >Ă# >Ƃ# >#=- >7ĂH >AƂH >H=R\n >\\Ăm >fƂm >m=W =W!!W >\n >Ă >Ƃ >= $ >Ă >Ƃ >=\n$ >Ă >Ƃ >=$ $ =$!!\"$!W > >:ĂK >DƂK >K=U  >_Ăp >iƂp >p=z\n >Ă >Ƃ >=  =!!!!W֎ >5 >Ă >Ƃ >= O >Ă >Ƃ >=\nO >Ă+ >$Ƃ+ >+=O O =O!!MOq )a=a!)" [StartBuffer last-command-char (97 98 99) (97 65) A (98 66) B (99 67) C ediff-buffer-A ediff-buffer-B ediff-buffer-C 100 message "Saving diff output ..." sit-for 1 arg ediff-diff-buffer ediff-custom-diff-buffer get-buffer buffer-name ((set-buffer StartBuffer)) save-buffer this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 4 (#$ . 57071) "P"]) (defalias 'ediff-remove-flags-from-buffer #[(buffer overlay) "p J !J !!JĎ q+ #2 #@ #F #*T=T!)" [StartBuffer buffer get-buffer buffer-name ((set-buffer StartBuffer)) t inhibit-read-only ediff-xemacs-p ediff-overlay-put overlay begin-glyph nil before-string end-glyph after-string this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 4]) (defalias 'ediff-place-flags-in-buffer #[(buf-type buffer ctl-buffer diff) "p % !% !!%Ď q#)/ =/!)" [StartBuffer buffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-place-flags-in-buffer1 buf-type ctl-buffer diff this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 4]) (defalias 'ediff-place-flags-in-buffer1 #[(buf-type ctl-buffer diff-no) "p * !* !!*Ď q\"!J HH)4 =4!) $bnp ! !!׎ q=}{}) =!)## $bnp ! !! q=\"#) =!)# #-" [StartBuffer ctl-buffer get-buffer buffer-name ((set-buffer StartBuffer)) intern format "ediff-difference-vector-%S" buf-type diff-no 0 this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" curr-overl ediff-get-diff-posn beg before nil after beg-of-line flag ((set-buffer StartBuffer)) ediff-highlighting-style ascii ediff-before-flag-bol ediff-before-flag-mol ediff-xemacs-p ediff-overlay-put begin-glyph before-string end ((set-buffer StartBuffer)) ediff-after-flag-eol ediff-after-flag-mol end-glyph after-string] 6]) #@433 Returns positions of difference sectors in the BUF-TYPE buffer. BUF-TYPE should be a symbol--either `A' or `B'. POS is either `beg' or `end'--it specifies whether you want the position at the beginning of a difference or at the end. The optional argument N says which difference (default: `ediff-current-difference'). The optional argument CONTROL-BUF says which control buffer is in effect in case it is not the current buffer. (defalias 'ediff-get-diff-posn #[(buf-type pos &optional n control-buf) "\npp\nb\n!b\n!!bƎ\nq*W9\nYP\nVLT\n#P!\"!JHH)m=m!)= !!!) !!!))" [nil diff-overlay control-buf StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) n ediff-current-difference 0 ediff-number-of-differences error "There is no diff %d. Valid diffs are 1 to %d" "No differences found" intern format "ediff-difference-vector-%S" buf-type this-command ediff-quit "You've killed an essential Ediff buffer---Please quit Ediff" pos beg overl ediff-overlayp ediff-emacs-p overlay-start extent-start-position overlay-end extent-end-position] 4 (#$ . 59957)]) (defalias 'ediff-highlight-diff-in-one-buffer #[(n buf-type) "=\n\n=\f=bb=*\n<=4\f<=<!b=L\n^=V\f^=^!!b=m\n=w\f= p\n  ! !!ˎ qd)\f=!)##ւ\\^\"!J\"!J\"!J!\"!#\"!%&#! $# ###!P,P#\"!%\"\"!JHH#. " [buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C get-buffer buffer-name buff StartBuffer ((set-buffer StartBuffer)) this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" last ediff-get-diff-posn beg n begin end 1 0 xtra end-hilit intern format "ediff-current-diff-overlay-%S" current-diff-overlay "ediff-odd-diff-face-%S" odd-diff-face "ediff-even-diff-face-%S" even-diff-face "ediff-odd-diff-face-%S-var" odd-diff-face-var "ediff-even-diff-face-%S-var" even-diff-face-var ediff-xemacs-p ediff-move-overlay ediff-overlay-put priority ediff-highest-priority face-differs-from-default-p ediff-highlight-all-diffs copy-face "ediff-difference-vector-%S" face nil] 7]) (defalias 'ediff-unhighlight-diff-in-one-buffer #[(buf-type) "=\n\n=\f==*\n<=4\f<=<!=L\n^=V\f^=^!!\"!J\"!\"!\"!JHH։#\"=#," [buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C get-buffer buffer-name intern format "ediff-current-diff-overlay-%S" "ediff-odd-diff-face-%S-var" "ediff-even-diff-face-%S-var" "ediff-difference-vector-%S" ediff-current-difference 0 overlay even-diff-face-var odd-diff-face-var current-diff-overlay ediff-move-overlay 1 ediff-overlay-put face logand] 7]) (defalias 'ediff-unhighlight-diffs-totally-in-one-buffer #[(buf-type) "!\n\f  !p\n  !>?pp  \"!J \"! \"!!_\"\"!k!L-" [ediff-unselect-and-select-difference -1 ediff-emacs-p window-system device-type selected-device (tty stream) ediff-use-faces t inhibit-quit intern format "ediff-current-diff-overlay-%S" buf-type current-diff-overlay-var current-diff-overlay "ediff-odd-diff-face-%S-var" odd-diff-face-var "ediff-even-diff-face-%S-var" even-diff-face-var face-differs-from-default-p copy-face default ediff-overlayp ediff-delete-overlay nil] 5]) (defalias 'ediff-clear-diff-vector #[(vec-var &optional fine-diffs-also) " J! J\" L" [vectorp vec-var mapcar #[(elt) " H!  \fH\")" [ediff-delete-overlay elt 0 fine-diffs-also diff-record mapcar 1] 5] nil] 3]) #@135 Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. Checks if overlay's buffer exists before actually doing the move. (defalias 'ediff-move-overlay #[(overlay beg end &optional buffer) "!4\n!4\n!!4 (#;\n$;;!)" [overlay ediff-overlay-buffer buf get-buffer buffer-name ediff-xemacs-p set-extent-endpoints beg end move-overlay buffer ediff-delete-overlay] 6 (#$ . 63769)]) #@109 Calls `overlay-put' or `set-extent-property' depending on Emacs version. Checks if overlay's buffer exists. (defalias 'ediff-overlay-put #[(overlay prop value) " !, !!, !!!,\f$ # # !" [ediff-overlay-buffer overlay get-buffer buffer-name ediff-xemacs-p set-extent-property prop value overlay-put ediff-delete-overlay] 4 (#$ . 64204)]) (defalias 'ediff-make-bullet-proof-overlay #[(beg end buff) "!!!pt!t!!tƎq!:!\n!G\n!\n\n#\fi\f#\f#\f#o\f#\f)~=~!*" [buff get-buffer buffer-name nil overl StartBuffer ((set-buffer StartBuffer)) number-or-marker-p beg eval end ediff-make-overlay ediff-xemacs-p ediff-overlay-put detachable start-open end-open ediff-diff-num 0 this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 4]) (defalias 'ediff-overlay-start #[(overl) " !\n ! !" [ediff-overlayp overl ediff-emacs-p overlay-start extent-start-position] 2]) (put (quote ediff-overlay-start) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-overlay-end #[(overl) " !\n ! !" [ediff-overlayp overl ediff-emacs-p overlay-end extent-end-position] 2]) (put (quote ediff-overlay-end) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-other-buffer #[(buff) "<C \n\" \" $@:\n\"\" 7 @:p!," [buff buffer-list frame-buffers mapcar #[(x) " !\n\nÇ !Ç !\"Ç " [buffer-name x buff nil ediff-get-visible-buffer-window string-match "^ "] 4] significant-buffers delq nil buffers less-significant-buffers #[(x) " !\n\nÇ !\"Ç " [buffer-name x buff nil string-match "^[ *]"] 4] other-buffer] 5]) (defalias 'ediff-unique-buffer-name #[(prefix suffix) " \nP!\f \nP \f\n$!\fT \f\n$)" [get-buffer prefix suffix 2 n format "%s<%d>%s"] 6]) #@29 Submit bug report on Ediff. (defalias 'ediff-submit-report #[nil " \n\n  !Ɖ \n \f  :6 !AA \nK O !j\nZ ^ !>j#)! c!  ! !! q !  & !!  ! !!p)  ! !! q!)-=!)." [t ediff-control-buffer ediff-emacs-p window-system device-type selected-device nil buffer-name salutation varlist ediff-device-type ctl-buf reporter-prompt-for-summary-p (ediff-diff-program ediff-diff-options ediff-patch-program ediff-patch-options ediff-shell ediff-use-faces ediff-auto-refine ediff-highlighting-style ediff-buffer-A ediff-buffer-B ediff-control-buffer ediff-forward-word-function ediff-control-frame ediff-control-frame-parameters ediff-control-frame-position-function ediff-prefer-iconified-control-frame ediff-window-setup-function ediff-split-window-function ediff-job-name ediff-word-mode buffer-name ediff-device-type) "\nCongratulations! You may have unearthed a bug in Ediff!\n\nPlease make a concise and accurate summary of what happened\nand mail it to the address above.\n-----------------------------------------------------------\n" ediff-skip-unsuitable-frames frame ediff-xemacs-p frame-selected-window selected-frame (tty stream) set-mouse-position 1 0 switch-to-buffer ediff-msg-buffer erase-buffer delete-other-windows "\nPlease read this first:\n----------------------\n\nSome ``bugs'' may actually be no bugs at all. For instance, if you are\nreporting that certain difference regions are not matched as you think they\nshould, this is most likely due to the way Unix diff program decides what\nconstitutes a difference region. Ediff is an Emacs interface to diff, and\nit has nothing to do with those decisions---it only takes the output from\ndiff and presents it in a way that is better suited for human browsing and\nmanipulation.\n\nIf Emacs happens to dump core, this is NOT an Ediff problem---it is\nan Emacs bug. Report this to Emacs maintainers.\n\nAnother popular topic for reports is compilation messages. Because Ediff\ninterfaces to several other packages and runs under Emacs and XEmacs,\nbyte-compilation may produce output like this:\n\n While compiling toplevel forms in file ediff.el:\n ** reference to free variable pm-color-alist\n ........................\n While compiling the end of the data:\n ** The following functions are not known to be defined: \n ediff-valid-color-p, ediff-set-face,\n ........................\n\nThese are NOT errors, but inevitable warnings, which ought to be ignored.\n\nPlease do not report those and similar things. However, comments and\nsuggestions are always welcome.\n\nMail anyway? (y or n) " y-or-n-p "Mail anyway? " get-buffer require reporter reporter-submit-bug-report "kifer@cs.sunysb.edu" ediff-version bury-buffer beep message "Bug report aborted" StartBuffer ((set-buffer StartBuffer)) ediff-recenter no-rehighlight this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff"] 7 (#$ . 66125) nil]) #@345 Combine LIST1 and LIST2 using a set-union operation. The result list contains all items that appear in either LIST1 or LIST2. This is a non-destructive function; it makes a copy of the data if necessary to avoid corrupting the original LIST1 and LIST2. This is a slightly simplified version from `cl-seq.el'. Added here to avoid loading cl-*. (defalias 'ediff-union #[(list1 list2) " \f G GY  7 @>0 @B A$" [list1 list2] 3 (#$ . 69223)]) (defalias 'ediff-deactivate-mark #[nil " \n!" [ediff-xemacs-p zmacs-deactivate-region transient-mark-mode nil mark-active run-hooks deactivate-mark-hook] 2]) (byte-code "! MM" [fboundp nuke-selective-display ediff-nuke-selective-display #[nil "~eb =7#7`y\n#!c%\f!-" [buffer-modified-p nil end buffer-read-only mod-p t selective-display search-forward " " 0 delete-char -1 "\n" set-buffer-modified-p] 4]] 2) (defalias 'ediff-save-variables #[(vars) "\n\"" [mapcar #[(v) "JB" [v] 2] vars] 3]) (put (quote ediff-save-variables) (quote byte-optimizer) (quote byte-compile-inline-expand)) (defalias 'ediff-restore-variables #[(vars assoc-list) "@@\n\"ALAÇ" [vars assoc assoc-list nil] 5]) (defalias 'ediff-change-saved-variable #[(var value buf-type) " !P!J\f\"*" [intern "ediff-buffer-values-orig-" symbol-name buf-type assoc-list assoc var assoc-elt value] 5]) (defalias 'ediff-save-protected-variables #[nil "p % !% !!%Ď q \"*/ =/!) p[![!![ώq \"*e =e!)p!!!ӎq \"* =!)" [StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) ediff-protected-variables vars mapcar #[(v) "JB" [v] 2] this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ediff-buffer-values-orig-A ediff-buffer-B ((set-buffer StartBuffer)) ediff-buffer-values-orig-B ediff-3way-comparison-job ediff-buffer-C ((set-buffer StartBuffer)) ediff-buffer-values-orig-C] 3]) (defalias 'ediff-restore-protected-variables #[nil " \np.!.!!.ʎq\f \")9 =9!)pb!b!!bҎq\f\f\")m =m!)p!!!Վq\f \") =!)+" [ediff-buffer-values-orig-A ediff-buffer-values-orig-B ediff-buffer-values-orig-C values-C values-B values-A StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) ediff-restore-variables ediff-protected-variables this-command ediff-quit error "You've killed an essential Ediff buffer---Please quit Ediff" ediff-buffer-B ((set-buffer StartBuffer)) ediff-3way-comparison-job ediff-buffer-C ((set-buffer StartBuffer))] 3]) #@2  (defvar ediff-command-begin-time (quote (0 0 0)) (#$ . 71993)) (byte-code "!#" [make-variable-buffer-local ediff-command-begin-time put permanent-local t] 4) (defalias 'ediff-calc-command-time #[nil " \f88Y\f88Z'\f88Z\\\fA@A@ZȚ=\n #+" [current-time nil sec micro end 2 ediff-command-begin-time 1000000 (0 0 0) message "Elapsed time: %d second(s) + %d microsecond(s)"] 4]) (defalias 'ediff-save-time #[nil " " [current-time ediff-command-begin-time] 2]) (put (quote ediff-save-time) (quote byte-optimizer) (quote byte-compile-inline-expand)) #@34 Toggle profiling Ediff commands. (defalias 'ediff-profile #[nil "!!!!!!>6\"\"\f!#\"!" [ediff-control-buffer get-buffer buffer-name error "This command runs only out of Ediff Control Buffer" make-local-variable pre-command-hook post-command-hook ediff-save-time remove-hook ediff-calc-command-time (0 0 0) ediff-command-begin-time message "Ediff profiling disabled" add-hook t "Ediff profiling enabled"] 4 (#$ . 72589) nil]) (defalias 'ediff-print-diff-vector #[(diff-vector-var) " \"! !\"" [princ format "\n*** %S ***\n" diff-vector-var mapcar #[(overl-vec) "\fH\"T\fH\fHGUȂ!\fH#\fH\fH\fH&!" [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 overl-vec 0 ediff-diff-num 1 "none\n" mapconcat prin1-to-string "\n " 2 3 4] 10] eval] 4]) (defalias 'ediff-debug-info #[nil "!!!! \"!P!!P!!P!!" [ediff-control-buffer get-buffer buffer-name error "This command runs only out of Ediff Control Buffer" ediff-debug-buffer princ format "\nCtl buffer: %S\n" ediff-print-diff-vector intern "ediff-difference-vector-" "A" "B" "C"] 5 nil nil]) (byte-code "!!" [run-hooks ediff-load-hooks provide ediff-util] 2)