;ELC ;;; compiled by kwzh@nutrimat.gnu.ai.mit.edu on Wed Jul 17 15:43:22 1996 ;;; from file /gd/gnu/emacs/19.0/lisp/ediff-util.el ;;; emacs version 19.31.94.1. ;;; 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.29"))) (error "`ediff-util.el' was compiled for Emacs 19.29 or later")) (byte-code "!!!B!BŇ" [require ediff-init ediff-mult boundp ediff-patch-diagnostics nil current-load-list ediff-patchbufer] 2) #@648 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' `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-hook] 2 (#$ . 643)]) (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 (#$ . 1504)) (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 (#$ . 1767)]) (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(# # # # # # # # # # # # #!} #$ # # # # # # # # # # # # # # #! # @# A# B#CW DE# @F# AG# BH# IJ# KL# MN# OP#Q RS# TU# VF# WG# X# YZ# [\\# ]^# _^# `^# ab# @S# AU# ]^# _^# cd# e# fg# hg#!( ij# k# lb# mb# n# op# qp# rp#st!~ ut#v wp# x# yz# M{|!" [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 "D" ediff-show-diff-output "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 "E" ediff-documentation "?" ediff-toggle-help "!" ediff-update-diffs "M" ediff-show-meta-buffer "R" ediff-show-registry "*" ediff-make-or-kill-fine-diffs "a" "b" "r" ediff-merge-job "/" ediff-show-ancestor ediff-copy-A-to-C ediff-copy-B-to-C ediff-restore-diff-in-merge-buffer "s" ediff-shrink-window-C "+" ediff-combine-diffs "$" ediff-toggle-show-clashes-only "&" ediff-re-merge ediff-3way-comparison-job "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" "##" ediff-toggle-skip-similar "o" "A" "B" "w" "wa" ediff-save-buffer "wb" "wd" fboundp ediff-show-patch-diagnostics "P" ediff-3way-job "wc" "gc" "m" ediff-toggle-wide-display run-hooks ediff-keymap-setup-hook] 4 (#$ . 2013)]) (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!)H=H!)p7!7!!7ӎq @@@ALAq>>>> >\">$!!!!!!!!\",! $ 8h)=:\n ;<(=>\"!==q@;!p;N;!N;!!NA;qB)Y=Y!) CD$*E F:G=HIJ\"KKOLMKNMOM\"KO!S]PāQ\"!Rp  ! !!S qT@UVT8T)=!)p:7:!7:!!7W:qT@U3VT8T)C=C!)p==!=!!X=qT@U{VT8T)=!)>>!>!!p>>!>!!Y>qT@UVT8T)=!)Z [\\]^_`F#^abG#^cdH#Eef,gh0ehi g>egpFF!F!!jFqk lm!p!!!nq)=!)Eo>oBo)=!)pG;G!;G!!;pGqk lm!p!!!qq)!=!!)(Eo>7oBo)G=G!)pHH!H!!rHqk lm!o>oBo)=!)>>!>!!p>>!>!!s>qk Elm!o>oBo)=!)] \n #tGuvwxy!xz!-x{!:x|!} :=$g@~~!ic~!i~!)gA@~~!~!~!)Vg8~~!~!~!)!b)!b)!b)+! l! EB +!+!!+!l!)C=C!)*" [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 ediff-KILLED-VITAL-BUFFER 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-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 string-match "buffer" symbol-name t make-local-hook pre-command-hook ediff-window-display-p add-hook ediff-spy-after-mouse nil mouse-pixel-position ediff-mouse-pixel-position default-B buffer-B buf ediff-merge-split-window-function buffer-C ediff-ancestor-buffer "*ediff-merge" insert-buffer ((set-buffer StartBuffer)) major-mode local-write-file-hooks ediff-set-merge-mode buffer-read-only ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer "<[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: " " Ancestor: ") 2 ((set-buffer StartBuffer)) ((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-hook ((set-buffer StartBuffer)) ediff-this-buffer-ediff-sessions ((set-buffer StartBuffer)) ((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 Ancestor ediff-setup-windows overl ediff-overlayp ediff-emacs-p 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 startup-hooks ediff-refresh-mode-lines ediff-session-registry ediff-update-registry ediff-meta-buffer ediff-update-meta-buffer ediff-startup-hook] 7]) #@35 Set up window for control buffer. (defalias 'ediff-setup-control-buffer #[(ctl-buf) " ! \nq\n! c ( !  F&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-multiframe-setup-p 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-window-display-p ediff-multiframe ediff-wide-display-p ediff-window-config-saved ediff-whitespace] 9 (#$ . 9051)]) (defalias 'ediff-help-message-line-length #[nil "eb\f!i)" [ediff-use-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 ~ ||~\f!" [ediff-long-help-message-function 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-function ediff-window-display-p ediff-multiframe ediff-brief-message-string ediff-brief-help-message ediff-use-long-help-message ediff-help-message run-hooks ediff-display-help-hook] 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 "\np= \")-!-!!-!-!p\f P !P !!PΎ q`)Z =Z!)! !k !!!x!!!!!@A@8 !\"#$%&'()!$,,!.,!,!)!#,,!.,!,!)\",,!.,!,!)$,,!5.1,!5,!) #,,!S.O,!S,!)\",,!q.m,!q,!)3!  ($(\"($(\"8($(\" '\"&\"8%\"\"\"\"\"?@ABCDEFFEDCBD\"GBHCDEIFB#-;GJK!K!LK!8w\nLMNMJWtONL\"NTN\\))PQR)\"!ST!." [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-ancestor-buffer get-buffer buffer-name y-or-n-p "Recompute differences during merge, really? " "God forbid!" StartBuffer ediff-buffer-A ((set-buffer StartBuffer)) ediff-quit ediff-KILLED-VITAL-BUFFER get-buffer-create ediff-tmp-buffer file-name-nondirectory buffer-file-name ediff-buffer-B ediff-buffer-C ediff-narrow-bounds 2 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 ediff-make-temp-file "regA" "regB" ediff-3way-job "regC" ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-difference-vector-Ancestor ediff-state-of-merge ediff-killed-diffs-alist ediff-setup-diff-regions-function ediff-3way-comparison-job ediff-merge-job ediff-merge-with-ancestor-job ediff-job-name ediff-setup-diff-regions3 t ediff-files3 ediff-number-of-differences delete-file ctl-buf 0 n ediff-set-state-of-diff-in-all-buffers ediff-jump-to-difference ediff-diff-at-point A message ""] 17 (#$ . 10810) 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) "\np= \")\n \n \f pY!Y!!Yڎq\")d =d!)p!!!q\") =!)p!!!q\") =!)q?!!#\" . " [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-keep-variants ediff-ancestor-buffer ediff-merge-with-ancestor-job ediff-merge-job ediff-3way-comparison-job comparison merge ancestor-job ancestor-buf keep-variants ctl-buf bufC bufB bufA StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) revert-buffer t noconfirm ediff-quit ediff-KILLED-VITAL-BUFFER ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ediff-really-quit kill-buffer ediff-merge-buffers-with-ancestor ediff-merge-buffers ediff-update-diffs] 9 (#$ . 13097) "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) "\np= \")b!b!!b\nb\n!b\n!!b U\fb\f!b\f!!b\n\f\n$p =p!\") 99 > >!\"!!!!!! ! !! \"!#\"$ $!%$!$!=)\"!\"\n)*!!!\n\n!\n!! K\f\f!\f!!+U-!!! f!p2))!)!!)q 5#\"$ $!%$!$!=)* =\") =!)p2))!)!!)q ) =!+" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command buffer-read-only ediff-buffer-A get-buffer buffer-name ediff-buffer-B ediff-3way-job ediff-buffer-C ediff-setup-windows ediff-quit message ediff-KILLED-VITAL-BUFFER beep 1 ediff-visible-region ediff-window-display-p last-command (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 ediff-window-A raise-frame window-frame ediff-window-B ediff-window-C frame-live-p ediff-control-frame ediff-use-long-help-message frame ediff-xemacs-p frame-iconified-p frame-visible-p icon control-buf control-frame no-rehighlight ediff-select-difference ediff-current-difference ediff-recenter-one-window A B C StartBuffer ((set-buffer StartBuffer)) ediff-recenter-ancestor ediff-multiframe ediff-reset-mouse ((set-buffer StartBuffer)) ediff-refresh-mode-lines] 5 (#$ . 14160) nil]) (defalias 'ediff-recenter-one-window #[(buf-type) "\nY \fW) =\" @;=0 A@;=; 8  !TP !T !)\"!J!sJ\"! $$$$!." [nil n ediff-current-difference 0 ediff-number-of-differences 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 end] 9]) (defalias 'ediff-recenter-ancestor #[nil "!!! Y \fW)! \n \f p!!!юq\f$b|!\f$\f$\f$ $)=!)!," [ediff-ancestor-buffer get-buffer buffer-name nil n ediff-current-difference 0 ediff-number-of-differences ediff-get-visible-buffer-window selected-window ediff-job-name ediff-control-buffer ctl-buf job-name ctl-wind window StartBuffer ((set-buffer StartBuffer)) ediff-get-diff-posn Ancestor beg select-window ediff-position-region end this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 9]) #@102 Toggle vertical/horizontal window split. Does nothing if file-A and file-B are in different frames. (defalias 'ediff-toggle-split #[nil "\np= \")! !\" \n !- \f8!\nC\n!\fN\f!=!!!===Ղ!!." [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command 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] 3 (#$ . 17272) 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 "\np= \") /=)!\f\"Ή\f\"\f\"II!bX!b!rr v!\f\"" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-has-face-support-p 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" "Highlighting with ASCII flags" "Re-highlighting all difference regions" t ediff-color-background-regions unhighlight] 3 (#$ . 18036) nil]) #@26 Toggle auto-refine mode. (defalias 'ediff-toggle-autorefine #[nil "\np= \")!=+\f\"!=;!щ\f\"!ɉ" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-word-mode "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 (#$ . 18896) nil]) #@48 Show the ancestor buffer in a suitable window. (defalias 'ediff-show-ancestor #[nil "  ! !!$\f !$! ! 9 !!> \")" [ediff-recenter ediff-ancestor-buffer get-buffer buffer-name ediff-merge-with-ancestor-job error "Lost connection to ancestor buffer...sorry" "Not merging with ancestor" nil wind ediff-get-visible-buffer-window raise-frame window-frame set-window-buffer ediff-window-C] 3 (#$ . 19433) 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) "\np= \")=    \"!J H8H\") \"!J HI*    \"!J HiH\") \"!J HI*    \"!J HH\") \"!J HI*)ZWZ    \"!J HH\") \"!J HI*    \"!J HH\") \"!J HI*X    \"!J HHH\") \"!J HI*) " [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command arg - ediff-current-difference n A buf-type intern format "ediff-difference-vector-%S" diff-record mapcar ediff-delete-overlay 1 B ediff-3way-job C 0 ediff-make-fine-diffs] 6 (#$ . 19884) "P"]) #@33 Toggle short/long help message. (defalias 'ediff-toggle-help #[nil "\np= \") ? )Q Q Q\f N !NH !N !=)!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command buffer-read-only erase-buffer ediff-use-long-help-message ediff-set-help-message ediff-window-display-p ediff-multiframe ediff-control-frame frame 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] 3 (#$ . 20735) 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) "\np= \")?p> ɂ3>+˂3>3? s=Pq=\\q=hq=qp!!!َq!!!!!$!88&$8!!\"!%p!!!q#)! =!0!)8$!!!!$O$!\"O)U\"&? =!!?!!#, =0!+" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command buf last-command-char (97 65) A (98 66) B (99 67) C buf-type ctl-buf ediff-recenter ediff-buffer-A ediff-buffer-B ediff-buffer-C Ancestor ediff-ancestor-buffer 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 ediff-file-checked-out-p toggle-read-only key-binding "" toggle-ro-cmd ediff-file-checked-in-p buffer-read-only beep 1 y-or-n-p format "File %s is under version control. Check it out? " ediff-abbreviate-file-name ((set-buffer StartBuffer)) ediff-change-saved-variable ediff-quit ediff-KILLED-VITAL-BUFFER 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 (#$ . 21343) nil]) (defalias 'ediff-file-checked-out-p #[(file) ";!!P!Q!" [file file-exists-p file-writable-p ",v" "RCS/"] 4]) (defalias 'ediff-file-checked-in-p #[(file) "; ! !? P! Q!" [file file-exists-p file-writable-p ",v" "RCS/"] 4]) #@44 Rotate the display of buffers A, B, and C. (defalias 'ediff-swap-buffers #[nil "\np= \")!! \n \f = 2]\" \"\"k\" \"  \n\n  ! !! !\"\f#\"#$ %$%#\f#% % &'&'''$8@A@E@)8A@@8E@A@@DV*8*@*A@Er)j*A@*@*8Er*A@*@D**.)\n+-.W-+\"-T-))!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command 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-has-face-support-p 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 ctl-buf 0 n ediff-number-of-differences ediff-set-state-of-diff-in-all-buffers ediff-recenter no-rehighlight] 7 (#$ . 23293) nil]) #@93 Toggle wide/regular display. This is especially useful when comparing buffers side-by-side. (defalias 'ediff-toggle-wide-display #[nil "\np= \") !ɂ\"!\n ?up g !g !!gҎ q\" q!)q =q!) p  ! !!ڎ q!) =!))" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-window-display-p "%sEmacs is not running as a window application" ediff-emacs-p "" "X" ediff-recenter no-rehighlight 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 ediff-window-B ediff-quit ediff-KILLED-VITAL-BUFFER ediff-make-wide-display-function ((set-buffer StartBuffer))] 4 (#$ . 24757) nil]) #@153 Switch from the multiframe display to single-frame display and back. For a permanent change, set the variable `ediff-window-setup-function', which see. (defalias 'ediff-toggle-multiframe #[nil "\np= \") !ɂ\" =. 8 =8 !" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-window-display-p "%sEmacs is not running as a window application" ediff-emacs-p "" "X" ediff-window-setup-function ediff-setup-windows-multiframe ediff-setup-windows-plain ediff-window-B ediff-recenter no-rehighlight] 3 (#$ . 25621) 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 "\np= \")!?$!!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-merge-with-ancestor-job "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"] 4 (#$ . 26242) 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 ediff-NO-DIFFERENCES ediff-visible-bounds ediff-wide-bounds ediff-narrow-bounds ediff-recenter no-rehighlight] 2 (#$ . 26801) nil]) (defalias 'ediff-visible-region #[nil " =\n=\n =?Z \f @ A@ 8 p\n!!!͎q !\\X!\\!) !xt!x!)})=!)p\n ! !!َ q!!!)!!!)})=!)Yp\n\nM\n!M\n!!Mێ\nq!+'!+!)!GC!G!)})X=X!)+" [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 ediff-KILLED-VITAL-BUFFER ((set-buffer StartBuffer)) ediff-3way-comparison-job ((set-buffer StartBuffer))] 4]) (defalias 'ediff-operate-on-windows #[(operation arg) " !\f\n!! A !A !!AA!A!!A F\nF\f!  \n\"\" o\"!ߏ!Ꮘ!㏈!." [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 ediff-KILLED-VITAL-BUFFER selected-window wind wind-A wind-B ediff-window-C wind-C ediff-get-region-size-coefficient A operation coefA B coefB three-way C coefC select-window nil (byte-code "\n _!!" [operation round coefA arg] 4) ((error)) (byte-code "\n _!!" [operation round coefB arg] 4) ((error)) (byte-code "\n _!!" [operation round coefC arg] 4) ((error))] 4]) #@169 Vertically scroll buffers A, B (and C if appropriate). With optional argument ARG, scroll ARG lines; otherwise scroll by nearly the one half of the height of window-A. (defalias 'ediff-scroll-vertically #[(&optional arg) "\np= \")!! ! d !d !!dd!d!!did!d!!i!>uՂvؚ!!!^!^ޥZZޥ)\"" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command 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 ediff-KILLED-VITAL-BUFFER ediff-operate-on-windows last-command-char (118 22) scroll-up scroll-down arg - prefix-numeric-value default-amount window-height ediff-window-C 500 2 next-screen-context-lines 1] 5 (#$ . 28725) "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) "\np= \")!! ! d !d !!dd!d!!did!d!!i!UuՂvؚ!!!^!^ߥZ!!ߥ!)\"" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command 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 ediff-KILLED-VITAL-BUFFER 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] 5 (#$ . 29640) "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]) (defalias 'ediff-get-lines-to-region-end #[(buf-type &optional n ctl-buf) " \n\f p\n\n!\n!!ǎ\nq=1\nR==\fR=IR=R\"!!!\"p!!!ݎqW\") =#!. =#!)" [n ediff-current-difference ctl-buf ediff-control-buffer StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer buf eval intern format "ediff-window-%S" wind window-start beg ediff-get-diff-posn end nil lines ((set-buffer StartBuffer)) count-lines 0 this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 5]) (defalias 'ediff-get-lines-to-region-start #[(buf-type &optional n ctl-buf) " \n\f p\n\n!\n!!ǎ\nq=1\nR==\fR=IR=R\"!!!\"p!!!ێqW\")=!!.=!!)" [n ediff-current-difference ctl-buf ediff-control-buffer StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer buf eval intern format "ediff-window-%S" wind window-end end ediff-get-diff-posn beg ((set-buffer StartBuffer)) count-lines 0 this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 5]) (defalias 'ediff-get-region-size-coefficient #[(buf-type op &optional n ctl-buf) "p \n\n \n! \n!!Ŏ '\nq5YA W)\n=P̂\\\n=[΂\\ω # #]!!! #]V #\\\\*)=!)" [StartBuffer ctl-buf ediff-control-buffer get-buffer buffer-name ((set-buffer StartBuffer)) n ediff-current-difference 0 ediff-number-of-differences op scroll-down ediff-get-lines-to-region-start scroll-up ediff-get-lines-to-region-end (lambda (a b c) 0) func A B ediff-buffer-C C max-lines buf-type 0.0 0.0 1 this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 6]) #@92 Advance to the next difference. With a prefix argument, go forward that many differences. (defalias 'ediff-next-difference #[(&optional arg) "\np= \")W\\^ \nY: \n! :\n!\nW v b]\nHH^\"v\"!J\nHH\nT\n\n\"U\n\"\nY: \n! :\n!:!\n!* !" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-current-difference ediff-number-of-differences arg regexp-skip n ediff-skip-diff-region-function ediff-install-fine-diff-if-necessary ediff-show-clashes-only string-match "prefer" ediff-state-of-merge 0 "" ediff-ignore-similar-regions intern format "ediff-difference-vector-%S" A 2 mod 20 message "Skipped over region %d and counting ..." ediff-unselect-and-select-difference ediff-visible-region "At end of the difference list"] 5 (#$ . 32960) "p"]) #@88 Go to the previous difference. With a prefix argument, go back that many differences. (defalias 'ediff-previous-difference #[(&optional arg) "\np= \")VZ] \nW7\f\n! 7\n!\nV r^Y\nHHZ\"r\"!J\nHH\nT\"U\nT\"\nS\nW7\f\n! 7\n!7!\n!* !" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-current-difference -1 arg regexp-skip n 0 ediff-skip-diff-region-function ediff-install-fine-diff-if-necessary ediff-show-clashes-only string-match "prefer" ediff-state-of-merge "" ediff-ignore-similar-regions intern format "ediff-difference-vector-%S" A 2 mod 20 message "Skipped over region %d and counting ..." ediff-unselect-and-select-difference ediff-visible-region "At beginning of the difference list"] 5 (#$ . 33880) "p"]) #@113 Go to the difference specified as a prefix argument. If the prefix is negative, count differences from the end. (defalias 'ediff-jump-to-difference #[(difference-number) "\np= \")W\\+V*S+ɉY@X@! T$" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command difference-number 0 ediff-number-of-differences -1 ediff-unselect-and-select-difference ediff-BAD-DIFF-NUMBER] 6 (#$ . 34778) "p"]) #@331 Go to difference closest to the point in buffer A, B, or C. The buffer depends on last command character (a, b, or c) that invoked this command. For instance, if the command was `ga' then the point value in buffer A is used. With a prefix argument, synchronize all files around the current point position in the specified buffer. (defalias 'ediff-jump-to-difference-at-point #[(arg) "\np= \")>Ȃ,>$ʂ,>,̉ =9Z =EZ =QZ =Zp!!!׎q`) =!) #W p!!!qd) =!) S##$%&'( !! $,%-&.'p=!=!!=q#Z()H =H!)%! Vdb &! kdb '!'! db $!. " [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command last-command-char (97 65) A (98 66) B (99 67) C buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C Ancestor ediff-ancestor-buffer buffer StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-quit ediff-KILLED-VITAL-BUFFER pt ediff-diff-at-point arg after diff-no ediff-number-of-differences past-last-diff ((set-buffer StartBuffer)) ediff-get-diff-posn beg ctl-wind wind-A wind-B wind-C shift ediff-jump-to-difference -1 selected-window ediff-window-A ediff-window-B ediff-window-C ((set-buffer StartBuffer)) select-window (backward-char shift) ((error)) recenter (backward-char shift) ((error)) window-live-p (backward-char shift) ((error))] 5 (#$ . 35276) "P"]) (defalias 'ediff-diff-at-point #[(buf-type &optional pos which-diff) "=\n\n'=\f'='=' \nS̉ p!!!؎qe`WwVWT $$ g>VUT=T=]\"!]\"!WT)\"=%!. " [buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer 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 which-diff (after before) after before abs count-lines 1 this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 8]) #@639 Copy buffer-X'th difference region to buffer Y (X,Y are A, B, or C). If numerical prefix argument, copy the difference specified in the arg. Otherwise, copy the difference given by `ediff-current-difference'. This command assumes it is bound to a 2-character key sequence, `ab', `ba', `ac', etc., which is used to determine the types of buffers to be used for copying difference regions. The first character in the sequence specifies the source buffer and the second specifies the target. If the second optional argument, a 2-character string, is given, use it to determine the source and the target buffers instead of the command keys. (defalias 'ediff-diff-to-diff #[(arg &optional keys) "\np= \") =!,!H Hp e9SNe:e@9e@N)p !r  9N:@9@N)!>ڂ>܂>>ڂ>܂># -" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command keys this-command-keys arg - -1 ediff-jump-to-difference 0 key1 1 key2 ediff-xemacs-p obj event-symbol-elements event-key char1 char2 ediff-verbose-p ediff-copy-diff ediff-current-difference (97 65) A (98 66) B (99 67) C ediff-recenter] 6 (#$ . 37625) "P"]) #@120 Copy ARGth difference region from buffer A to B. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-A-to-B #[(arg) " \"" [ediff-diff-to-diff arg "ab"] 3 (#$ . 38942) "P"]) #@120 Copy ARGth difference region from buffer B to A. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-B-to-A #[(arg) " \"" [ediff-diff-to-diff arg "ba"] 3 (#$ . 39165) "P"]) #@127 Copy ARGth difference region from buffer A to buffer C. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-A-to-C #[(arg) " \"" [ediff-diff-to-diff arg "ac"] 3 (#$ . 39388) "P"]) #@127 Copy ARGth difference region from buffer B to buffer C. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-B-to-C #[(arg) " \"" [ediff-diff-to-diff arg "bc"] 3 (#$ . 39618) "P"]) #@120 Copy ARGth difference region from buffer C to B. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-C-to-B #[(arg) " \"" [ediff-diff-to-diff arg "cb"] 3 (#$ . 39848) "P"]) #@120 Copy ARGth difference region from buffer C to A. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-C-to-A #[(arg) " \"" [ediff-diff-to-diff arg "ca"] 3 (#$ . 40071) "P"]) (defalias 'ediff-copy-diff #[(n from-buf-type to-buf-type &optional batch-invocation reg-to-copy) "=\n\n'=\f'='=' \n   $ $b Љ pp  ! !! q=\n=\f==)\"=%!)p ! !! !!! q=\n=\f==),\"=,%!)!p  ! !! q=\\\n|=g\f|=s|=|)\"=%!)!!p  ! !! q=\n=\f==)\"=%!)q $\n ${)\"=%!.  pp  ! !! q=]\n}=h\f}=t}=})\"=%!)p  ! !! q=\n=\f==)\"=%!)!p = != !!= q=\n9=$\f9=09=9)H\"=H%!)!!p  ! !! q=y\n=\f==)\"=%!)q $ ${)\"=%!. *\"   \"*\"!JH333H\")\"!JHI*\"!JH3d3H\")\"!JHI*\"!JH33H\")\"!JHI*) TT\"!JH33H\")\"!JHI*\"!JH3\f3H\")\"!JHI*S\"!JH3B3H\")\"!JHI*)  \"!JH33H\")\"!JHI*\"!JH33H\")\"!JHI*\"!JH33H\")\"!JHI*)!. " [to-buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer 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 ediff-KILLED-VITAL-BUFFER ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) ((set-buffer StartBuffer)) batch-invocation ediff-test-save-region conds (byte-code "p 8 !8 !!8Ď q ?bc V4 \"*D =D!)T#‡" [StartBuffer to-buf get-buffer buffer-name ((set-buffer StartBuffer)) buffer-read-only inhibit-read-only reg-to-delete-end reg-to-copy reg-to-delete-beg kill-region this-command ediff-quit error ediff-KILLED-VITAL-BUFFER 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.\f=.\f  A\"E_ U  BC_  BD\nB T\fmӂq\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 Ancestor ediff-ancestor-buffer 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.\f=.\f  A\"Q T\f#!K҂R!R+" [assoc n ediff-killed-diffs-alist n-th-diff-saved buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer 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.\f=.\f  A\"A]AsVn T\f#s!\f $\f $㏈ \f\"!J H''H\")\f\"!J HI* \f\"!J H''H\")\f\"!J HI* \f\"!J H''H\")\f\"!J HI*)%% \" 9 \" 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 Ancestor ediff-ancestor-buffer 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" ediff-NO-DIFFERENCES ediff-get-diff-posn beg end conds (byte-code "p ; !; !!;Ď q ?bc V4 \"\f*G =G!)‡" [StartBuffer buf get-buffer buffer-name ((set-buffer StartBuffer)) buffer-read-only inhibit-read-only reg-end saved-diff reg-beg kill-region t recovered this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 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 (#$ . 44186)]) #@250 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 last-command-char (defalias 'ediff-restore-diff #[(arg &optional key) "\np= \")! \n# >,͂I\n3 ><ςI\nC >I\" )" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command 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-verbose-p ediff-recenter] 4 (#$ . 45676) "P"]) #@101 Restore ARGth diff in the merge buffer. ARG is a prefix argument. If nil, restore the current diff. (defalias 'ediff-restore-diff-in-merge-buffer #[(arg) " \"" [ediff-restore-diff arg 99] 3 (#$ . 46357) "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 "\np= \")Ɖ \n \f =/=> =I=I!Չ \\= \"!\f\"! t\"!\n=   #! \"\"\fƘ\f Ƙ \nƘ\\\n\\=\\ (\"!\f*\"! ,\"!\n-=   #!0 \":-\"\fƘE\f( ƘP *\nƘ\\\n,." [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command "" alt-connective alt-msg-connective msg-connective regexp-C regexp-B regexp-A ediff-skip-diff-region-function ediff-focus-on-regexp-matches-function last-command-char 102 ediff-hide-regexp-matches-function 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 "Ignore regions that match %s regexps, OK? " "Will ignore 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 "Focus on regions that match %s regexps, OK? " "Will focus on regions that match %s regexps"] 6 (#$ . 46576) nil]) (defalias 'ediff-toggle-skip-similar #[nil "\np= \")=! ? &!!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-auto-refine on "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"] 4 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 ] !] !!]Ў q $ $}eb#*h=h!)p\f!!!ގq $ $} #*=!) !p\f\"\"!\"!!\"q $ $} #*=!)%!\f' %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 end re-search-forward nil t this-command ediff-quit error ediff-KILLED-VITAL-BUFFER 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] 7 (#$ . 48786)]) #@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)\f \n p\f ] !] !!]Ў q $ $}eb#*h=h!)p\f!!!ގq $ $}eb #*=!) !p\f\"\"!\"!!\"q $ $}eb #*=!)%!' %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 end re-search-forward nil t this-command ediff-quit error ediff-KILLED-VITAL-BUFFER 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] 7 (#$ . 50152)]) #@496 Finish an Ediff session and exit Ediff. Unselects the selected difference, if any, restores the read-only and modified flags of the compared file buffers, kills Ediff buffers for this session (but not buffers A, B, C). If `ediff-keep-variants' is nil, the user will be asked whether the buffers containing the variants should be removed (if they haven't been modified). If it is t, they will be preserved unconditionally. A prefix argument, temporarily reverses the meaning of this variable. (defalias 'ediff-quit #[(reverse-default-keep-variants) "\np= \") * !* !!*̂+\"!9!!!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command y-or-n-p format "Quit this Ediff session%s? " ediff-meta-buffer get-buffer buffer-name " & show containing session group" "" message ediff-really-quit reverse-default-keep-variants] 6 (#$ . 51467) "P"]) (defalias 'ediff-really-quit #[(reverse-default-keep-variants) "!!!!\"\"\"\" \f3 7  \"\"ڏ܏ޏ\"\"\" !''('?''!)!!!!!!*" [ediff-unhighlight-diffs-totally-in-one-buffer A B C Ancestor 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-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 ediff-meta-buffer meta-buffer control-buffer nil (byte-code "p - !- !!-Ď q\"!!)9 =9!)‡" [StartBuffer ediff-buffer-A get-buffer buffer-name ((set-buffer StartBuffer)) delq control-buffer ediff-this-buffer-ediff-sessions kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3) ((error)) (byte-code "p - !- !!-Ď q\"!!)9 =9!)‡" [StartBuffer ediff-buffer-B get-buffer buffer-name ((set-buffer StartBuffer)) delq control-buffer ediff-this-buffer-ediff-sessions kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3) ((error)) (byte-code "p - !- !!-Ď q\"!!)9 =9!)‡" [StartBuffer ediff-buffer-C get-buffer buffer-name ((set-buffer StartBuffer)) delq control-buffer ediff-this-buffer-ediff-sessions kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3) ((error)) (byte-code "p - !- !!-Ď q\"!!)9 =9!)‡" [StartBuffer ediff-ancestor-buffer get-buffer buffer-name ((set-buffer StartBuffer)) delq control-buffer ediff-this-buffer-ediff-sessions kill-local-variable mode-line-buffer-identification mode-line-format this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3) ((error)) delq ediff-session-registry ediff-update-registry ediff-restore-protected-variables run-hooks ediff-cleanup-hook ediff-keep-variants reverse-default-keep-variants ediff-janitor ask ediff-quit-hook ediff-cleanup-meta-buffer get-buffer buffer-name ediff-show-meta-buffer] 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 !B !!B !!) ޏZ⏈!." [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-window-display-p 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 #[(&optional ask) "F!F!!F!F\f'!\"!FE!E!!E!!)\n\n!\n!!\n!\fr\n!\"!\n!!!!!)\f  ! !!?2 !2\f !\"!?2 !!!!!)!!!?2!2\f!\"!?21!1!!1!!)" [ediff-buffer-A get-buffer buffer-name buffer-modified-p ask y-or-n-p format "Kill buffer A [%s]? " buf kill-buffer ediff-buffer-B "Kill buffer B [%s]? " ediff-merge-job ediff-ancestor-buffer "Kill the ancestor buffer [%s]? " ediff-buffer-C "Kill buffer C [%s]? "] 6 (#$ . 56261)]) (defalias 'ediff-default-suspend-function #[nil "\n\f ! ! ! \n \f  A!A!D N!X!b!l! v !  !!! ! !! !!! ! !! ! ! ! ! !! !.\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-patchbufer 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-window-display-p 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 "\np= \")!!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command run-hooks ediff-suspend-hook message "To resume, type M-x eregistry and select the desired Ediff session"] 3 (#$ . 58023) 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 "\np= \") ) ! !!p ^!^!!^юqR\"!Z \"!)i =i!)p !!!َq\"! \"!) =!)p !!!ގq\"! \"!) =!)\"\"!\"!!\"!P\"!&A&!A&!!A&!PB\"!p l!l!!lqe`\"T)v =v!))p !!!qe`\"T) =!)+,)\"!+\"!p !!!qe`\"T) =!),,\"!+2W25Y2T\"!8./\"!;@<@!>=Pʁ@!>A=oʁB!ӁCDEF$!>G=ʁH!ӁCIJK$!ʁL!ӁMNO!\"!PQ!RQ!ST!UT!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-skip-unsuitable-frames ediff-msg-buffer raise-frame selected-frame 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" ediff-quit ediff-KILLED-VITAL-BUFFER 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" "Customized diff output %s\n" ediff-custom-diff-buffer " in buffer " "is not available" "Plain diff output %s\n" ediff-diff-buffer ((set-buffer StartBuffer)) count-lines A-line ((set-buffer StartBuffer)) B-line 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 "\n%s regions that differ only in white space & line breaks" ediff-ignore-similar-regions "Skipping" "Not skipping" ediff-merge-job ediff-show-clashes-only "\nFocusing on regions where both buffers differ from the ancestor" ediff-skip-diff-region-function ediff-show-all-diffs "\nSelective browsing by regexp is off\n" ediff-hide-regexp-matches-function "\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-function "\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]" frame-live-p ediff-control-frame ediff-reset-mouse window-live-p ediff-control-window select-window] 7 (#$ . 58501) nil]) (defalias 'ediff-select-difference #[(n) "!!! ! !!\f, \fY6\fW) a a\f\f\"\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-has-face-support-p ediff-use-faces ediff-highlight-diff-in-one-buffer A B C Ancestor face ediff-highlighting-style ascii ediff-place-flags-in-buffer ediff-control-buffer ediff-3way-job ediff-buffer-C ediff-ancestor-buffer ediff-install-fine-diff-if-necessary run-hooks ediff-select-hook] 6]) (defalias 'ediff-unselect-difference #[(n) " Y W) 1 1!!!! =\"!JHH\"\"!JHH\"m\"!JHH\"!!!\"!JHH\" \"!" [n ediff-current-difference 0 ediff-number-of-differences ediff-has-face-support-p ediff-use-faces ediff-unhighlight-diff-in-one-buffer A B C Ancestor 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 ediff-ancestor-buffer get-buffer buffer-name nil ediff-set-fine-diff-properties default run-hooks ediff-unselect-hook] 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 ediff-KILLED-VITAL-BUFFER] 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? Q# \fF \fN\f!% \"\n\n!g\fg\f!\n\"\n\n)" [file-name-as-directory ediff-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 #[(buff &optional prefix given-file start end) " =\fGV\fO \fP\nB \"1 !B? !? B !p!!!ӎqlmewxd % \" )=!+" [prefix "ediff" nil f p system-type ms-dos 7 0 ediff-temp-file-prefix given-file find-file-name-handler find-file-noselect make-temp-name file-exists-p StartBuffer buff get-buffer buffer-name ((set-buffer StartBuffer)) write-region start end no-message set-file-modes ediff-temp-file-mode this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 6]) (defalias 'ediff-verify-file-buffer #[(&optional file-magic) "p! 8 \"!ȏ \" \"!4\f/ ω\" \"" [verify-visited-file-modtime buffer-modified-p yes-or-no-p format "Buffer out of sync with visited file. Save file %s? " buffer-file-name nil (save-buffer) ((error (byte-code " \"" [beep message "Couldn't save %s" buffer-file-name] 3))) error "Buffer is out of sync for file %s" "Buffer is out of sync with visited file. REVERT file %s? " file-magic erase-buffer revert-buffer t "Buffer out of sync for file %s"] 4]) #@335 Safe way of saving buffers A, B, C, and the diff output. `wa' saves buffer A, `wb' saves buffer B, `wc' saves buffer C, and `wd' saves the diff output. With prefix argument, `wd' saves plain diff output. Without an argument, it saves customized diff argument, if available (and plain output, if customized output was not generated). (defalias 'ediff-save-buffer #[(arg) "\np= \") p>>&˂9>1͂9>9=C >N˂a>Y͂a>a=k >v˂>͂>= >˂>͂>=] =]!!!!! !!! !!! !]>>6˂I>A͂I>I=S0>^˂q>i͂q>q={0>˂>͂>=0>˂>͂>=00=0!!!!!0!!!0-!-!!-0!!]>>H˂[>S͂[>[=eB>p˂>{͂>=B>˂>͂>=B>˂>͂>=BB=B!!  ! !! B%!%!!%B?!?!!?B!!!]>>[˂n>f͂n>n=xU>˂>͂>=U>˂>͂>=U>˂>͂>=UU=U!!!!!U8!8!!8UR!R!!RU!q )g =g#!)" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-compute-custom-diffs-maybe 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 Ancestor ediff-ancestor-buffer 100 message "Saving diff output ..." sit-for 1 arg ediff-diff-buffer get-buffer buffer-name ediff-custom-diff-buffer "Output from `diff' not found" ((set-buffer StartBuffer)) save-buffer ediff-quit ediff-KILLED-VITAL-BUFFER] 5 (#$ . 64755) "P"]) (defalias 'ediff-compute-custom-diffs-maybe #[nil " !\n!É;!;%! \"\n\"\nF\n!F\n!!N\"!\n\n \f& !\f!," [buffer-file-name ediff-buffer-A ediff-buffer-B nil file-B file-A buf-B-file-name buf-A-file-name file-name-nondirectory ediff-make-temp-file ediff-custom-diff-buffer get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-custom-diff" "*" ediff-exec-process ediff-custom-diff-program synchronize ediff-custom-diff-options delete-file] 8]) (defalias 'ediff-show-diff-output #[(arg) "\np= \") !) 6\n6\n!6\n!!6\nr P !P !!P r\nj\n!j\n!!j\nr !p!!!ӎqeb) =!)! !)!!!!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-compute-custom-diffs-maybe ediff-skip-unsuitable-frames ok-unsplittable arg ediff-diff-buffer get-buffer buffer-name ediff-custom-diff-buffer beep message "Output from `diff' not found" buf StartBuffer ((set-buffer StartBuffer)) ediff-quit ediff-KILLED-VITAL-BUFFER switch-to-buffer raise-frame selected-frame frame-live-p ediff-control-frame ediff-reset-mouse window-live-p ediff-control-window select-window] 4 nil "P"]) (defalias 'ediff-remove-flags-from-buffer #[(buffer overlay) "p J !J !!JĎ q+ #2 #@ #F #*U=U!)" [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 ediff-KILLED-VITAL-BUFFER] 4]) (defalias 'ediff-place-flags-in-buffer #[(buf-type buffer ctl-buffer diff) "p % !% !!%Ď q#)0 =0\f!)" [StartBuffer buffer get-buffer buffer-name ((set-buffer StartBuffer)) ediff-place-flags-in-buffer1 buf-type ctl-buffer diff this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 4]) (defalias 'ediff-place-flags-in-buffer1 #[(buf-type ctl-buffer diff-no) "p * !* !!*Ď q\"!J HH)5 =5!) $bnp ! !!׎ q=~|~) =!)## $bnp ! !! q=\"#) =!)#\f#-" [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 ediff-KILLED-VITAL-BUFFER 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]) (defalias 'ediff-get-diff-posn #[(buf-type pos &optional n control-buf) "\npp\nf\n!f\n!!fƎ\nq*W9\nYT\nVO\f T\n$T!\"!JHH)r =r!) ! !! !!!!= !!!) !!!))" [nil diff-overlay control-buf StartBuffer get-buffer buffer-name ((set-buffer StartBuffer)) n ediff-current-difference 0 ediff-number-of-differences error ediff-BAD-DIFF-NUMBER this-command ediff-NO-DIFFERENCES intern format "ediff-difference-vector-%S" buf-type ediff-quit ediff-KILLED-VITAL-BUFFER ediff-overlay-buffer pos beg overl ediff-overlayp ediff-emacs-p overlay-start extent-start-position overlay-end extent-end-position] 5]) (defalias 'ediff-highlight-diff-in-one-buffer #[(n buf-type) "=\n\n'=\f'='=ZZ=5\nR=?\fR=JR=R!Z=b\n=l\f=w=!!Z=\n=\f== p\f  ! !!͎ qd)=!)##؂\\^\"!J !#, $# ###\"!JHH\"." [buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer get-buffer buffer-name buff StartBuffer ((set-buffer StartBuffer)) this-command ediff-quit error ediff-KILLED-VITAL-BUFFER 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-xemacs-p ediff-move-overlay ediff-overlay-put priority ediff-highest-priority ediff-diff-num ediff-set-overlay-face "ediff-difference-vector-%S" nil] 7]) (defalias 'ediff-unhighlight-diff-in-one-buffer #[(buf-type) "=\n\n'=\f'='==5\nR=?\fR=JR=R!=b\n=l\f=w=!!\"!J\"!JHHԉ# \"=ۂ\"!*\"*" [buf-type A ediff-buffer-A B ediff-buffer-B C ediff-buffer-C Ancestor ediff-ancestor-buffer get-buffer buffer-name intern format "ediff-current-diff-overlay-%S" "ediff-difference-vector-%S" ediff-current-difference 0 overlay current-diff-overlay ediff-move-overlay 1 ediff-set-overlay-face ediff-has-face-support-p ediff-use-faces ediff-highlight-all-diffs dif-num logand "ediff-even-diff-face-%S" "ediff-odd-diff-face-%S"] 7]) (defalias 'ediff-unhighlight-diffs-totally-in-one-buffer #[(buf-type) "! 1 1 \"!\nJ ! !, !\nL+" [ediff-unselect-and-select-difference -1 ediff-has-face-support-p ediff-use-faces t inhibit-quit intern format "ediff-current-diff-overlay-%S" buf-type current-diff-overlay-var current-diff-overlay ediff-color-background-regions unhighlight 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]) (defalias 'ediff-color-background-regions #[(&optional unhighlight) "\n\"\n\"\n\"\n\"" [ediff-color-background-regions-in-one-buffer A unhighlight B C Ancestor] 3]) (defalias 'ediff-color-background-regions-in-one-buffer #[(buf-type unhighlight) "\f\"!!ʼn\"+" [eval intern format "ediff-difference-vector-%S" buf-type nil diff-num overl diff-vector mapcar #[(rec) "H\n\"\n?.   \"=(΂)\"!*\"" [rec 0 overl ediff-overlay-get ediff-diff-num diff-num ediff-set-overlay-face unhighlight buf-type dif-num intern format logand 1 "ediff-even-diff-face-%S" "ediff-odd-diff-face-%S"] 7]] 5]) #@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 (#$ . 73357)]) #@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 (#$ . 73792)]) (defalias 'ediff-make-bullet-proof-overlay #[(beg end buff) "!!!p!!!Ǝq!:!\n!G\n!\n V\n#_\n%\fkтl# \f#\f#\f#\f)=!*" [buff get-buffer buffer-name nil overl StartBuffer ((set-buffer StartBuffer)) number-or-marker-p beg eval end ediff-xemacs-p make-extent make-overlay rear-advance ediff-overlay-put ediff-emacs-p evaporate detachable start-open end-open ediff-diff-num 0 this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 6]) (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]) (defalias 'ediff-split-string #[(string) "\f#0\f#\fOGV)\n B)\fOGVA\n B +" [0 nil substr result start string-match "[ ]+" string match] 5]) #@29 Submit bug report on Ediff. (defalias 'ediff-submit-report #[nil "\np= \")\n ! \f  \f ! c!}f!f!!fq  !  \f& !!!!!p'!!!q!) =,!)." [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command t ediff-emacs-p window-system device-type selected-device 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 ediff-reset-mouse 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 1 message "Bug report aborted" StartBuffer ((set-buffer StartBuffer)) ediff-recenter no-rehighlight ediff-quit ediff-KILLED-VITAL-BUFFER] 7 (#$ . 75929) nil]) (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 \"*0 =0\f!) p\\!\\!!\\ώq \"*g =g\f!)p!!!ӎq \"* =\f!)!!!p!!!֎q \"* =\f!)" [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 ediff-KILLED-VITAL-BUFFER 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 ediff-ancestor-buffer ((set-buffer StartBuffer)) ediff-buffer-values-orig-Ancestor] 3]) (defalias 'ediff-restore-protected-variables #[nil " \n p 3 !3 !!3̎ q\")?=?!)pi!i!!iԎq\")u=u!)p!!!׎q \")=!)!!!p!!!َq\f\")=!)," [ediff-buffer-values-orig-A ediff-buffer-values-orig-B ediff-buffer-values-orig-C ediff-buffer-values-orig-Ancestor values-Ancestor 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 ediff-KILLED-VITAL-BUFFER ediff-buffer-B ((set-buffer StartBuffer)) ediff-3way-comparison-job ediff-buffer-C ((set-buffer StartBuffer)) ediff-ancestor-buffer ((set-buffer StartBuffer))] 4]) (defalias 'ediff-save-buffer-in-file #[(buffer file) "p ! !! !!!Ď q!),=,\n!)" [StartBuffer buffer get-buffer buffer-name ((set-buffer StartBuffer)) write-file file this-command ediff-quit error ediff-KILLED-VITAL-BUFFER] 3]) #@2  (defvar ediff-command-begin-time (quote (0 0 0)) (#$ . 81746)) (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 "\np= \")! \n ̚4\n\" \" !G\nԉ$ $!*" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command make-local-hook post-command-hook pre-command-hook post-hook pre-hook ediff-command-begin-time (0 0 0) remove-hook ediff-save-time ediff-calc-command-time (0 0 0) message "Ediff profiling disabled" add-hook t "Ediff profiling enabled"] 5 (#$ . 82342) 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 "\np= \")\n\"!!!!!!!!!" [nil meta-buf ediff-control-buffer error "%S: This command runs in Ediff Control Buffer only!" this-command ediff-debug-buffer 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"] 5 nil nil]) (defalias 'ediff-member #[(elt lis comparison-func) " @\n\"A" [lis comparison-func elt] 4]) (defalias 'ediff-intersection #[(lis1 lis2 comparison-func) "C\n\n@\f # \n@C\nA A)" [a result lis1 ediff-member lis2 comparison-func] 5]) (defalias 'ediff-union #[(lis1 lis2 comparison-func) "C\n\n@ A\f# \n@C\nA 9 @ A\f#2 @C A\" A)" [a result lis1 ediff-member comparison-func lis2] 5]) (defalias 'ediff-set-difference #[(lis1 lis2 comparison-func) "C\n'\n@ A\f# \n@ \f# \n@C\nA A)" [a result lis1 ediff-member comparison-func lis2] 5]) (defalias 'ediff-copy-list #[(list) ": :@ BA\n *@" [list nil elt res] 3]) (byte-code "!!" [run-hooks ediff-load-hook provide ediff-util] 2)