;ELC ;;; Compiled by pot@pot.cnuce.cnr.it on Tue Mar 18 15:38:26 2003 ;;; from file /home/pot/gnu/emacs-pretest.new/lisp/ediff-util.el ;;; in Emacs version 21.3 ;;; with bytecomp version 2.85.4.1 ;;; with all optimizations. ;;; This file uses dynamic docstrings, first added in Emacs 19.29. (if (and (boundp 'emacs-version) (< (aref emacs-version (1- (length emacs-version))) ?A) (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 "\302\303!\210\304B\305B\306B\307B\310B\311B\312B\313B\314B\315B\316B\317\320!\210\317\321!\210\317\322!\210\317\323!\210\317\324!\210\317\325!\210 \203P\317\326!\210\302\207" [current-load-list ediff-xemacs-p provide ediff-util ediff-patch-diagnostics ediff-patchbufer ediff-use-toolbar-p ediff-toolbar-height ediff-toolbar ediff-toolbar-3way bottom-toolbar bottom-toolbar-visible-p bottom-toolbar-height mark-active ediff-emacs-p require ediff-init ediff-help ediff-mult ediff-wind ediff-diff ediff-merg ediff-tbar] 2) #@668 Ediff mode controls all operations in a single Ediff session. This mode is entered through one of the following commands: `ediff' `ediff-files' `ediff-buffers' `ebuffers' `ediff3' `ediff-files3' `ediff-buffers3' `ebuffers3' `ediff-merge' `ediff-merge-files' `ediff-merge-files-with-ancestor' `ediff-merge-buffers' `ediff-merge-buffers-with-ancestor' `ediff-merge-revisions' `ediff-merge-revisions-with-ancestor' `ediff-windows-wordwise' `ediff-windows-linewise' `ediff-regions-wordwise' `ediff-regions-linewise' `epatch' `ediff-patch-file' `ediff-patch-buffer' `epatch-buffer' `erevision' `ediff-revision' Commands: \{ediff-mode-map} (defalias 'ediff-mode #[nil "\302 \210\303\304\305\306!\207" [major-mode mode-name kill-all-local-variables ediff-mode "Ediff" run-hooks ediff-mode-hook] 2 (#$ . 1178)]) #@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 (#$ . 2024)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-mode-map put permanent-local t] 4) #@36 Set up Ediff keymap, if necessary. (defalias 'ediff-set-keys #[nil "\204\301 \210\302!\207" [ediff-mode-map ediff-setup-keymap use-local-map] 2 (#$ . 2311)]) (defalias 'ediff-reload-keymap #[nil "\301\302 \207" [ediff-mode-map nil ediff-set-keys] 1 nil nil]) #@56 Set up the keymap used in the control buffer of Ediff. (defalias 'ediff-setup-keymap #[nil "\306 \307!\210\310 \203\311\202\312\313#\210\310\314\313#\210\310\315\316#\210\310\317\316#\210\310\320\316#\210\310\321\n\2055\316#\210\310\322\316#\210\310\323\324#\210\310\325\324#\210\310\326\327#\210\310\330\331#\210\310\332\333#\210\310\334\333#\210\310\335\336#\210\310\337\340#\210\310\341\342#\210\310\343\344#\210\310\345\346#\210\310\347\350#\210 \204\217\310\351\352#\210\f\203\231\310\353\354#\210\310\355\356#\210\310\357\360#\210\310\361\360#\210\310\362\360#\210\310\363\360#\210\310\364\360#\210\310\365\366#\210\310\367\366#\210\310\370\371#\210\310\372\373#\210\310\374\375#\210\310\376\377#\210\310\201B\201C#\210\310\201D\201E#\210 \204\310\201F\201G#\210\310\201H\331#\210\310\201I\331#\210\310\201J\331#\210 \203\204\310\201K\201L#\210\310\201H\201M#\210\310\201I\201N#\210\310\201J\201O#\210\310\201P\201Q#\210\310\201R\201S#\210\310\201T\331#\210\310\201U\201V#\210\310\201W\201X#\210\310\201Y\201Z#\210\202 @\203\370\310\201[\201\\#\210\310\201]\201^#\210\310\201_\201M#\210\310\201`\201N#\210\310\201a\331#\210\310\201b\201c#\210\310\201d\201e#\210\310\201f\201g#\210\310\201h\201g#\210\310\201i\201g#\210\310\201j\201k#\210\202 \310\201H\201\\#\210\310\201I\201^#\210\310\201f\201g#\210\310\201h\201g#\210\310\201l\201m#\210\310\201n\331#\210\310\201o\201p#\210\310\201q\201p#\210 \204T\310\201r\201s#\210\310\201t\331#\210\310\201u\201k#\210\310\201v\201k#\210\310\201w\331#\210\310\201x\201y#\210\310\201z\201y#\210\310\201{\201y#\210\310\201|\201}#\210\201~\201!\203\264\310\201\200\201#\210A\203\313\310\201\201\201y#\210\310\201\202\333#\210\310\201\203\201\204#\210\300M\210\201\205\201\206!\207" [ediff-mode-map ediff-emacs-p ediff-no-emacs-help-in-control-buffer ediff-word-mode ediff-narrow-job ediff-merge-job make-sparse-keymap suppress-keymap define-key [mouse-2] [button2] ediff-help-for-quick-help " " "p" ediff-previous-difference "" [delete] "" [backspace] "n" ediff-next-difference " " "j" ediff-jump-to-difference "g" nil "ga" ediff-jump-to-difference-at-point "gb" "q" ediff-quit "D" ediff-show-diff-output "z" ediff-suspend "\f" ediff-recenter "|" ediff-toggle-split "h" ediff-toggle-hilit "@" ediff-toggle-autorefine "%" ediff-toggle-narrow-region "~" ediff-swap-buffers "v" ediff-scroll-vertically "" "^" "\366" "V" "<" ediff-scroll-horizontally ">" "i" ediff-status-info "E" ediff-documentation "?" ediff-toggle-help "!" ediff-update-diffs ediff-3way-comparison-job ediff-3way-job "M" ediff-show-current-session-meta-buffer "R" ediff-show-registry "*" ediff-make-or-kill-fine-diffs "a" "b" "r" "/" ediff-show-ancestor ediff-copy-A-to-C ediff-copy-B-to-C ediff-restore-diff-in-merge-buffer "s" ediff-shrink-window-C "+" ediff-combine-diffs "$" "$$" ediff-toggle-show-clashes-only "$*" ediff-toggle-skip-changed-regions "&" ediff-re-merge "ab" ediff-copy-A-to-B "ba" ediff-copy-B-to-A "ac" "bc" "c" "ca" ediff-copy-C-to-A "cb" ediff-copy-C-to-B "ra" ediff-restore-diff "rb" "rc" "C" ediff-toggle-read-only "G" ediff-submit-report "#" "#h" ediff-toggle-regexp-match "#f" "##" ediff-toggle-skip-similar "o" "A" "B" "w" "wa" ediff-save-buffer "wb" "wd" "=" ediff-inferior-compare-regions fboundp ediff-show-patch-diagnostics "P" "wc" "gc" "m" ediff-toggle-wide-display run-hooks ediff-keymap-setup-hook] 4 (#$ . 2581)]) (defalias 'ediff-setup #[(buffer-A file-A buffer-B file-B buffer-C file-C startup-hooks setup-parameters &optional merge-buffer-file) "\306\307!\210\310\311!!\310\311 !!\n;\203\310\311\n!! ;\203J\310\311 !!\312\313 !!\2047\314\315\316\313 !!\"\210\312 !\203J\317 !\203J\314\320\316 !\"\210\321\322\323\" \203l\324 !\203l\325\324 !!\203lr q\210\326\f!)\202w@\327=\206w\314A!\211B\203\324B!\203\325\324B!!\203rBq\210\330 \210\331\332!\210\331\333!\210\331\334!\210\331\335!\210\331\336!\210\331\337!\210\331\340!\210\341\342!\210C\203\315C@@C@AL\210CA\211C\204\272D\343>ED\344>FD\345>GE\206\346FHE\206\357GID\346>JD\347>KD\350>L\351\352\353D!\"\203\354 \341\355!\210\356 \203 \357\355\360\361\354$\210\362 MF\203\207\363=\2035N\2026 OPQR\326\321\364\323\"!Q\212Qq\210\365O!\210O\203r\324O!\203r\325\324O!!\203rrOq\210S)\202}@\327=\206}\314A! \210\357\366\367\361\354$\210*\361T UNVQWBX\370 \210\351\371\f\"\203\254\f\372\224\372\225O\202\255\373Y\372\374Y\351\375Y\"\206\274\372\361O!S]Z\326\321\376\323\"![ \203\365\324 !\203\365\325\324 !!\203\365r q\210\\@\377\235\203\361\201s\\8\\)\202@\327=\204\314A!\210N\203/\324N!\203/\325\324N!!\203/rNq\210\\@\377\235\203+\201s\\8\\)\202;@\327=\204;\314A!\210H\203zQ\203n\324Q!\203n\325\324Q!!\203nrQq\210\\@\377\235\203j\201s\\8\\)\202z@\327=\204z\314A!\210R\203\311\324R!\203\311\325\324R!!\203\311R\203\275\324R!\203\275\325\324R!!\203\275rRq\210\\@\377\235\203\271\201s\\8\\)\202\311@\327=\204\311\314A!\210\201t \210I\203\331\201u\202\334\201v]\201w\201x\201yU#\201w\201z\201{V#\201w\201|\201}W#E^_\203`a\202^a\201~ \210`\204#^`U\203\224\324U!\203\224\325\324U!!\203\224rUq\210\201 \210\306\201\200!\210B\203h\324B!\203h\325\324B!!\203hrBq\210F)\202s@\327=\204v\314A!\203y\354TBb>\204\210BbBbc\203\220\354T)\202\240@\327=\204\240\314A!\210V\203\324V!\203\325\324V!!\203rVq\210\201 \210\306\201\200!\210B\203\345\324B!\203\345\325\324B!!\203\345rBq\210F)\202\360@\327=\204\363\314A!\203\366\354TBb>\204BbBbc\203 \354T)\202@\327=\204\314A!\210H\203nW\203b\324W!\203b\325\324W!!\203brWq\210\201 \210\306\201\200!\210Bb>\204VBbBbc\203^\354T)\202n@\327=\204n\314A!\210R\203\312\324R!\203\312\325\324R!!\203\312R\203\276\324R!\203\276\325\324R!!\203\276rRq\210\201 \210\354T\306\201\200!\210Bb>\204\272BbBb)\202\312@\327=\204\312\314A!\210] \n#\210dGe\201\201f\201\202\201\203!\210\201\202\201\204!\210H\203\370\201\202\201\205!\210G\203\201\202\201\206!\210\201\207 NQB$\210`@g\201\210g!\2053h\203-\201\211g!\2023\201\212g!)`A@g\201\210g!\205Wh\203Q\201\211g!\202W\201\212g!)\201s`8g\201\210g!\205}h\203w\201\211g!\202}\201\212g!)ijk\212\201\213l!\210kb\210)\212\201\213m!\210jb\210)H\203\260\212\201\213n!\210ib\210)+\201\213o!\210\201\214 \210\306\201\215!\210\201\216 !\210\201\217 \210\354TBpBp\201\220 \210q\203\374\324q!\203\374\325\324q!!\203\374\201\221q\361r#\210\306\201\222!\210)\202@\327=\204\314A!\210B*\207" [file-A file-B file-C merge-buffer-file control-buffer-name buffer-A run-hooks ediff-before-setup-hook ediff-convert-standard-filename expand-file-name file-exists-p file-name-directory error "Directory %s given as place to save the merge doesn't exist" abbreviate-file-name file-directory-p "The merge buffer file %s must not be a directory" ediff-unique-buffer-name "*Ediff Control Panel" "*" get-buffer buffer-name get-buffer-create ediff-quit ediff-mode make-local-variable ediff-use-long-help-message ediff-prefer-iconified-control-frame ediff-split-window-function ediff-default-variant ediff-merge-window-share ediff-window-setup-function ediff-keep-variants make-local-hook ediff-after-quit-hook-internal (ediff-files3 ediff-buffers3) (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) (ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions-with-ancestor) (ediff-windows-wordwise ediff-regions-wordwise ediff-windows-linewise ediff-regions-linewise) (ediff-windows-wordwise ediff-windows-linewise) (ediff-windows-wordwise ediff-regions-wordwise) string-match "buffer" symbol-name t pre-command-hook ediff-window-display-p add-hook ediff-spy-after-mouse nil mouse-pixel-position default-B "*ediff-merge" insert-buffer local-write-file-hooks ediff-set-merge-mode ediff-choose-syntax-table "<[0-9]*>" 0 "" string-to-number "[0-9]+" "*ediff-errors" (" A: " " B: " " C: " " Ancestor: ") this-command ediff-KILLED-VITAL-BUFFER control-buffer setup-parameters ediff-job-name ediff-3way-comparison-job ediff-merge-job ediff-merge-with-ancestor-job ediff-3way-job ediff-diff3-job ediff-narrow-job ediff-windows-job ediff-word-mode-job ediff-mouse-pixel-position buffer-B buf ediff-merge-split-window-function buffer-C ediff-ancestor-buffer major-mode buffer-read-only ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer ediff-control-buffer-suffix ediff-control-buffer-number ediff-error-buffer mode-line-format ediff-setup-diff-regions-function ediff-wide-bounds ediff-start-narrowed ediff-narrow-bounds ediff-visible-bounds ediff-this-buffer-ediff-sessions ediff-make-buffers-readonly-at-startup ediff-difference-vector-A ediff-number-of-differences ediff-current-difference overl ediff-emacs-p shift-C shift-B shift-A ediff-window-A ediff-window-B ediff-window-C ediff-control-window ediff-session-registry ediff-meta-buffer ediff-meta-session-number 2 ediff-save-protected-variables ediff-setup-diff-regions3 ediff-setup-diff-regions ediff-make-bullet-proof-overlay (point-min) (point-max) (point-min) (point-max) (point-min) (point-max) ediff-set-keys ediff-nuke-selective-display ediff-prepare-buffer-hook -1 ediff-make-current-diff-overlay A B C Ancestor ediff-setup-windows ediff-overlayp overlay-start extent-start-position select-window ediff-visible-region startup-hooks ediff-arrange-autosave-in-merge-jobs ediff-refresh-mode-lines ediff-update-registry ediff-update-meta-buffer ediff-startup-hook] 7]) #@35 Set up window for control buffer. (defalias 'ediff-setup-control-buffer #[(ctl-buf) "\306\307 !\203 q\210\202\310!\210\311\312 \210\313 \210\nc\210\314 \210\315 \204'\316 \210\317 \210\320\321!\210\322 \210\307 \323\324 \f \325 \205D&\325 \203T\204W\326 \210eb\210\321w)\207" [ctl-buf window-min-height ediff-help-message ediff-control-window ediff-window-A ediff-window-B window-dedicated-p selected-window switch-to-buffer 2 erase-buffer ediff-set-help-message shrink-window-if-larger-than-buffer ediff-multiframe-setup-p ediff-indent-help-message ediff-set-help-overlays set-buffer-modified-p nil ediff-refresh-mode-lines format "%S%S%S%S%S%S%S" ediff-window-display-p ediff-make-bottom-toolbar ediff-window-C ediff-split-window-function ediff-multiframe ediff-wide-display-p ediff-window-config-saved ediff-whitespace] 9 (#$ . 12526)]) (defalias 'ediff-arrange-autosave-in-merge-jobs #[(merge-buffer-file) "\205e ;\203 \306  ;\203= \f\2032\307\f!\2032\310\307\f!!\2032r\fq\210\311 !\210)\202= \312=\204=\313!\210\f\203[\307\f!\203[\310\307\f!!\203[r\fq\210\306\314\315!)\207 \312=\206e\313!\207" [ediff-merge-job merge-buffer-file ediff-autostore-merges ediff-merge-store-file ediff-buffer-C this-command t get-buffer buffer-name set-visited-file-name ediff-quit error auto-save-mode 1 ediff-KILLED-VITAL-BUFFER buffer-offer-save] 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 "\306\307!\204 \310\311 \"\210)\n\203*\312\n!\203*\313\312\n!!\203*\314\315!\204*\310\316!\210 \203E\312 !\203E\313\312 !!\203Er q\210`)\202N \317=\206N\310\f!\320 !\321 !\3211!\3212!3@3A@\32238\306\211\211\211\211\211\211\211\211456789:;<=>?@ABCDB;\203\236\323B!BA;\203\252\323A!A@;\203\266\323@!@\324\325!\210?E\326E!\205\325F\203\321\327E!\202\325\330E!)<>E\326E!\205\363F\203\357\327E!\202\363\330E!):=E\326E!\205F\203 \327E!\202\330E!)8?E\326E!\205/F\203+\331E!\202/\332E!);>E\326E!\205MF\203I\331E!\202M\332E!)9=E\326E!\205kF\203g\331E!\202k\332E!)7G\203\260\333<; C$\210\334C\335\"6\333:91C$\210\334C\336\"5H\203\314\333872C$\210\334C\337\"4\202\314\334 B\"6\3341A\"5H\203\314\3342@\"4\340\341\342\"\210\340\343\342\"\210\340\344\342\"\210\340\345\342\"\210\306%\306\306I\306JKLMNOONMLKM\203\346K\347L\306M\306N\350OK654#\210-!GP\3516!\210\3515!\2104\2037\3514!\210H\203[QR\352S\352PW\203Z\353SR\"\210ST\211S\202D*\354\355\356D\"!\210\357\360!.\207" [meta-buf-p this-command ediff-ancestor-buffer ediff-buffer-A ediff-KILLED-VITAL-BUFFER ediff-tmp-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name y-or-n-p "Ancestor buffer will not be used. Recompute diffs anyway? " "Recomputation of differences canceled" ediff-quit get-buffer-create buffer-file-name 2 file-name-nondirectory ediff-unselect-and-select-difference -1 ediff-overlayp overlay-start extent-start-position overlay-end extent-end-position ediff-wordify ediff-make-temp-file "regA" "regB" "regC" ediff-clear-diff-vector ediff-difference-vector-A fine-diffs-also ediff-difference-vector-B ediff-difference-vector-C ediff-difference-vector-Ancestor ediff-setup-diff-regions3 t ediff-files3 delete-file 0 ediff-set-state-of-diff-in-all-buffers ediff-jump-to-difference ediff-diff-at-point A message "" ediff-buffer-B ediff-buffer-C ediff-narrow-bounds file-C file-B file-A end-C beg-C end-B beg-B end-A beg-A overl-C overl-B overl-A buf-C-file-name buf-B-file-name buf-A-file-name tmp-buffer point-A overl ediff-emacs-p ediff-word-mode ediff-3way-job ediff-state-of-merge ediff-killed-diffs-alist ediff-setup-diff-regions-function ediff-3way-comparison-job ediff-merge-job ediff-merge-with-ancestor-job ediff-job-name ediff-number-of-differences ediff-control-buffer ctl-buf n] 18 (#$ . 13920) nil]) #@68 Revert buffers A, B and C. Then rerun Ediff on file A and file B. (defalias 'ediff-revert-buffers-then-recompute-diffs #[(noconfirm) "\306\307!\204 \310\311 \"\210)\n \f  \211!\203Q\312!!\203Q\313\312!!!\203Qr!q\210\314\315\"\"\210)\202\\ \316=\204\\\310#!\210 \203\200\312 !\203\200\313\312 !!\203\200r q\210\314\315\"\"\210)\202\213 \316=\204\213\310#!\210\203\277\203\264\312!\203\264\313\312!!\203\264rq\210\314\315\"\"\210)\202\277 \316=\204\277\310#!\210\203\354q\210\317?!\210\320!\210\203\343\321! #\202\356\322! \"\202\356\323 . \207" [meta-buf-p this-command ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name revert-buffer t ediff-quit ediff-really-quit kill-buffer ediff-merge-buffers-with-ancestor ediff-merge-buffers ediff-update-diffs ediff-keep-variants ediff-ancestor-buffer ediff-merge-with-ancestor-job ediff-merge-job ediff-3way-comparison-job comparison merge ancestor-job ancestor-buf keep-variants ctl-buf bufC bufB bufA noconfirm ediff-KILLED-VITAL-BUFFER] 10 (#$ . 16702) "P"]) #@117 Bring the highlighted region of all buffers being compared into view. Reestablish the default three-window display. (defalias 'ediff-recenter #[(&optional no-rehighlight) "\306\307!\204 \310\311 \"\210)\306 \203Y\312 !\203Y\313\312 !!\203Y\f\203Y\312\f!\203Y\313\312\f!!\203Y \203M(\203Y\312(!\203Y\313\312(!!\203Y\314 \f()$\210\202g \315=\204g\316*\317\320!\"\210)\321 \210\322 \203\273 9\203\273+9\203\273 \323>\204\221 \324>\203\273\325\326\327+!\"\204\273\330,!\203\237\331\332,!!\210\330-!\203\255\331\332-!!\210\330.!\203\273\331\332.!!\210\322 \203\367\333/!\203\3670\204\367/1\322 \205\356\3331!\205\3562\203\350\3341!\202\356\3351!\336=)\204\367\331/!\210/)34 \203\277\312 !\203\277\313\312 !!\203\277\f\203\277\312\f!\203\277\313\312\f!!\203\277 \203<(\203\277\312(!\203\277\313\312(!!\203\2775\204F\3376!\210\340\341!\210\340\342!\210 \203V\340\343!\2103\203\264\3123!\203\264\313\3123!!\203\264r3q\210\344 \210\322 \203\2607\203\2600\204\260/1\322 \205\244\3331!\205\2442\203\236\3341!\202\244\3351!\336=)\204\260\3454 \315=\"\210)\202\277 \315=\204\277\310*!\210\346 \2103\203\342\3123!\203\342\313\3123!!\203\342r3q\210\347 )\202\354 \315=\206\354\310*!*\207" [meta-buf-p this-command buffer-read-only ediff-buffer-A ediff-buffer-B ediff-3way-job nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name ediff-setup-windows ediff-quit message beep 1 ediff-visible-region ediff-window-display-p (ediff-recenter ediff-dir-action ediff-registry-action ediff-patch-action ediff-toggle-wide-display ediff-toggle-multiframe) (ediff-next-difference ediff-previous-difference ediff-jump-to-difference ediff-jump-to-difference-at-point) string-match "^ediff-" symbol-name window-live-p raise-frame window-frame frame-live-p frame-iconified-p frame-visible-p icon ediff-select-difference ediff-recenter-one-window A B C ediff-recenter-ancestor ediff-reset-mouse ediff-restore-highlighting ediff-refresh-mode-lines ediff-buffer-C ediff-control-buffer ediff-KILLED-VITAL-BUFFER last-command ediff-window-A ediff-window-B ediff-window-C ediff-control-frame ediff-use-long-help-message frame ediff-xemacs-p control-buf control-frame no-rehighlight ediff-current-difference ediff-multiframe] 5 (#$ . 17929) nil]) (defalias 'ediff-recenter-one-window #[(buf-type) "\306 \211\307Y\205 \nW)\205\260\310 \f\311=\203 @\2024\f\312=\203+ A@\2024\f\313=\2054\314 8\315!\205M\203I\316!\202M\317!)\f !\320\f!\"A*\"\321\"J!\205r\"J\211#\203\204$\203\204\322#\"\210#\203\253\323#!\210\324 \210\325\326\f\327\306$\326\f\330\306$\326\f\327\306$$\210\323 !.\207" [n ediff-current-difference ediff-number-of-differences ctl-wind buf-type ediff-narrow-bounds nil 0 selected-window A B C 2 ediff-overlayp overlay-start extent-start-position assoc window-live-p set-window-start select-window ediff-deactivate-mark ediff-position-region ediff-get-diff-posn beg end overl ediff-emacs-p shift ediff-job-name job-name ediff-control-buffer control-buf ediff-window-alist alist window-name window ediff-windows-job] 9]) (defalias 'ediff-recenter-ancestor #[nil "\205\212\306!\205\212\307\306!!\205\212\310\n\211\311Y\205 W)\205\212\312!\313 \f \203y\306!\203y\307\306!!\203yrq\210\314\315\316\310$b\210\203u\317!\210\320\314\315\316\310$\314\315\321\310$\314\315\316\310$$\210)\202\205\322=\204\205\323!\210\317!,\207" [ediff-ancestor-buffer n ediff-current-difference ediff-number-of-differences ediff-job-name ediff-control-buffer get-buffer buffer-name nil 0 ediff-get-visible-buffer-window selected-window ediff-get-diff-posn Ancestor beg select-window ediff-position-region end ediff-quit error ctl-buf job-name ctl-wind window this-command 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 "\306\307!\204 \310\311 \"\210)\312\n!\205\n\312\f!\205\f\312!\205' \2050\313 ! \2059\313 !\205D\313!=\204x\314!\203x\314!\203x\203\211\314!\203x=\204x=\203\211\315=\203\203\316\202\204\315\202\215\317\320!\210\321\322!.\207" [meta-buf-p this-command ediff-window-A wind-A ediff-window-B wind-B nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p window-frame frame-live-p split-window-vertically split-window-horizontally message "Buffers being compared are in different frames" ediff-recenter no-rehighlight ediff-window-C wind-C frame-A frame-B frame-C ediff-3way-comparison-job ediff-split-window-function] 3 (#$ . 21871) nil]) #@154 Switch between highlighting using ASCII flags and highlighting using faces. On a dumb terminal, switches between ASCII highlighting and no highlighting. (defalias 'ediff-toggle-hilit #[nil "\306\307!\204 \310\311 \"\210)\312 \204+\n\313=\203&\314\315!\210\316 \317\"\210\320\211\207\316 \321\"\207\316 \317\"\210\f\203A \203A\314\322!\210\306\202V\f\203N\314\323!\210\306\202V\314\324!\210\325\325\f\203d \203d\326 \210\202h\326\327!\210\316 \321\"\207" [meta-buf-p this-command ediff-highlighting-style ediff-current-difference ediff-use-faces ediff-highlight-all-diffs nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-has-face-support-p ascii message "ASCII highlighting flags removed" ediff-unselect-and-select-difference unselect-only off select-only "Unhighlighting unselected difference regions" "Highlighting with ASCII flags" "Re-highlighting all difference regions" t ediff-paint-background-regions unhighlight] 3 (#$ . 22763) nil]) #@26 Toggle auto-refine mode. (defalias 'ediff-toggle-autorefine #[nil "\305\306!\204 \307\310 \"\210)\n\203\307\311!\210 \312=\203'\313\314\f\315\"\210\316\317!\207 \313=\2035\316\320!\210\321\211\207\322\f\323\"\210\316\324!\210\312\211\207" [meta-buf-p this-command ediff-word-mode ediff-auto-refine ediff-current-difference nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" "No fine differences in this mode" nix on ediff-make-fine-diffs noforce message "Auto-refining is ON" "Auto-refining is OFF" off ediff-set-fine-diff-properties default "Refinements are HIDDEN"] 3 (#$ . 23776) nil]) #@48 Show the ancestor buffer in a suitable window. (defalias 'ediff-show-ancestor #[nil "\304 \210\203\305!\203\306\305!!\204$ \203 \307\310!\210\202$\307\311!\210\312\313!\211\2036\314\315\n!!\202:\316 \")\207" [ediff-ancestor-buffer ediff-merge-with-ancestor-job wind ediff-window-C ediff-recenter get-buffer buffer-name error "Lost connection to ancestor buffer...sorry" "Not merging with ancestor" nil ediff-get-visible-buffer-window raise-frame window-frame set-window-buffer] 3 (#$ . 24420) nil]) #@123 Compute fine diffs. With negative prefix arg, kill fine diffs. In both cases, operates on the current difference region. (defalias 'ediff-make-or-kill-fine-diffs #[(arg) "\306\307!\204 \310\311 \"\210)\n\312=\203* \313\f\314\"\210\313\f\315\"\210 \205(\313\f\316\")\207\n\247\203K\n\317W\203K \313\f\314\"\210\313\f\315\"\210 \205I\313\f\316\")\207\320 \207" [meta-buf-p this-command arg ediff-current-difference n ediff-3way-job nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" - ediff-clear-fine-differences-in-one-buffer A B C 0 ediff-make-fine-diffs] 3 (#$ . 24942) "P"]) #@33 Toggle short/long help message. (defalias 'ediff-toggle-help #[nil "\306\307!\204 \310\311 \"\210)\306\312 \210 ?\313 \210) \203K\314 \203K\f\203K \314 \205H\315!\205H\203B\316!\202H\317!\320=)\321\322\323!\207" [meta-buf-p this-command buffer-read-only ediff-use-long-help-message ediff-multiframe ediff-control-frame nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" erase-buffer ediff-set-help-message ediff-window-display-p frame-live-p frame-iconified-p frame-visible-p icon "" ediff-recenter no-rehighlight frame ediff-xemacs-p ediff-prefer-iconified-control-frame ediff-window-config-saved] 3 (#$ . 25576) nil]) #@206 Toggle read-only in current buffer. If buffer is under version control and locked, check it out first. If optional argument BUF is specified, toggle read-only in that buffer instead of the current buffer. (defalias 'ediff-toggle-read-only #[(&optional buf) "\306\307!\204 \310\311 \"\210)\n?\205p \312>\203\313\202/ \314>\203(\315\202/ \316>\205/\317\n\2048\320 \210\n\204f\f\313=\203G7\202e\f\315=\203R8\202e\f\317=\203]9\202e\f\321=\205e:\n\203\267\322\n!\203\267\323\322\n!!\203\267r\nq\210\324\n!\211;\205\220\325;!\205\220\326;!<=\206\330;;\327\330!?\206\304\331;!\205\304\332\333!\203\300\333;!\334>\206\304\333;!;\202\304\335;!)\203\314\336\202\330<\203\325\336\202\330\337\340!>;;\327\330!\205 \331;!\341>?\205 \332\333!\203\333;!\342>\210\333;!;?\202 \335;!?)\203m \203m*\204\336>\202m\343\344!\210\345\346\347\350;!\"!\203Z \203L\322 !\203L\323\322 !!\203Lr q\210\351\352\306\f#\210)\202m \353=\204m\310?!\210\202m\336>\343\344!\210\343\344!\210\354\355!\210\356\357!\210>\203\204\360\361\362>!\"\203\204\212\363\213\210)\202\211\310\364\n\"\210;\205\263*?\205\263 \365=\205\263\325;!\205\263\326;!?\205\263\354\366\350;!\343\344!#,\202\301 \353=\206\301\310?!*\207" [meta-buf-p this-command buf last-command-char buf-type ctl-buf nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" (97 65) A (98 66) B (99 67) C ediff-recenter Ancestor get-buffer buffer-name buffer-file-name file-exists-p file-writable-p featurep vc-hooks vc-backend fboundp vc-state (edited needs-merge) vc-locking-user toggle-read-only key-binding "" (nil CVS) (edited needs-merge) beep 1 y-or-n-p format "File %s is under version control. Check it out? " ediff-abbreviate-file-name ediff-change-saved-variable buffer-read-only ediff-quit message "Boy, this is risky! Don't modify this file..." sit-for 3 string-match "toggle-read-only" symbol-name ((byte-code "\302\303!!\210\304 !\207" [buf toggle-ro-cmd select-window ediff-get-visible-buffer-window command-execute] 3)) "Don't know how to toggle read-only in buffer %S" ediff-toggle-read-only "Warning: file %s is read-only" ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer file file-writable ediff-toggle-read-only-function toggle-ro-cmd ediff-KILLED-VITAL-BUFFER] 6 (#$ . 26268) nil]) (defalias 'ediff-maybe-checkout #[(buf) "\305\306!!\307\310!\211\311\312!\2053\313\n!\314>?\2053\315\316!\203/\316\n!\317>\210\316\n!;?\2023\320\n!?)\205l\321\322!\210\323\324\325\326\n!\"!\205l\203c\327!\203c\330\327!!\203crq\210\331 !)\202l \332=\206l\333\f!*\207" [buf checkout-function file this-command ediff-KILLED-VITAL-BUFFER expand-file-name buffer-file-name key-binding "" featurep vc-hooks vc-backend (nil CVS) fboundp vc-state (edited needs-merge) vc-locking-user beep 1 y-or-n-p format "File %s is under version control. Check it out? " ediff-abbreviate-file-name get-buffer buffer-name command-execute ediff-quit error] 6]) (defalias 'ediff-file-checked-out-p #[(file) "\301\302!?\206#\303!\205#\304\305!\203 \305!\306>\206#\305!;\207\307!\207" [file featurep vc-hooks vc-backend fboundp vc-state (edited needs-merge) vc-locking-user] 2]) (put 'ediff-file-checked-out-p 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-file-checked-in-p #[(file) "\301\302!\205%\303!\304>?\205%\305\306!\203!\306!\307>\210\306!;?\207\310!?\207" [file featurep vc-hooks vc-backend (nil CVS) fboundp vc-state (edited needs-merge) vc-locking-user] 2]) (put 'ediff-file-checked-in-p 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-file-compressed-p #[(file) "\301\302\303\217\210\304\305!\205\306\307 \"\207" [file nil (byte-code "\300\301!\207" [require jka-compr] 2) ((error)) featurep jka-compr string-match jka-compr-build-file-regexp] 3]) #@44 Rotate the display of buffers A, B, and C. (defalias 'ediff-swap-buffers #[nil "\306\307!\204 \310\311 \"\210)\312\n!\203x\312 !\203x\f =\313 \205.\203V\314\n \"\210\314 \f\"\210\314!\"\"\210\202a\314\n\"\"\210\314 \f\"\210\203t \" \"\202{\"\"\203\216#$#$\202\225$$\203\251%&%&\202\261&&\203\321'('()*)*\202\341((**\313 \203\203\372+,+,\202,,\203\3158@A@E\2022-\203*A@@\3158E\2022A@@D\203H\315.8.@.A@E\202d-\203\\.A@.@\315.8E\202d.A@.@D.\203r\202v..-\203\234/0\3161\3162W\203\233\31710\"\2101T\2111\202\205*\320\321!\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A ediff-buffer-values-orig-A nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-has-face-support-p set-window-buffer 2 0 ediff-set-state-of-diff-in-all-buffers ediff-recenter no-rehighlight ediff-difference-vector-A ediff-regexp-hide-A ediff-regexp-focus-A ediff-visible-bounds ediff-wide-bounds ediff-current-diff-overlay-A overlay wide-visibility-p focus-regexp hide-regexp diff-vec values buf ediff-3way-comparison-job ediff-buffer-C ediff-window-C ediff-buffer-B ediff-buffer-values-orig-C ediff-buffer-values-orig-B ediff-difference-vector-C ediff-difference-vector-B ediff-regexp-hide-C ediff-regexp-hide-B ediff-regexp-focus-C ediff-regexp-focus-B ediff-current-diff-overlay-C ediff-current-diff-overlay-B ediff-3way-job ediff-narrow-bounds ediff-control-buffer ctl-buf n ediff-number-of-differences] 8 (#$ . 30161) nil]) #@93 Toggle wide/regular display. This is especially useful when comparing buffers side-by-side. (defalias 'ediff-toggle-wide-display #[nil "\306\307!\204 \310\311 \"\210)\312 \204 \310\313\n\203\314\202\315\"\210\316\317!\210  ?\211\204g\f\203Z\320\f!\203Z\321\320\f!!\203Zr\fq\210\322\"\210\fq\210\306\306\316\317!)\202\225 \323=\206\225\310!\202\225 \210\f\203\213\320\f!\203\213\321\320\f!!\203\213r\fq\210\306\316\317!)\202\225 \323=\206\225\310!)\207" [meta-buf-p this-command ediff-emacs-p ediff-control-buffer ctl-buf ediff-wide-display-p nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-window-display-p "%sEmacs is not running as a window application" "" "X" ediff-recenter no-rehighlight get-buffer buffer-name modify-frame-parameters ediff-quit ediff-wide-display-frame ediff-wide-display-orig-parameters ediff-window-B ediff-KILLED-VITAL-BUFFER ediff-make-wide-display-function] 4 (#$ . 31854) nil]) #@148 Switch from multiframe display to single-frame display and back. To change the default, set the variable `ediff-window-setup-function', which see. (defalias 'ediff-toggle-multiframe #[nil "\304\305 \204\306\307 \203\310\202\311\"\210\n\312=\203\313\202/\n\313=\203/\314 \203-\315 \210\312\316\302\"\210\317\320 \"\210\314 \205A\321\322!)\207" [window-setup-func ediff-emacs-p ediff-window-setup-function ediff-session-registry nil ediff-window-display-p error "%sEmacs is not running as a window application" "" "X" ediff-setup-windows-multiframe ediff-setup-windows-plain ediff-in-control-buffer-p ediff-kill-bottom-toolbar set-default mapcar #[(buf) "\203\306!\203\307\306!!\203rq\210 \310\211)\207\f\311=\206&\312 !\207" [buf window-setup-func ediff-window-setup-function ediff-window-B this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name nil ediff-quit error] 3] ediff-recenter no-rehighlight] 3 (#$ . 32854) nil]) #@163 Enable or disable Ediff toolbar. Works only in versions of Emacs that support toolbars. To change the default, set the variable `ediff-use-toolbar-p', which see. (defalias 'ediff-toggle-use-toolbar #[nil "\303\304!\2050\305 \204\306\307\203\310\202\311\"\210\301 \203 \312 \210 ?\313\314\n\"\210\315 \2050\316\317!\207" [ediff-emacs-p ediff-use-toolbar-p ediff-session-registry featurep ediff-tbar ediff-window-display-p error "%sEmacs is not running as a window application" "" "X" ediff-kill-bottom-toolbar mapcar #[(buf) "\203\304!\203\305\304!!\203rq\210\306\211)\207\n\307=\206$\310 !\207" [buf ediff-window-config-saved this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name "" ediff-quit error] 3] ediff-in-control-buffer-p ediff-recenter no-rehighlight] 3 (#$ . 33819) nil]) (defalias 'ediff-kill-bottom-toolbar #[nil "\302 \205\303\304 \305D\"\210\303 \304 \305D\"\207" [bottom-toolbar bottom-toolbar-visible-p ediff-use-toolbar-p set-specifier selected-frame nil] 4]) (defalias 'ediff-make-bottom-toolbar #[(&optional frame) "\306 \205>\206 \307 \310 \2032\311 \n\312>\203 \202\fD\"\210\311 \313D\"\210\311D\"\207\314 \205>\311\315D\"\207" [frame bottom-toolbar ediff-job-name ediff-toolbar-3way ediff-toolbar bottom-toolbar-visible-p ediff-window-display-p selected-frame ediff-use-toolbar-p set-specifier (ediff-files3 ediff-buffers3) t ediff-has-toolbar-support-p 0 bottom-toolbar-height ediff-toolbar-height] 5]) #@97 Toggle the mode that shows only the merge regions where both variants differ from the ancestor. (defalias 'ediff-toggle-show-clashes-only #[nil "\304\305!\204 \306\307 \"\210)\n\204\306\310!\210 ?\211\203!\311\312!\207\311\313!\207" [meta-buf-p this-command ediff-merge-with-ancestor-job ediff-show-clashes-only nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" "This command makes sense only when merging with an ancestor" message "Focus on regions where both buffers differ from the ancestor" "Canceling focus on regions where changes clash"] 4 (#$ . 35305) nil]) #@76 Toggle the mode that skips the merge regions that differ from the default. (defalias 'ediff-toggle-skip-changed-regions #[nil "\303\304!\204 \305\306 \"\210)\n?\211\203\307\310!\207\307\311!\207" [meta-buf-p this-command ediff-skip-merge-regions-that-differ-from-default nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" message "Skipping regions that differ from default setting" "Showing regions that differ from default setting"] 4 (#$ . 35924) nil]) #@78 Toggle narrowing in buffers A, B, and C. Used in ediff-windows/regions only. (defalias 'ediff-toggle-narrow-region #[nil " =\203\n\306\n!\210 \f=\203 \202\f\307\310!\207" [ediff-buffer-A ediff-buffer-B ediff-NO-DIFFERENCES ediff-visible-bounds ediff-wide-bounds ediff-narrow-bounds error ediff-recenter no-rehighlight] 2 (#$ . 36430) nil]) (defalias 'ediff-visible-region #[nil " =\206\n=\206\n =?\205` \204\f @ A@\306 8\203\202\307!\203\202\310\307!!\203\202rq\210\311!\203~\312!\205_\203[\313!\202_\314!)\312!\205{\203w\315!\202{\316!)}\210)\202\216\317=\204\216\320!\210 \203\351\307 !\203\351\310\307 !!\203\351r q\210\311!\203\345\312!\205\306\203\302\313!\202\306\314!)\312!\205\342\203\336\315!\202\342\316!)}\210)\202\365\317=\204\365\320!\210\205_\311!\205_\n\203T\307\n!\203T\310\307\n!!\203Tr\nq\210\312!\2052\203.\313!\2022\314!)\312!\205N\203J\315!\202N\316!)})\202_\317=\206_\320!+\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-narrow-job ediff-wide-bounds ediff-visible-bounds 2 get-buffer buffer-name ediff-overlay-buffer ediff-overlayp overlay-start extent-start-position overlay-end extent-end-position ediff-quit error overl-C overl-B overl-A overl ediff-emacs-p this-command ediff-KILLED-VITAL-BUFFER ediff-3way-job] 4]) (defalias 'ediff-operate-on-windows #[(operation arg) "\306!\203\f\306 !\204\307\310!\210\n\203<\311\n!\203<\312\311\n!!\203< \203<\311 !\203<\312\311 !!\203<\f\203A \204A\313!\210\314  \315\316\" \315\317\"!\f\211\"\205i\315\320\"#\321!\210\322\323\324\217\210\321!\210\322\325\326\217\210\"\203\216\321!\210\322\327\330\217\210\321!.\207" [ediff-window-A ediff-window-B ediff-buffer-A ediff-buffer-B ediff-3way-job ediff-buffer-C window-live-p ediff-recenter no-rehighlight get-buffer buffer-name error selected-window ediff-get-region-size-coefficient A B C select-window nil (byte-code "\303 \n_!!\207" [operation coefA arg round] 4) ((error)) (byte-code "\303 \n_!!\207" [operation coefB arg round] 4) ((error)) (byte-code "\303 \n_!!\207" [operation coefC arg round] 4) ((error)) ediff-KILLED-VITAL-BUFFER wind wind-A wind-B ediff-window-C wind-C operation coefA coefB three-way coefC] 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) "\306\307!\204 \310\311 \"\210)\312\n!\203\312 !\204\313\314!\210\f\203\\\315\f!\203\\\316\315\f!!\203\\ \203\\\315 !\203\\\316\315 !!\203\\\203a\203\\\315!\203\\\316\315!!\204a\310!\210\317\320>\203m\321\202n\322\203\201\323\232\204\201\324!\202\261\306\325\n!\325 !^\203\227\325!\202\230\326^\327\245 Z\330Z\203\256\327\245\202\260)\"\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A ediff-buffer-B nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-recenter no-rehighlight get-buffer buffer-name ediff-operate-on-windows (118 22) scroll-up scroll-down - prefix-numeric-value window-height 500 2 1 ediff-3way-job ediff-buffer-C ediff-KILLED-VITAL-BUFFER last-command-char arg default-amount ediff-window-C next-screen-context-lines] 5 (#$ . 38792) "P"]) #@166 Horizontally scroll buffers A, B (and C if appropriate). If an argument is given, that is how many columns are scrolled, else nearly the width of the A/B/C windows. (defalias 'ediff-scroll-horizontally #[(&optional arg) "\306\307!\204 \310\311 \"\210)\312\n!\203\312 !\204\313\314!\210\f\203\\\315\f!\203\\\316\315\f!!\203\\ \203\\\315 !\203\\\316\315 !!\203\\\203a\203\\\315!\203\\\316\315!!\204a\310!\210\317\320U\203m\321\202n\322\203\201\323\232\204\201\324!\202\260\205\260\325\n!\325 !^\203\231\325 !\202\232\326^\327\245\330Z!\203\255!\327\245\202\257!)\"\207" [meta-buf-p this-command ediff-window-A ediff-window-B ediff-buffer-A ediff-buffer-B nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" window-live-p ediff-recenter no-rehighlight get-buffer buffer-name ediff-operate-on-windows 60 #[(arg) "\302\303!)\207" [arg prefix-arg call-interactively scroll-left] 2] #[(arg) "\302\303!)\207" [arg prefix-arg call-interactively scroll-right] 2] - prefix-numeric-value window-width 500 2 3 ediff-3way-job ediff-buffer-C ediff-KILLED-VITAL-BUFFER last-command-char arg ediff-control-window ediff-3way-comparison-job ediff-window-C default-amount] 5 (#$ . 39920) "P"]) (defalias 'ediff-position-region #[(beg end pos job-name) "dV\203d \203'\306!?\205e\212\307\310 \311Z!\210\312`\"\311\\\313\n!*\207\314\315 \"\210\306!\203b\316\211\307 !\210`V\203O\f`W\203O` T\2027 b\210\317\310\315 !S Z\320]T\311\245!\210*b\207" [end ediff-windows-job amount beg prev-point lines pos-visible-in-window-p move-to-window-line window-height 2 count-lines scroll-up set-window-start selected-window 0 recenter 1 pos] 3]) (defalias 'ediff-get-lines-to-region-end #[(buf-type &optional n ctl-buf) "\204 \n\204\f \n\203\260\306\n!\203\260\307\306\n!!\203\260r\nq\210\f\310=\203, \202J\f\311=\2037\202J\f\312=\203B\202J\f\313=\205J\314\f\315\f\"A*!\316!\317\f\320\"\321\203\242\306!\203\242\307\306!!\203\242rq\210W\203\231\322\"\202\234\323)\202\255\324=\206\255\325 !.\207\324=\206\273\325 !\207" [n ediff-current-difference ctl-buf ediff-control-buffer buf-type ediff-buffer-A get-buffer buffer-name A B C Ancestor eval assoc window-start ediff-get-diff-posn end nil count-lines 0 ediff-quit error ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf ediff-window-alist alist wind beg lines this-command ediff-KILLED-VITAL-BUFFER] 4]) (defalias 'ediff-get-lines-to-region-start #[(buf-type &optional diff-num ctl-buf) "\204 \n\204\f \n\203\263\306\n!\203\263\307\306\n!!\203\263r\nq\210\f\310=\203, \202J\f\311=\2037\202J\f\312=\203B\202J\f\313=\205J\314\f\315\f\"A*!\316!\206i\316\317\"\320\f\321#\203\246\306!\203\246\307\306!!\203\246rq\210W\203\241\322e]d^\"\202\242\323)\202\261\324=\206\261\325!-\207\324=\206\276\325!\207" [diff-num ediff-current-difference ctl-buf ediff-control-buffer buf-type ediff-buffer-A get-buffer buffer-name A B C Ancestor eval assoc window-end t ediff-get-diff-posn beg count-lines 0 ediff-quit error ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer buf ediff-window-alist alist wind end this-command ediff-KILLED-VITAL-BUFFER] 4]) (defalias 'ediff-get-region-size-coefficient #[(buf-type op &optional n ctl-buf) "\204 \203\237\306\206 !\203\237\307\306\206 !!\203\237r\206$ q\210\n\211\204. \n\310Y\2057\n\fW)\203\234 \311=\203E\312\202P \313=\203O\314\202P\315\211\316\n#\317\n#]\203|\306!\203|\307\306!!\203|\320\n#\202}\310]\211\310V\203\227\n#\321\\\322\\\245\202\230\323*\202\235\323)\207\324=\206\252\325!\207" [ctl-buf ediff-control-buffer n ediff-current-difference ediff-number-of-differences op get-buffer buffer-name 0 scroll-down ediff-get-lines-to-region-start scroll-up ediff-get-lines-to-region-end (lambda (a b c) 0) A B C 0.0 0.0 1 ediff-quit error func ediff-buffer-C max-lines buf-type this-command 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) "\306\307!\204 \310\311 \"\210)\n W\203 \n\f\206\312\\^\306\211\211!\"#\313 \210# Y\204P$#!\211\204P\314#!\"\315#!\211!\204P\316#!\210# W\203 \204\245\"\204\245!\204\245%\203\317&'(\320('\"A*J#H\321H\322=\204\245)\323>\203\317&'(\320('\"A*J#H\321H\324=\203#T#\325#\326\"\327U\203\272\330\331#\"\210# Y\204P$#!\211\204P##*\205\347\332\333+\203\345+#H\327H\206\346\334\")\"##,\205\370\335#\336\")\211!\204P\316#!\210\202P\330\334!\210\337#!,\207\313 \210\310\340!\207" [meta-buf-p this-command ediff-current-difference ediff-number-of-differences arg regexp-skip nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" 1 ediff-visible-region ediff-merge-region-is-non-clash ediff-skip-merge-region-if-changed-from-default-p ediff-install-fine-diff-if-necessary A assoc 2 t (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) C mod 20 0 message "Skipped over region %d and counting ..." string-match "prefer" "" ediff-merge-changed-from-default-p prefers-too ediff-unselect-and-select-difference "At end of the difference list" skip-changed non-clash-skip n ediff-skip-diff-region-function ediff-ignore-similar-regions ediff-difference-vector-alist alist buf-type ediff-job-name ediff-show-clashes-only ediff-state-of-merge ediff-skip-merge-regions-that-differ-from-default] 4 (#$ . 44035) "p"]) #@88 Go to the previous difference. With a prefix argument, go back that many differences. (defalias 'ediff-previous-difference #[(&optional arg) "\306\307!\204 \310\311 \"\210)\n\312V\203\312\n \206\313Z]\306\211\211\"#\314 \210#\315W\204N$#!\211\204N\316#!\"\317#!\211\204N\320#!\210#\312V\203\f\204\242\"\204\242 \204\242%\203\321&'(\322('\"A*J#H\323H\324=\204\242)\325>\203\321&'(\322('\"A*J#H\323H\326=\203\327#T\330\"\315U\203\264\331\332#T\"\210#S\211#\315W\204N$#!\211\204N##*\205\345\333\334+\203\343+#H\315H\206\344\335\")\"##,\205\366\336#\337\")\211\204N\320#!\210\202N\331\335!\210\340#!,\207\314 \210\310\341!\207" [meta-buf-p this-command ediff-current-difference arg regexp-skip skip-changed nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" -1 1 ediff-visible-region 0 ediff-merge-region-is-non-clash ediff-skip-merge-region-if-changed-from-default-p ediff-install-fine-diff-if-necessary A assoc 2 t (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) C mod 20 message "Skipped over region %d and counting ..." string-match "prefer" "" ediff-merge-changed-from-default-p prefers-too ediff-unselect-and-select-difference "At beginning of the difference list" non-clash-skip n ediff-skip-diff-region-function ediff-ignore-similar-regions ediff-difference-vector-alist alist buf-type ediff-job-name ediff-show-clashes-only ediff-state-of-merge ediff-skip-merge-regions-that-differ-from-default] 5 (#$ . 45705) "p"]) #@113 Go to the difference specified as a prefix argument. If the prefix is negative, count differences from the end. (defalias 'ediff-jump-to-difference #[(difference-number) "\305\306!\204 \307\310 \"\210)\n\311W\203 \n\\\202&\n\311V\203%\nS\202&\312\211\312Y\2037\n X\2037\313\n!\207\307\f \nT $\207" [meta-buf-p this-command difference-number ediff-number-of-differences ediff-BAD-DIFF-NUMBER nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" 0 -1 ediff-unselect-and-select-difference] 6 (#$ . 47371) "p"]) #@332 Go to difference closest to the point in buffer A, B, or C. The buffer depends on last command character (a, b, or c) that invoked this command. For instance, if the command was `ga' then the point value in buffer A is used. With a prefix argument, synchronize all files around the current point position in the specified buffer. (defalias 'ediff-jump-to-difference-at-point #[(arg) "\306\307!\204 \310\311 \"\210)\n\312>\203\313\202)\n\314>\203\"\315\202)\n\316>\205)\317\211\313=\2034\f\202Q \315=\203> \202Q \317=\203I$\202Q \320=\205Q%\211&\203q\321&!\203q\322\321&!!\203qr&q\210`)\202{ \323=\206{\310'!(\324 \306)\205\206\325#*+*W\211,\203\300&\203\263\321&!\203\263\322\321&!!\203\263r&q\210d)\202\307 \323=\206\307\310'!\202\307\326 \327*S#\306-\306.\306/\3060\3061,\203\344\330\331!\210\202\351\330*!\210\332 -2.3/40)\205x&\203#\321&!\203#\322\321&!!\203#r&q\210(Z1)\202. \323=\204.\310'!\210\333.!\210,\203;db\210\306\334\335\217\210\336 \210\333/!\210,\203Pdb\210\306\337\340\217\210\336 \210\3410!\203t\3330!\210,\203ldb\210\306\342\343\217\210\336 \210\333-!. \207" [meta-buf-p this-command last-command-char buf-type ediff-buffer-A ediff-buffer-B nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" (97 65) A (98 66) B (99 67) C Ancestor get-buffer buffer-name ediff-quit ediff-diff-at-point after ediff-get-diff-posn beg ediff-jump-to-difference -1 selected-window select-window (backward-char shift) ((error)) recenter (backward-char shift) ((error)) window-live-p (backward-char shift) ((error)) ediff-buffer-C ediff-ancestor-buffer buffer ediff-KILLED-VITAL-BUFFER pt arg diff-no ediff-number-of-differences past-last-diff ctl-wind wind-A wind-B wind-C shift ediff-window-A ediff-window-B ediff-window-C] 5 (#$ . 47934) "P"]) (defalias 'ediff-diff-at-point #[(buf-type &optional pos which-diff) "\306=\203\n \202%\307=\203\n\202%\310=\203 \202%\311=\205%\f S\312\313\211\211\211\211\203\364\314!\203\364\315\314!!\203\364rq\210 \206]`  W\204o V\203\233W\203\233T\316\317$\316\320$\202_!\321>\203\267 V\203\267U\203\267T!\322=\203\304T\202\360!\323=\203\320\202\360\324\325 \326]\"!\324\325 \326]\"!W\203\355\202\360T)\202\377\"\327=\206\377\330#!.\207" [buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-control-buffer A B C Ancestor -1 0 get-buffer buffer-name ediff-get-diff-posn beg end (after before) after before abs count-lines 1 ediff-quit error ediff-number-of-differences prev-end prev-beg diff-no max-dif-num ctl-buffer buffer pos which-diff this-command ediff-KILLED-VITAL-BUFFER] 9]) #@640 Copy buffer-X'th difference region to buffer Y (X,Y are A, B, or C). If numerical prefix argument, copy the difference specified in the arg. Otherwise, copy the difference given by `ediff-current-difference'. This command assumes it is bound to a 2-character key sequence, `ab', `ba', `ac', etc., which is used to determine the types of buffers to be used for copying difference regions. The first character in the sequence specifies the source buffer and the second specifies the target. If the second optional argument, a 2-character string, is given, use it to determine the source and the target buffers instead of the command keys. (defalias 'ediff-diff-to-diff #[(arg &optional keys) "\306\307!\204 \310\311 \"\210)\n\204\312  \313=\203\314 \247\203&\315 !\210\n\316H\n\317H\203d\f\211\250\206Z9\203H\320N\206Z:\205Z@9\205Z@\320N)\203d\321\f!\202e\f\203\235\f\211\250\206\2239\203\201\320N\206\223:\205\223@9\205\223@\320N)\203\235\321 !\202\236 \306\322\323>\203\261\324\202\304\325>\203\274\326\202\304\327>\205\304\330\323>\203\317\324\202\342\325>\203\332\326\202\342\327>\205\342\330#\210\331 -\207" [meta-buf-p this-command keys arg key1 key2 nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" this-command-keys - -1 ediff-jump-to-difference 0 1 event-symbol-elements event-key ediff-copy-diff (97 65) A (98 66) B (99 67) C ediff-recenter ediff-xemacs-p obj char1 char2 ediff-verbose-p ediff-current-difference] 6 (#$ . 50745) "P"]) #@121 Copy ARGth difference region from buffer A to B. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-A-to-B #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ab"] 3 (#$ . 52324) "P"]) #@121 Copy ARGth difference region from buffer B to A. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-B-to-A #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ba"] 3 (#$ . 52557) "P"]) #@128 Copy ARGth difference region from buffer A to buffer C. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-A-to-C #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ac"] 3 (#$ . 52790) "P"]) #@128 Copy ARGth difference region from buffer B to buffer C. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-B-to-C #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "bc"] 3 (#$ . 53030) "P"]) #@121 Copy ARGth difference region from buffer C to B. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-C-to-B #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "cb"] 3 (#$ . 53270) "P"]) #@121 Copy ARGth difference region from buffer C to A. ARG is a prefix argument. If nil, copy the current difference region. (defalias 'ediff-copy-C-to-A #[(arg) "\301\302\"\207" [arg ediff-diff-to-diff "ca"] 3 (#$ . 53503) "P"]) (defalias 'ediff-copy-diff #[(n from-buf-type to-buf-type &optional batch-invocation reg-to-copy) "\306=\203\n \202%\307=\203\n\202%\310=\203 \202%\311=\205%\f\312\313 \313!\313\"\313#\313$\314\315%$#\314\316%$$&\203_\313'\202\372%'\313\211()%\203\270\317!\203\270\320\317!!\203\270rq\210)\306=\203\226 \202\264)\307=\203\241\n\202\264)\310=\203\254 \202\264)\311=\205\264\f)\202\303*\321=\204\306\322+!\203\354\317\203\317!\203\320\317!!\203rq\210)\306=\203\354 \202\n)\307=\203\367\n\202\n)\310=\203 \202\n)\311=\205\n\f)\202*\321=\206\322+!!\203\354\320\317\203f\317!\203f\320\317!!\203frq\210)\306=\203D \202b)\307=\203O\n\202b)\310=\203Z \202b)\311=\205b\f)\202q*\321=\206q\322+!!!\203\354r\203\276\317!\203\276\320\317!!\203\276rq\210)\306=\203\234 \202\272)\307=\203\247\n\202\272)\310=\203\262 \202\272)\311=\205\272\f)\202\311*\321=\206\311\322+!q\210(\206\331\314)\315%$\206\347\314)\316%${)\202\367*\321=\206\367\322+!-&%#$()%\203T\317!\203T\320\317!!\203Trq\210)\306=\2032 \202P)\307=\203=\n\202P)\310=\203H \202P)\311=\205P\f)\202_*\321=\204b\322+!\203\210\317\203\252\317!\203\252\320\317!!\203\252rq\210)\306=\203\210 \202\246)\307=\203\223\n\202\246)\310=\203\236 \202\246)\311=\205\246\f)\202\265*\321=\206\265\322+!!\203\210\320\317\203\317!\203\320\317!!\203rq\210)\306=\203\340 \202\376)\307=\203\353\n\202\376)\310=\203\366 \202\376)\311=\205\376\f)\202 *\321=\206 \322+!!!\203\210r\203Z\317!\203Z\320\317!!\203Zrq\210)\306=\2038 \202V)\307=\203C\n\202V)\310=\203N \202V)\311=\205V\f)\202e*\321=\206e\322+!q\210(\206u\314)\315%$\206\203\314)\316%${)\202\223*\321=\206\223\322+!-\211\"&\230\203\243\313\202\265,\204\260\323%\"\203\265\324\325\326\217\210\203\306\203\306\327%\"\210,\203\351%%\330%\306\"\210\330%\307\"\210\205\345\330%\310\")\202<\203\203%%\330%\306\"\210\330%\307\"\210\203\330%\310\"\210)\331 \210\2038\2048%%\330%\306\"\210\330%\307\"\210\2037\330%\310\"\210)\332 !. \207" [to-buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer to-buf A B C Ancestor t nil ediff-get-diff-posn beg end get-buffer buffer-name ediff-quit error ediff-test-save-region conds (byte-code "\203.\306!\203.\307\306!!\203.rq\210 ? b\210\fc\210 V\203*\310 \"\210*\202:\f\311=\204:\312 !\210\204I\313#\306\207" [to-buf buffer-read-only inhibit-read-only reg-to-delete-end reg-to-copy reg-to-delete-beg get-buffer buffer-name kill-region ediff-quit error ediff-save-diff-region this-command ediff-KILLED-VITAL-BUFFER batch-invocation n to-buf-type reg-to-delete messg] 4) ((error (byte-code "\302\303@\304\305A\306##\210\307\310!\210\311\312!\210\313\313\207" [conds saved-p message "ediff-copy-diff: %s %s" mapconcat prin1-to-string " " beep 1 sit-for 2 nil] 7))) ediff-set-state-of-diff-in-all-buffers ediff-clear-fine-differences-in-one-buffer ediff-refresh-mode-lines message ediff-control-buffer ctrl-buf saved-p ediff-3way-job three-way messg ediff-verbose-p reg-to-delete reg-to-delete-beg reg-to-delete-end n reg-to-copy from-buf-type start buf-type this-command ediff-KILLED-VITAL-BUFFER batch-invocation] 7]) (defalias 'ediff-save-diff-region #[(n buf-type reg) "\306 \" \307=\203\f\202, \310=\203 \202, \311=\203$\202, \312=\205,\306\nA\"\211\203C\241\210\202]\n\203S\nBC\244\210\202]BD B\313\314T \203k\315\202o\316 !\227$+\207" [n ediff-killed-diffs-alist n-th-diff-saved buf-type ediff-buffer-A ediff-buffer-B assoc A B C Ancestor message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" "" symbol-name ediff-buffer-C ediff-ancestor-buffer buf this-buf-n-th-diff-saved reg ediff-merge-job] 7]) (defalias 'ediff-test-save-region #[(n buf-type) "\306 \" \307=\203\f\202, \310=\203 \202, \311=\203$\202, \312=\205,\306\nA\"\211\203O\313\314\315T #!\203I\316\202P\317\320!\202P\316+\207" [n ediff-killed-diffs-alist n-th-diff-saved buf-type ediff-buffer-A ediff-buffer-B assoc A B C Ancestor yes-or-no-p format "You've previously copied diff region %d to buffer %S. Confirm " t error "Quit" ediff-buffer-C ediff-ancestor-buffer buf this-buf-n-th-diff-saved] 6]) #@55 Pop last killed Nth diff region from buffer BUF-TYPE. (defalias 'ediff-pop-diff #[(n buf-type) "\306 \" \307=\203\f\202, \310=\203 \202, \311=\203$\202, \312=\205,\306\nA\" !\"\313#\313$\313%\313&\313'A\203[A$\202q(\314V\203l\315\316T #\210\202q\315)!\210\317 \320!$%\317 \321!$&\322\323\324\217\210'\203\244\325\307\"\210\325\310\"\210\203\243\325\311\"\210) \203\264'\203\264\326\"\"\210\327 \210'\205\310\330\n\"\331\332T #.\n\207" [n ediff-killed-diffs-alist n-th-record buf-type ediff-buffer-A ediff-buffer-B assoc A B C Ancestor nil 0 error "Nothing saved for diff %d in buffer %S" ediff-get-diff-posn beg end conds (byte-code "\2031\306!\2031\307\306!!\2031rq\210 ? b\210\fc\210 V\203*\310 \"\210\311\f*\202= \312=\204=\313!\210\306\207" [buf buffer-read-only inhibit-read-only reg-end saved-diff reg-beg get-buffer buffer-name kill-region t ediff-quit error recovered this-command ediff-KILLED-VITAL-BUFFER] 3) ((error (byte-code "\301\302@\303\304A\305##\210\306\307!\207" [conds message "ediff-pop-diff: %s %s" mapconcat prin1-to-string " " beep 1] 7))) ediff-clear-fine-differences-in-one-buffer ediff-set-state-of-diff-in-all-buffers ediff-refresh-mode-lines delq message "Diff region %d in buffer %S restored" ediff-buffer-C ediff-ancestor-buffer buf saved-rec ediff-3way-job three-way ediff-control-buffer ctl-buf ediff-verbose-p saved-diff reg-beg reg-end recovered ediff-number-of-differences ediff-NO-DIFFERENCES] 5 (#$ . 58248)]) #@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) "\306\307!\204 \310\311 \"\210)\n\247\203\312\n!\210\313 \f\206 \314>\203'\315\202@\f\206, \316>\2035\317\202@\f\206: \320>\205@\321\"\210\306\322 )\207" [meta-buf-p this-command arg ediff-current-difference key last-command-char nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-jump-to-difference ediff-pop-diff (97 65) A (98 66) B (99 67) C ediff-recenter ediff-verbose-p] 4 (#$ . 59793) "P"]) #@102 Restore ARGth diff in the merge buffer. ARG is a prefix argument. If nil, restore the current diff. (defalias 'ediff-restore-diff-in-merge-buffer #[(arg) "\301\302\"\207" [arg ediff-restore-diff 99] 3 (#$ . 60560) "P"]) #@112 Toggle between focusing and hiding of difference regions that match a regular expression typed in by the user. (defalias 'ediff-toggle-regexp-match #[nil "\306\307!\204 \310\311 \"\210)\312\211\211\306\211\211!\"#$=\203+%\313=\204:#&=\203E%\314=\203E\315\316!\210\317\211#\202<%\314=\203\302&#\320\321\322'\"!\"\320\321\323(\"!!)\203o\320\321\324*\"!+\325=\203\326\327\330\202\205\327\326\325\331\321\332\f #!\203\227\315\333\f\"\210\202\237\n+\315\333 \"\210\"\312\230\204\252\"'!\312\230\204\265!( \312\230\206< \211*\202<%\313=\205<$#\320\321\334,\"!\"\320\321\335-\"!!)\203\354\320\321\336.\"!/\325=\203\374\326\327\330\202\327\326\325\331\321\337\f #!\203\315\340\f\"\210\202\n/\315\340 \"\210\"\312\230\204'\",!\312\230\2042!- \312\230\206< \211..\207" [meta-buf-p this-command alt-connective alt-msg-connective msg-connective regexp-C nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" "" 102 104 message "Selective browsing by regexp turned off" ediff-show-all-diffs read-string format "Ignore A-regions matching this regexp (default \"%s\"): " "Ignore B-regions matching this regexp (default \"%s\"): " "Ignore C-regions matching this regexp (default \"%s\"): " and "BOTH" "ONE OF" or y-or-n-p "Ignore regions that match %s regexps, OK? " "Will ignore regions that match %s regexps" "Focus on A-regions matching this regexp (default \"%s\"): " "Focus on B-regions matching this regexp (default \"%s\"): " "Focus on C-regions matching this regexp (default \"%s\"): " "Focus on regions that match %s regexps, OK? " "Will focus on regions that match %s regexps" regexp-B regexp-A ediff-skip-diff-region-function ediff-focus-on-regexp-matches-function last-command-char ediff-hide-regexp-matches-function ediff-regexp-hide-A ediff-regexp-hide-B ediff-3way-comparison-job ediff-regexp-hide-C ediff-hide-regexp-connective ediff-regexp-focus-A ediff-regexp-focus-B ediff-regexp-focus-C ediff-focus-regexp-connective] 6 (#$ . 60789) nil]) (defalias 'ediff-toggle-skip-similar #[nil "\304\305!\204 \306\307 \"\210)\n\310=\204\306\311!\210 ?\211\203#\312\313!\207\312\314!\207" [meta-buf-p this-command ediff-auto-refine ediff-ignore-similar-regions nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" on "Can't skip over whitespace regions: first turn auto-refining on" message "Skipping regions that differ only in white space & line breaks" "Skipping over white-space differences turned off"] 4 nil nil]) #@457 Focus on diffs that match regexp `ediff-regexp-focus-A/B'. Regions to be ignored according to this function are those where buf A region doesn't match `ediff-regexp-focus-A' and buf B region doesn't match `ediff-regexp-focus-B'. This function returns nil if the region number N (specified as an argument) is not to be ignored and t if region N is to be ignored. N is a region number used by Ediff internally. It is 1 less the number seen by the user. (defalias 'ediff-focus-on-regexp-matches #[(n) "\211\204 \306Y\205\nW)\205  \203X\307!\203X\310\307!!\203Xrq\210\214\311\312\313\f$\311\312\314\f$}\210eb\210\315\316\317#*\202c\320=\206c\321!\203\230\307!\203\230\310\307!!\203\230rq\210\214\311\322\313\f$\311\322\314\f$}\210\315\316\317#*\202\243\320=\206\243\321! \205\350!\203\335\307!!\203\335\310\307!!!\203\335r!q\210\214\311\323\313\f$\311\323\314\f$}\210\315\316\317#*\202\350\320=\206\350\321!\"\324 \203\374#\"F\202#E!.?\207" [n ediff-current-difference ediff-number-of-differences ediff-control-buffer ctl-buf ediff-regexp-focus-A 0 get-buffer buffer-name ediff-get-diff-posn A beg end re-search-forward nil t ediff-quit error B C eval regex-A ediff-regexp-focus-B regex-B ediff-regexp-focus-C regex-C ediff-buffer-A this-command ediff-KILLED-VITAL-BUFFER reg-A-match ediff-buffer-B reg-B-match ediff-3way-comparison-job ediff-buffer-C reg-C-match ediff-focus-regexp-connective] 7 (#$ . 63382)]) #@410 Hide diffs that match regexp `ediff-regexp-hide-A/B/C'. Regions to be ignored are those where buf A region matches `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'. This function returns nil if the region number N (specified as an argument) is not to be ignored and t if region N is to be ignored. N is a region number used by Ediff internally. It is 1 less the number seen by the user. (defalias 'ediff-hide-regexp-matches #[(n) "\211\204 \306Y\205\nW)\205\f  \203X\307!\203X\310\307!!\203Xrq\210\214\311\312\313\f$\311\312\314\f$}\210eb\210\315\316\317#*\202c\320=\206c\321!\203\233\307!\203\233\310\307!!\203\233rq\210\214\311\322\313\f$\311\322\314\f$}\210eb\210\315\316\317#*\202\246\320=\206\246\321! \205\356!\203\343\307!!\203\343\310\307!!!\203\343r!q\210\214\311\323\313\f$\311\323\314\f$}\210eb\210\315\316\317#*\202\356\320=\206\356\321!\"\324 \203#\"F\202 #E!.\207" [n ediff-current-difference ediff-number-of-differences ediff-control-buffer ctl-buf ediff-regexp-hide-A 0 get-buffer buffer-name ediff-get-diff-posn A beg end re-search-forward nil t ediff-quit error B C eval regex-A ediff-regexp-hide-B regex-B ediff-regexp-hide-C regex-C ediff-buffer-A this-command ediff-KILLED-VITAL-BUFFER reg-A-match ediff-buffer-B reg-B-match ediff-3way-comparison-job ediff-buffer-C reg-C-match ediff-hide-regexp-connective] 7 (#$ . 64906)]) #@497 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) "\305\306!\204 \307\310 \"\210)p\311\312\313 \203)\314 !\203)\315\314 !!\203)\316\202*\317\"!\203<\320\317!\210\nq\210\321\f!\202?\320\317!)\207" [meta-buf-p this-command ctl-buf ediff-meta-buffer reverse-default-keep-variants nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" y-or-n-p format "Quit this Ediff session%s? " get-buffer buffer-name " & show containing session group" "" message ediff-really-quit] 6 (#$ . 66384) "P"]) (defalias 'ediff-really-quit #[(reverse-default-keep-variants) "\306\307!\210\306\310!\210\306\311!\210\306\312!\210\313\314\315\"\210\313\316\315\"\210\313\317\315\"\210\313\320\315\"\210\321 \210\2030 \2022 \322 \210\323\324 \"\210\323\325 \"\210\f 67\326 \205o8\327=\205o\3309!\203_\3319!\202o\330:!\203m\331:!\202o\332 ;<5=>\333\334\335\217\210\333\336\337\217\210\333\340\341\217\210\333\342\343\217\210\344\f?\"?\345 \210\346 \210\333\347\350\217\210\351\352!\210@@A\203\261@?@@\204\272\353\354!\210)\351\355!\210\356=\333<#\210\357 \206\316;;\326 \203\364\360;!\203\3648\203\364\361B\203\354;\202\360\362;!\363\364#\210\351\365!-\207" [ediff-quit-widened ediff-wide-bounds ediff-visible-bounds ediff-narrow-bounds ediff-control-buffer ediff-meta-buffer 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-visible-region mapcar #[(overl) "\301!\205 \302!\207" [overl ediff-overlayp ediff-delete-overlay] 2] #[(overl) "\301!\205 \302!\207" [overl ediff-overlayp ediff-delete-overlay] 2] ediff-window-display-p t window-live-p window-frame next-frame nil (byte-code "\203'\305!\203'\306\305!!\203'rq\210\307 \n\"\310\311!\210\310\312!\210)\2021 \313=\2041\314\f!\210\305\207" [ediff-buffer-A control-buffer ediff-this-buffer-ediff-sessions this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name delq kill-local-variable mode-line-buffer-identification mode-line-format ediff-quit error] 3) ((error)) (byte-code "\203'\305!\203'\306\305!!\203'rq\210\307 \n\"\310\311!\210\310\312!\210)\2021 \313=\2041\314\f!\210\305\207" [ediff-buffer-B control-buffer ediff-this-buffer-ediff-sessions this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name delq kill-local-variable mode-line-buffer-identification mode-line-format ediff-quit error] 3) ((error)) (byte-code "\203'\305!\203'\306\305!!\203'rq\210\307 \n\"\310\311!\210\310\312!\210)\2021 \313=\2041\314\f!\210\305\207" [ediff-buffer-C control-buffer ediff-this-buffer-ediff-sessions this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name delq kill-local-variable mode-line-buffer-identification mode-line-format ediff-quit error] 3) ((error)) (byte-code "\203'\305!\203'\306\305!!\203'rq\210\307 \n\"\310\311!\210\310\312!\210)\2021 \313=\2041\314\f!\210\305\207" [ediff-ancestor-buffer control-buffer ediff-this-buffer-ediff-sessions this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name delq kill-local-variable mode-line-buffer-identification mode-line-format ediff-quit error] 3) ((error)) delq ediff-update-registry ediff-restore-protected-variables (byte-code "\301>\203\n\302\303!\210\302\207" [ediff-job-name (ediff-merge-files ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-buffers-with-ancestor ediff-merge-revisions ediff-merge-revisions-with-ancestor) run-hooks ediff-quit-merge-hook] 2) ((quit)) run-hooks ediff-cleanup-hook ediff-janitor ask ediff-quit-hook ediff-update-meta-buffer ediff-good-frame-under-mouse frame-live-p set-mouse-position frame-selected-window 2 1 after-quit-hook-internal ediff-after-quit-hook-internal ediff-meta-session-number ediff-grab-mouse ediff-window-A ediff-window-B warp-frame session-number meta-buffer control-buffer ediff-session-registry ediff-keep-variants reverse-default-keep-variants ediff-emacs-p] 6]) (defalias 'ediff-good-frame-under-mouse #[nil "\305 @\306\307\211\f\203\310 !\202\311 !\211\2030\f\203$ \202'\312 !\313\314\315 !!!\316\317\n\"?\2059 ,\207" [obj-ok frame buf-name frame-or-win ediff-emacs-p mouse-position "" nil frame-live-p window-live-p window-frame buffer-name window-buffer frame-selected-window string-match "Minibuf"] 5]) (defalias 'ediff-delete-temp-files #[nil ";\203\303!\203\304!\210 ;\203\303 !\203\304 !\210\n;\205,\303\n!\205,\304\n!\207" [ediff-temp-file-A ediff-temp-file-B ediff-temp-file-C file-exists-p delete-file] 2]) (defalias 'ediff-cleanup-mess #[nil "\n\f !\306\"!\203 \307\"!\202+\306#!\205+\307#!$%\211&\203L\310&!\203L\311\310&!!\203L\312\310&!!\210)'\211&\203l\310&!\203l\311\310&!!\203l\312\310&!!\210)(\211&\203\214\310&!\203\214\311\310&!!\203\214\312\310&!!\210))\211&\203\254\310&!\203\254\311\310&!!\203\254\312\310&!!\210)*\211&\203\314\310&!\203\314\311\310&!!\203\314\312\310&!!\210)+\211&\203\354\310&!\203\354\311\310&!!\203\354\312\310&!!\210),\211&\203\f\310&!\203\f\311\310&!!\203\f\312\310&!!\210)\313\314!\2033\f\211&\2032\310&!\2032\311\310&!!\2032\312\310&!!\210)\315 \203D\316!\203D\317!\210\315 \203N-\204Q\320 \210\211&\203p\310&!\203p\311\310&!!\203p\312\310&!!\210)\316$!\203\200\321$!\210\322 \210\323\324\325\217\210\323\326\327\217\210!\203\224\323\330\331\217\210\332\333!.\207" [ediff-buffer-A buff-A ediff-buffer-B buff-B ediff-buffer-C buff-C window-live-p window-frame get-buffer buffer-name kill-buffer boundp ediff-patch-diagnostics ediff-window-display-p frame-live-p delete-frame ediff-kill-bottom-toolbar select-frame delete-other-windows nil (byte-code "\301!\204\n\302!\210\301\207" [buff-B ediff-get-visible-buffer-window switch-to-buffer] 2) ((error)) (byte-code "\303!\204\303 !\203\n \210\304!\210\303\207" [buff-A buff-B ediff-split-window-function ediff-get-visible-buffer-window switch-to-buffer] 2) ((error)) (byte-code "\304!\204\304 !\204\304\n!\203 \210\305!\210\306 \210\304\207" [buff-C buff-A buff-B ediff-split-window-function ediff-get-visible-buffer-window switch-to-buffer balance-windows] 2) ((error)) message "" ediff-control-buffer ctl-buf ediff-control-frame ctl-frame ediff-3way-job three-way-job ediff-window-A ediff-window-B main-frame ediff-diff-buffer buf ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-tmp-buffer ediff-error-buffer ediff-msg-buffer ediff-debug-buffer ediff-multiframe] 4]) #@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) "\203B\306!\203B\307\306!!\203B\310!\204B \203'\311\312\313\307!\"!\203B\211\203A\306\n!\203A\307\306\n!!\203A\314\306\n!!\210) \203\204\306 !\203\204\307\306 !!\203\204\310 !\204\204 \203i\311\312\315\307 !\"!\203\204 \211\203\203\306\n!\203\203\307\306\n!!\203\203\314\306\n!!\210)\f\203\314 \205\227\306 !\205\227\307\306 !!?\206\310 !\206 \203\261\311\312\316\307 !\"!?\206 \211\205\312\306\n!\205\312\307\306\n!!\205\312\314\306\n!!)\207\205\336\306!\205\336\307\306!!?\206\310!\206 \203\372\311\312\317\307!\"!?\206\211\205\306\n!\205\307\306\n!!\205\314\306\n!!)\207" [ediff-buffer-A ask buf ediff-buffer-B ediff-merge-job ediff-ancestor-buffer get-buffer buffer-name buffer-modified-p y-or-n-p format "Kill buffer A [%s]? " kill-buffer "Kill buffer B [%s]? " "Kill the ancestor buffer [%s]? " "Kill buffer C [%s]? " ediff-buffer-C] 6 (#$ . 73531)]) #@674 Default hook to run on quitting a merge job. This can also be used to save merge buffer in the middle of an Ediff session. If the optional SAVE-AND-CONTINUE argument is non-nil, save merge buffer and continue. Otherwise: If `ediff-autostore-merges' is nil, this does nothing. If it is t, it saves the merge buffer in the file `ediff-merge-store-file' or asks the user, if the latter is nil. It then asks the user whether to delete the merge buffer. If `ediff-autostore-merges' is neither nil nor t, the merge buffer is saved only if this merge job is part of a group, i.e., was invoked from within `ediff-merge-directories', `ediff-merge-directory-revisions', and such. (defalias 'ediff-maybe-save-and-delete-merge #[(&optional save-and-continue) " \203 \306\202\n\n\n\205s;\203\307\f \310 $\202s\n\306=\2031\311\312!\307\f \313 $\202s \205s\314 !\205s\315\314 !!\205s \203d\314 !\203d\315\314 !!\203dr q\210\313\316>*\202o\317=\204r\320!\205s\313*\207" [ediff-merge-store-file save-and-continue ediff-autostore-merges merge-store-file ediff-buffer-C ediff-meta-buffer t ediff-write-merge-buffer-and-maybe-kill show-file read-file-name "Save the merge buffer in file: " nil get-buffer buffer-name (ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ediff-merge-filegroups-with-ancestor) ediff-quit error metajob ediff-metajob-name this-command ediff-KILLED-VITAL-BUFFER] 5 (#$ . 74811)]) (defalias 'ediff-write-merge-buffer-and-maybe-kill #[(buf file &optional show-file save-and-continue) "\203c\306!\203c\307\306!!\203crq\210\310 !\203%\311\312\313 \"!\205a\314ed #\210\n\203<\315\316 \"\210\317\320!\210\321\322!\210 ?\205a\311\323!\205a\211\205`\306!\205`\307\306!!\205`\324\306!!))\207\f\325=\206l\326 !\207" [buf file show-file save-and-continue this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name file-exists-p y-or-n-p format "File %s exists, overwrite? " write-region message "Merge buffer saved in: %s" set-buffer-modified-p nil sit-for 3 "Merge buffer saved. Now kill the buffer? " kill-buffer ediff-quit error] 5]) (defalias 'ediff-default-suspend-function #[nil "\n\f\306 !\306 !\306 !\307\310!\205\307\311!\205' \312 \203M\313 !\203M\314 !\210\202P\315 \210\203Z\315!\210\203d\315!\210\203n\315!\210\203x\315!\210\203\202\315!\210\203\214\315!\210\316!\203\241\317!\210\320 \210\315 \210\202\271 \203\271\321 !\203\271\322\321 !!\203\271 q\210\315 \210\316!\203\316\317!\210\320 \210\315 \210\202\346 \203\346\321 !\203\346\322\321 !!\203\346 q\210\315 \210\316!\203\372\317!\210\320 \210\315 \202 \205\321 !\205\322\321 !!\205 q\210\315 .\f\207" [ediff-buffer-A buf-A ediff-buffer-B buf-B ediff-buffer-C buf-C ediff-get-visible-buffer-window boundp ediff-patchbufer ediff-patch-diagnostics ediff-window-display-p frame-live-p iconify-frame bury-buffer window-live-p select-window delete-other-windows get-buffer buffer-name buf-A-wind buf-B-wind buf-C-wind buf-patch buf-patch-diag ediff-error-buffer buf-err ediff-diff-buffer buf-diff ediff-custom-diff-buffer buf-custom-diff ediff-fine-diff-buffer buf-fine-diff ediff-control-frame] 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 "\302\303!\204 \304\305 \"\210)\306\307!\210\310\311!\207" [meta-buf-p this-command nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" run-hooks ediff-suspend-hook message "To resume, type M-x eregistry and select the desired Ediff session"] 3 (#$ . 78128) nil]) #@122 Show the names of the buffers or files being operated on by Ediff. Hit \[ediff-recenter] to reset the windows afterward. (defalias 'ediff-status-info #[nil "\306\307!\204 \310\311 \"\210)\212\312 \210)\n\220 \2032\313 !\2032\314\313 !!\2032r q\210\315 \210)\202< \316=\204<\310\f!\210\317\320 !\210\321\322 !\210\321\323!\210 \203|\313 !\203|\314\313 !!\203|r q\2109\203p\321\324\3259\"!\210\202x\321\324\326\314 \"!\210)\202\206 \316=\204\206\310\f!\210:\203\274\313:!\203\274\314\313:!!\203\274r:q\2109\203\260\321\324\3279\"!\210\202\270\321\324\330\314 \"!\210)\202\306 \316=\204\306\310\f!\210;\203 <\203\313\203Q\313>!\203Q\314\313>!!\203Q\334\314>!P\202R\335\"!\210 \203t\313 !\203t\314\313 !!\203tr q\210\337e`\"T)\202} \316=\206}\310\f!?:\203\242\313:!\203\242\314\313:!!\203\242r:q\210\337e`\"T)\202\253 \316=\206\253\310\f!@\306A\321\324\340?\"!\210\321\324\341@\"!\210;\203\373<\203\350\313\203\250\n\314>\203!\315\2022\n\316>\203+\317\2022\n\320>\2052\321\315=\203; \202\f\n\314>\203E\315\202V\n\316>\203O\317\202V\n\320>\205V\321\317=\203_\f\202\f\n\314>\203i\315\202z\n\316>\203s\317\202z\n\320>\205z\321\321=\203\203 \202\f\n\314>\203\215\315\202\236\n\316>\203\227\317\202\236\n\320>\205\236\321\322=\203\202\f\n\323=\203\324\325!\210\326\327!\210\203\325\203\325\330!\203\325\331\330!!\203\325\202\f \203\357\330 !\203\357\331\330 !!\203\357 \202\f\203 \330!\203 \331\330!!\203 \202\f\310\332!\203\330\n\313>\203\247\n\314>\203 \315\2021\n\316>\203*\317\2021\n\320>\2051\321\315=\203: \202 \n\314>\203D\315\202U\n\316>\203N\317\202U\n\320>\205U\321\317=\203^\f\202 \n\314>\203h\315\202y\n\316>\203r\317\202y\n\320>\205y\321\321=\203\202 \202 \n\314>\203\214\315\202\235\n\316>\203\226\317\202\235\n\320>\205\235\321\322=\205 \202 \n\323=\205 \324\325!\210\326\327!\210\203\324\203\324\330!\203\324\331\330!!\203\324\202  \203\356\330 !\203\356\331\330 !!\203\356 \202 \203\330!\203\331\330!!\203\202 \310\332!!\203\331\330\n\313>\203\250\n\314>\203!\315\2022\n\316>\203+\317\2022\n\320>\2052\321\315=\203; \202\f\n\314>\203E\315\202V\n\316>\203O\317\202V\n\320>\205V\321\317=\203_\f\202\f\n\314>\203i\315\202z\n\316>\203s\317\202z\n\320>\205z\321\321=\203\203 \202\f\n\314>\203\215\315\202\236\n\316>\203\227\317\202\236\n\320>\205\236\321\322=\205\f\202\f\n\323=\205\f\324\325!\210\326\327!\210\203\325\203\325\330!\203\325\331\330!!\203\325\202\f \203\357\330 !\203\357\331\330 !!\203\357 \202\f\203 \330!\203 \331\330!!\203 \202\f\310\332!!!\203r\n\313>\203\251\n\314>\203\"\315\2023\n\316>\203,\317\2023\n\320>\2053\321\315=\203< \202 \n\314>\203F\315\202W\n\316>\203P\317\202W\n\320>\205W\321\317=\203`\f\202 \n\314>\203j\315\202{\n\316>\203t\317\202{\n\320>\205{\321\321=\203\204 \202 \n\314>\203\216\315\202\237\n\316>\203\230\317\202\237\n\320>\205\237\321\322=\205 \202 \n\323=\205 \324\325!\210\326\327!\210\203\326\203\326\330!\203\326\331\330!!\203\326\202  \203\360\330 !\203\360\331\330 !!\203\360 \202 \203\n\330!\203\n\331\330!!\203\n\202 \310\332!q\210\333 )\207 \334=\206\310!!\207" [meta-buf-p this-command last-command-char ediff-buffer-A ediff-buffer-B ediff-buffer-C nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-compute-custom-diffs-maybe (97 98 99) (97 65) A (98 66) B (99 67) C Ancestor 100 message "Saving diff output ..." sit-for 1 get-buffer buffer-name "Output from `diff' not found" save-buffer ediff-quit ediff-ancestor-buffer arg ediff-diff-buffer ediff-custom-diff-buffer ediff-KILLED-VITAL-BUFFER] 5 (#$ . 87144) "P"]) (defalias 'ediff-compute-custom-diffs-maybe #[nil "\306!\306 !\307\211\211;\203\310 !\f;\203\310\f!\311 \"\311 \f\"\203=\312!\203=\313\312!!\204E\314\315\316\317\"!\320\321 \n&\210\322\323!\203arq\210\323 \210)\324 !\210\324\n!,\207" [ediff-buffer-A ediff-buffer-B file-B file-A buf-B-file-name buf-A-file-name buffer-file-name nil file-name-nondirectory ediff-make-temp-file get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-custom-diff" "*" ediff-exec-process synchronize fboundp diff-mode delete-file ediff-custom-diff-buffer ediff-custom-diff-program ediff-custom-diff-options] 8]) (defalias 'ediff-show-diff-output #[(arg) "\306\307!\204 \310\311 \"\210)\312 \210\212\313\314!\210)\n\2031 \2031\315 !\2031\316\315 !!\2031 \202e\f\203G\315\f!\203G\316\315\f!!\203G\f\202e \203]\315 !\203]\316\315 !!\203] \202e\317 \210\320\321!\210\306\211\203\233 \203\207\315 !\203\207\316\315 !!\203\207r q\210eb\210)\202\222 \322=\204\222\310!\210\323 !\210\324\325 !\210)\326!\203\250\327!\210\330!\205\263\331!\207" [meta-buf-p this-command arg ediff-diff-buffer ediff-custom-diff-buffer buf nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-compute-custom-diffs-maybe ediff-skip-unsuitable-frames ok-unsplittable get-buffer buffer-name beep message "Output from `diff' not found" ediff-quit switch-to-buffer raise-frame selected-frame frame-live-p ediff-reset-mouse window-live-p select-window ediff-KILLED-VITAL-BUFFER ediff-control-frame ediff-control-window] 4 nil "P"]) #@287 Compare regions in an active Ediff session. Like ediff-regions-linewise but is called from under an active Ediff session on the files that belong to that session. After quitting the session invoked via this function, type C-l to the parent Ediff Control Panel to restore highlighting. (defalias 'ediff-inferior-compare-regions #[nil "\306\307\310\311E\312p\313\211\211\211\211\211\211=>?@AB\314>\203lCA\307=\2038D\315@\202+A\310=\203HE\316@\202+A\306\232\204[\317\320!\210\321\322!\210\323\324!\210\312F\321\325!\210\326\327 !A)\202(B\330>\203\"A@>\203\231\331A@\"@\332AGHI\333IH\"A*!\202\311A\306\232\204\262\317\320!\210\321\334\335\336@\337#\"\210\323\324!\210\312F\321\340\335\336@\341#\"\210\326\327 !A)\202s\306AA@>\203\362\331A@\"@\332AGHI\333IH\"A*!\202+A\306\232\204 \317\320!\210\321\334\335\336@\337#\"\210\323\324!\210\312F\321\342\335\336@\341#\"\210\326\327 !A)\202\314DE\313@ \203n\343 !\203n\344\343 !!\203nr q\210\345\312!\204M\346\347\344 \"\210\350 \351  b\210\352 \210` b\210\313\210m\204h\313u\210`)\202zJ\353=\204z\346K!\210\203\275\343!\203\275\344\343!!\203\275rq\210\345\312!\204\234\346\347\344 \"\210\350 \351 \fb\210\352 \210`\nb\210\313\210m\204\267\313u\210`)\202\311J\353=\204\311\346K!\210\354L\355\"\210\356\357!\210 \203\370\343 !\203\370\344\343 !!\203\370r q\210 b\210\360 !\210 }\210)\202J\353=\204\346K!\210\203)\343!\203)\344\343!!\203)rq\210\fb\210\360\n!\210\f\n}\210)\2025J\353=\2045\346K!\210@\203\214>\203\200\343>!\203\200\344\343>!!\203\200r>q\210\332@@MHI\333IH\"A*!N\361N!O\362N!\210\363O!\210\364 \210+\202\214J\353=\204\214\346K!\210\365\366!\204\225\312= \203\261\343 !\203\261\344\343 !!\203\261r q\210~\210)\202\275J\353=\204\275\346K!\210\203\331\343!\203\331\344\343!!\203\331rq\210~\210)\202\345J\353=\204\345\346K!\210=\203>\203\343>!\203\344\343>!!\203r>q\210\367 \210\323\370!\210\346\371!\210)\202J\353=\204\346K!\210\372 \f\n\313\373\313\374\306!\203>\307\306!!\203>rq\210\310\n\203%\311 \312\313#\210\202+\311 \314\313#\210\n\2037\311 \315\313#\202<\311 \316\313#*\207\f\317=\206G\320 !\207" [buffer inhibit-read-only ediff-xemacs-p overlay this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name t ediff-overlay-put begin-glyph nil before-string end-glyph after-string ediff-quit error] 4]) (defalias 'ediff-place-flags-in-buffer #[(buf-type buffer ctl-buffer diff) "\203\306!\203\307\306!!\203rq\210\310 \n #)\207\f\311=\206&\312 !\207" [buffer buf-type ctl-buffer diff this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-place-flags-in-buffer1 ediff-quit error] 4]) (defalias 'ediff-place-flags-in-buffer1 #[(buf-type ctl-buffer diff-no) "\203)\306!\203)\307\306!!\203)rq\210 \n\310 \"A*J\fH\311H)\2023 \312=\2063\313!\314 \315\f$\316\316\316b\210n\203z\306!\203z\307\306!!\203zrq\210\317=\205v\203t\202v)\202\204 \312=\206\204\313!\203\226\320\321#\210\202\236\320\322#\210\314 \323\f$\211b\210n\203\331\306!\203\331\307\306!!\203\331rq\210\317=\205\325\203\323 \202\325!)\202\343 \312=\206\343\313!\203\364\320\324#\202\373\320\325#-\207" [ctl-buffer buf-type ediff-difference-vector-alist alist diff-no this-command get-buffer buffer-name assoc 0 ediff-quit error ediff-get-diff-posn beg nil ascii ediff-overlay-put begin-glyph before-string end end-glyph after-string ediff-KILLED-VITAL-BUFFER curr-overl before after beg-of-line flag ediff-highlighting-style ediff-before-flag-bol ediff-before-flag-mol ediff-xemacs-p ediff-after-flag-eol ediff-after-flag-mol] 6]) (defalias 'ediff-get-diff-posn #[(buf-type pos &optional n control-buf) "\306 \204p \203a\307 !\203a\310\307 !!\203ar q\210\n\204$ \n\311W\2040\n\fY\203G\f\311V\203B\312 \nT\f$\210\202G\312!\210\313\"A*J\nH\311H)\202m\314=\204m\312!\210\315!\203\205\307\315!!\203\205\310\307\315!!!\204\212\312!\210\316=\203\257\317!\205\253\203\247\320!\202\253\321!)\202\312\317!\205\311\203\305\322!\202\311\323!))\207" [diff-overlay control-buf n ediff-current-difference ediff-number-of-differences ediff-BAD-DIFF-NUMBER nil get-buffer buffer-name 0 error assoc ediff-quit ediff-overlay-buffer beg ediff-overlayp overlay-start extent-start-position overlay-end extent-end-position this-command ediff-NO-DIFFERENCES buf-type ediff-difference-vector-alist alist ediff-KILLED-VITAL-BUFFER pos overl ediff-emacs-p] 5]) (defalias 'ediff-restore-highlighting #[(&optional ctl-buf) "\204p\203;\306\206p!\203;\307\306\206p!!\203;r\206$pq\210\310 \2036 \2036\n\2036\311 \210\312 !)\207\f\313=\206D\314 !\207" [ctl-buf ediff-use-faces ediff-highlight-all-diffs ediff-current-difference this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-has-face-support-p ediff-paint-background-regions ediff-select-difference ediff-quit error] 3]) (defalias 'ediff-clear-diff-vector #[(vec-var &optional fine-diffs-also) "\301J!\203 \302\303J\"\210\304L\207" [vec-var vectorp mapcar #[(elt) "\303\304H!\210 \205\211\205\305\303\n\306H\")\207" [elt fine-diffs-also diff-record ediff-delete-overlay 0 mapcar 1] 5] nil] 3]) (defalias 'ediff-make-bullet-proof-overlay #[(beg end buff) "\205\207\306!\205\207\307\306!!\205\207\310\203{\306!\203{\307\306!!\203{rq\210\311\n!\2044\312\n!\311 !\204>\312 !\f\203J\313\n #\202Q\314\n \310\315%\316 \203\\\317\202]\320\310#\210\f\203p\316 \321\310#\210\316 \322\310#\210\316 \323\324#\210 )\202\206\325=\206\206\326!)\207" [buff overl beg end ediff-xemacs-p ediff-emacs-p get-buffer buffer-name nil number-or-marker-p eval make-extent make-overlay rear-advance ediff-overlay-put evaporate detachable start-open end-open ediff-diff-num 0 ediff-quit error this-command ediff-KILLED-VITAL-BUFFER] 6]) (defalias 'ediff-other-buffer #[(excl-buff-lst) "<\204C\306 \307 \244\306  @\310\311\312\"@\2030\313@!\2030\314\313@!!\2044\315\202i@\203T\313@!\203T\314\313@!!\203Tr@q\210)\202_\316=\206_\317!\320=\203h\321\202i\322\311\323 \"\324\310\"\310\204\212\fG\325V\203\212\f\203\225@\202\251\324\310\311\326 \"\"\211\203\250@\202\251\327. \207" [excl-buff-lst all-buffers selected-buffers prefered-buffer visible-dired-buffers excl-buff-name-list ediff-get-selected-buffers buffer-list nil mapcar #[(b) ";\203\207\301!\205\302!\207" [b bufferp buffer-name] 2] get-buffer buffer-name unknown ediff-quit error dired-mode yes no #[(x) "\306! \235\203\n\307\207\n>\203\207\310!\204\307\207 =\203\"\207\f\311=\203U\203C\312!\203C\306\312!!\203Crq\210 )\202N\313=\206N\314!\315=\205\317\207\203p\312!\203p\306\312!!\203prq\210 )\202{\313=\206{\314!\315=\203\214\f\204\212B\307\207\203\247\312!\203\247\306\312!!\203\247rq\210 )\202\262\313=\206\262\314!\316>\203\271\207\317\320\306!\"\203\304\307\207\306!\321\230\203\316\307\207\207" [x excl-buff-name-list selected-buffers prefered-buffer use-dired-major-mode major-mode buffer-name nil ediff-get-visible-buffer-window yes get-buffer ediff-quit error dired-mode (rmail-mode vm-mode gnus-article-mode mh-show-mode) string-match "^[ *]" "*scratch*" this-command ediff-KILLED-VITAL-BUFFER visible-dired-buffers] 4] delq 0 #[(x) "\306! \235\203\n\307\207\n\310=\203;\203+\311!\203+\306\311!!\203+rq\210 )\2024\f\312=\2064\313 !\314=\205|\207\203V\311!\203V\306\311!!\203Vrq\210 )\202_\f\312=\206_\313 !\314=\203f\307\207\315\316\306!\"\203q\307\207\306!\317\230\203{\307\207\207" [x excl-buff-name-list use-dired-major-mode major-mode this-command ediff-KILLED-VITAL-BUFFER buffer-name nil yes get-buffer ediff-quit error dired-mode string-match "^[ *]" "*scratch*"] 4] "*scratch*" major-mode this-command ediff-KILLED-VITAL-BUFFER use-dired-major-mode significant-buffers clean-significant-buffers less-significant-buffers] 5]) (defalias 'ediff-get-selected-buffers #[nil "\302=\205%\303\304\305\217\212db\210\306\307\303\310#\203#\311u\210\312\310! B\202 *\207" [major-mode lis Buffer-menu-mode nil (byte-code "\300\301!C\207" [Buffer-menu-buffer t] 2) ((error)) search-backward "\n>" t 1 Buffer-menu-buffer] 4]) (defalias 'ediff-unique-buffer-name #[(prefix suffix) "\303 P!\204\f P\207\304\303\305\306\n $!\203\nT\202\305\306\n $)\207" [prefix suffix n get-buffer 2 format "%s<%d>%s"] 6]) #@29 Submit bug report on Ediff. (defalias 'ediff-submit-report #[nil "\306\307!\204 \310\311 \"\210)\312\n \203\f\202\313\314 !\306\211\211%&'()\315&\316%\317 \210\320 \210\321*!\210\322 \210\323 \210\324c\210\325\326!\203y(\203c\327(!\203c\305\327(!!\203c(q\210\305 \330\331!\210\332\333\334 &\306\323%&\202\304\335 \210\336\337!\210\340\341!\210(\205\304\327(!\205\304\305\327(!!\205\304(\203\272\327(!\203\272\305\327(!!\203\272r(q\210\342\343!)\202\304 \344=\206\304\310+!.\207" [meta-buf-p this-command ediff-control-buffer ediff-emacs-p window-system buffer-name nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" t device-type selected-device (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 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" ediff-recenter no-rehighlight ediff-quit salutation varlist ediff-device-type ctl-buf reporter-prompt-for-summary-p ediff-msg-buffer ediff-KILLED-VITAL-BUFFER] 7 (#$ . 102190) nil]) (defalias 'ediff-choose-syntax-table #[nil "\203#\306!\203#\307\306!!\203#rq\210 \310>?\205\311 )\202,\n\312=\206,\313 !\211?\205Y \203N\306 !\203N\307\306 !!\203Nr q\210\311 )\202W\n\312=\206W\313 !\211\207" [ediff-buffer-A major-mode this-command ediff-KILLED-VITAL-BUFFER ediff-syntax-table ediff-buffer-B get-buffer buffer-name (fundamental-mode text-mode indented-text-mode) syntax-table ediff-quit error] 4]) (defalias 'ediff-deactivate-mark #[nil "\203\303 \207 \205\304\305\306!\207" [ediff-xemacs-p transient-mark-mode mark-active zmacs-deactivate-region nil run-hooks deactivate-mark-hook] 2]) (defalias 'ediff-activate-mark #[nil "\203\302\211\207\303 \207" [ediff-emacs-p mark-active t zmacs-activate-region] 2]) (byte-code "\300\301!\203 \302\301M\210\202\302\303M\210\300\207" [fboundp nuke-selective-display ediff-nuke-selective-display #[nil "\212\214~\210eb\210\304 \305\211\306 =\2036\307\310\305\306#\2036\305\210`\311 \210\307\310\306#\203\312\313!\210\314c\210\202$\315\n!\210\305\211-\207" [end buffer-read-only mod-p selective-display buffer-modified-p nil t search-forward " " beginning-of-line delete-char -1 "\n" set-buffer-modified-p] 4]] 2) (defalias 'ediff-save-variables #[(vars) "\301\302\"\207" [vars mapcar #[(v) "\211JB\207" [v] 2]] 3]) (put 'ediff-save-variables 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-restore-variables #[(vars assoc-list) "\205@\302@ \"AL\210A\211\204\303\207" [vars assoc-list assoc nil] 5]) (defalias 'ediff-change-saved-variable #[(var value buf-type) " \306\n\"A*J\306\f \"\211\205 \241*\207" [buf-type ediff-buffer-values-orig-alist alist assoc-list var assoc-elt assoc value] 4]) (defalias 'ediff-save-protected-variables #[nil "\203 \306!\203 \307\306!!\203 rq\210 \310\311\n\"*\202) \312=\206)\313\f!\f\203N\306\f!\203N\307\306\f!!\203Nr\fq\210 \310\311\n\"*\202W \312=\206W\313\f! \203\215\203\202\306!\203\202\307\306!!\203\202rq\210 \310\311\n\"*\202\213 \312=\206\213\313\f!\205\322\306!\205\322\307\306!!\205\322\203\306\306!\203\306\307\306!!\203\306rq\210 \310\311\n\"*\202\317 \312=\206\317\313\f!\211\207" [ediff-buffer-A ediff-protected-variables vars this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-values-orig-A get-buffer buffer-name mapcar #[(v) "\211JB\207" [v] 2] ediff-quit error ediff-buffer-B ediff-buffer-values-orig-B ediff-3way-comparison-job ediff-buffer-C ediff-buffer-values-orig-C ediff-ancestor-buffer ediff-buffer-values-orig-Ancestor] 3]) (defalias 'ediff-restore-protected-variables #[nil " \n  \f \203/\306 !\203/\307\306 !!\203/r q\210\310\f\"\210)\202;\311=\204;\312!\210\203`\306!\203`\307\306!!\203`rq\210\310 \"\210)\202l\311=\204l\312!\210\203\241\203\225\306!\203\225\307\306!!\203\225rq\210\310 \"\210)\202\241\311=\204\241\312!\210\205\344\306!\205\344\307\306!!\205\344\203\331\306!\203\331\307\306!!\203\331rq\210\310\f\")\202\344\311=\206\344\312!,\207" [ediff-buffer-values-orig-A ediff-buffer-values-orig-B ediff-buffer-values-orig-C ediff-buffer-values-orig-Ancestor values-Ancestor values-C get-buffer buffer-name ediff-restore-variables ediff-quit error values-B values-A ediff-buffer-A ediff-protected-variables this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-B ediff-3way-comparison-job ediff-buffer-C ediff-ancestor-buffer] 4]) (defalias 'ediff-save-buffer-in-file #[(buffer file) "\203\304!\203\305\304!!\203rq\210\306 !)\207\n\307=\206$\310 !\207" [buffer file this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name write-file ediff-quit error] 3]) #@2  (defvar ediff-command-begin-time '(0 0 0) (#$ . 109161)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-command-begin-time put permanent-local t] 4) (defalias 'ediff-calc-command-time #[nil "\304 \305\211\306\n8\306 8Y\203\306\n8\306 8Z\202$\306\n8\307\306 8Z\\\nA@ A@Z \310\232\2068\311\312 #+\207" [sec micro end ediff-command-begin-time current-time nil 2 1000000 (0 0 0) message "Elapsed time: %d second(s) + %d microsecond(s)"] 4]) (defalias 'ediff-save-time #[nil "\301 \211\207" [ediff-command-begin-time current-time] 2]) (put 'ediff-save-time 'byte-optimizer 'byte-compile-inline-expand) #@34 Toggle profiling Ediff commands. (defalias 'ediff-profile #[nil "\305\306!\204 \307\310 \"\210)\311\312!\210\313\312\f\314\232\204.\315 \316\"\210\315\n\317\"\210\320\321\322!\202?\323 \316\324\211$\210\323\n\317\305\324$\210\321\325!*\207" [meta-buf-p this-command post-hook pre-hook ediff-command-begin-time nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" make-local-hook post-command-hook pre-command-hook (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 (#$ . 109811) nil]) (defalias 'ediff-print-diff-vector #[(diff-vector-var) "\301\302\303\"!\210\304\305\306!\"\207" [diff-vector-var princ format "\n*** %S ***\n" mapcar #[(overl-vec) "\301\302\303\304\305H\306\"T\305H\307HG\305U\203\310\202!\311\312\307H\313#\314H\315H\316H&!\207" [overl-vec princ format "Diff %d: Overlay: %S\n Fine diffs: %s\n No-fine-diff-flag: %S\n State-of-diff: %S\n State-of-merge: %S\n" ediff-overlay-get 0 ediff-diff-num 1 "none\n" mapconcat prin1-to-string "\n " 2 3 4] 10] eval] 4]) (defalias 'ediff-debug-info #[nil "\306\307!\204 \310\311 \"\210)\n\220 \203-\312 !\203-\313\312 !!\203-r q\210\314 \210)\2027 \315=\2047\310\f!\210\316\317\320 \"!\210\321\322\323!!\210\321\322\324!!\210\321\322\325!!\210\321\322\326!!\221\207" [meta-buf-p this-command ediff-debug-buffer standard-output ediff-KILLED-VITAL-BUFFER ediff-control-buffer nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" get-buffer buffer-name fundamental-mode ediff-quit princ format "\nCtl buffer: %S\n" ediff-print-diff-vector intern "ediff-difference-vector-A" "ediff-difference-vector-B" "ediff-difference-vector-C" "ediff-difference-vector-Ancestor"] 5 nil nil]) (defalias 'ediff-member #[(elt lis comparison-func) "\203 @\n\"\204A\211\204\207" [lis comparison-func elt] 4]) (defalias 'ediff-intersection #[(lis1 lis2 comparison-func) "\304C \203\305 @\n #\203 @C\244\210 A\211\204A)\207" [result lis1 lis2 comparison-func a ediff-member] 5]) (defalias 'ediff-union #[(lis1 lis2 comparison-func) "\304C \203\305 @A\n#\204 @C\244\210 A\211\204 \2039\305 @A\n#\2042 @C\244\210 A\211\204\"A)\207" [result lis1 comparison-func lis2 a ediff-member] 5]) (defalias 'ediff-set-difference #[(lis1 lis2 comparison-func) "\304C \203'\305 @A\n#\204 \305 @ \n#\204  @C\244\210 A\211\204A)\207" [result lis1 comparison-func lis2 a ediff-member] 5]) (byte-code "\300\301!\203\302\303\301\"\210\202\303\304M\210\305\306!\207" [fboundp copy-sequence defalias ediff-copy-list #[(list) ":\203 \303\211:\203@\211\nBA\211\202\n\n\237*\207@\207" [list elt res nil] 3] run-hooks ediff-load-hook] 3)