;ELC ;;; Compiled by rms@psilocin.ai.mit.edu on Sat Jun 6 14:01:30 1998 ;;; from file /gd/gnu/emacs/lisp/ediff-mult.el ;;; in Emacs version 20.2.94.1 ;;; with bytecomp version 2.45 ;;; 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-mult.el' was compiled for Emacs 19.29 or later")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (byte-code "\302\303!\210\304\303\305\306\307 \310&\210\311\312!\210\311\313!\207" [:prefix :group provide ediff-mult custom-declare-group nil "Multi-file and multi-buffer processing in Ediff" "ediff-" ediff require ediff-init ediff-util] 8) #@2  (defvar ediff-meta-buffer nil (#$ . 851)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-buffer put permanent-local t] 4) #@2  (defvar ediff-parent-meta-buffer nil (#$ . 1019)) (byte-code "\303\304!\210\305\304\306\307#\210\310\300!\204\311\300 B\312\302 B\311\207" [ediff-registry-buffer current-load-list ediff-meta-buffer-message make-variable-buffer-local ediff-parent-meta-buffer put permanent-local t boundp nil "This is an Ediff Session Group Panel: %s\n\nUseful commands:\n button2, v, or RET over session record: start that Ediff session\n M: in sessions invoked from here, brings back this group panel\n R: display the registry of active Ediff sessions\n h: mark session for hiding (toggle)\n x: hide marked sessions; with prefix arg: unhide\n m: mark session for a non-hiding operation (toggle)\n uh/um: unmark all sessions marked for hiding/operation\n n,SPC: next session\n p,DEL: previous session\n E: browse Ediff on-line manual\n T: toggle truncation of long file names\n q: quit this session group\n"] 4) #@33 The keymap for the meta buffer. (defvar ediff-meta-buffer-map nil (#$ . 1965)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-buffer-map put permanent-local t] 4) #@83 The keymap to be installed in the buffer showing differences between directories. (defvar ediff-dir-diffs-buffer-map (make-sparse-keymap) (#$ . 2174)) #@2  (defvar ediff-meta-action-function nil (#$ . 2330)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-action-function put permanent-local t] 4) #@2  (defvar ediff-meta-redraw-function nil (#$ . 2517)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-redraw-function put permanent-local t] 4) #@2  (defvar ediff-session-action-function nil (#$ . 2704)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-session-action-function put permanent-local t] 4) #@2  (defvar ediff-metajob-name nil (#$ . 2897)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-metajob-name put permanent-local t] 4) #@2  (defvar ediff-meta-diff-buffer nil (#$ . 3068)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-diff-buffer put permanent-local t] 4) #@2  (defvar ediff-filtering-regexp-history nil (#$ . 3247)) #@2  (defvar ediff-meta-list nil (#$ . 3309)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-list put permanent-local t] 4) #@2  (defvar ediff-meta-session-number nil (#$ . 3474)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-session-number put permanent-local t] 4) #@2  (defvar ediff-dir-difference-list nil (#$ . 3659)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-dir-difference-list put permanent-local t] 4) #@2  (defvar ediff-dir-diffs-buffer nil (#$ . 3844)) (byte-code "\302\303!\210\304\303\305\306#\210\307\300!\204\310\300 B\310\207" [ediff-session-registry current-load-list make-variable-buffer-local ediff-dir-diffs-buffer put permanent-local t boundp nil] 4) #@130 *If non-nil, truncate long file names in the session group buffers. This can be toggled with `ediff-toggle-filename-truncation'. (custom-declare-variable 'ediff-meta-truncate-filenames 't '(#$ . -4112) :type 'hook :group 'ediff-mult) #@61 *Hooks run just after the registry control panel is set up. (custom-declare-variable 'ediff-registry-setup-hook 'nil '(#$ . -4352) :type 'hook :group 'ediff-mult) #@101 *Hooks run just after a meta-buffer controlling a session group, such as ediff-directories, is run. (custom-declare-variable 'ediff-session-group-setup-hook 'nil '(#$ . -4522) :type 'hook :group 'ediff-mult) #@49 *Hooks run just before exiting a session group. (custom-declare-variable 'ediff-quit-session-group-hook 'nil '(#$ . -4736) :type 'hook :group 'ediff-mult) #@53 *Hooks run just after the registry buffer is shown. (custom-declare-variable 'ediff-show-registry-hook 'nil '(#$ . -4897) :type 'hook :group 'ediff-mult) #@56 *Hooks run just after a session group buffer is shown. (custom-declare-variable 'ediff-show-session-group-hook 'nil '(#$ . -5057) :type 'hook :group 'ediff-mult) #@223 *Hooks run just after setting up the ediff-meta-buffer-map. This keymap controls key bindings in the meta buffer and is a local variable. This means that you can set different bindings for different kinds of meta buffers. (custom-declare-variable 'ediff-meta-buffer-keymap-setup-hook 'nil '(#$ . -5226) :type 'hook :group 'ediff-mult) #@2  (defvar ediff-meta-patchbufer nil (#$ . 5566)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-patchbufer put permanent-local t] 4) (defalias 'ediff-get-group-buffer #[(meta-list) "@@\207" [meta-list] 1]) (put 'ediff-get-group-buffer 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-group-regexp #[(meta-list) "@A@\207" [meta-list] 1]) (put 'ediff-get-group-regexp 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-group-objA #[(meta-list) "\301@8\207" [meta-list 2] 2]) (put 'ediff-get-group-objA 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-group-objB #[(meta-list) "\301@8\207" [meta-list 3] 2]) (put 'ediff-get-group-objB 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-group-objC #[(meta-list) "\301@8\207" [meta-list 4] 2]) (put 'ediff-get-group-objC 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-group-merge-autostore-dir #[(meta-list) "\301@8\207" [meta-list 5] 2]) (put 'ediff-get-group-merge-autostore-dir 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-buffer #[(elt) "@\207" [elt] 1]) (put 'ediff-get-session-buffer 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-status #[(elt) "A@\207" [elt] 1]) (put 'ediff-get-session-status 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-set-session-status #[(session-info new-status) "A \240\207" [session-info new-status] 2]) (put 'ediff-set-session-status 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-objA #[(elt) "\3018\207" [elt 2] 2]) (put 'ediff-get-session-objA 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-objB #[(elt) "\3018\207" [elt 3] 2]) (put 'ediff-get-session-objB 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-objC #[(elt) "\3018\207" [elt 4] 2]) (put 'ediff-get-session-objC 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-objA-name #[(elt) "\3018@\207" [elt 2] 2]) (put 'ediff-get-session-objA-name 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-objB-name #[(elt) "\3018@\207" [elt 3] 2]) (put 'ediff-get-session-objB-name 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-objC-name #[(elt) "\3018@\207" [elt 4] 2]) (put 'ediff-get-session-objC-name 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-file-eqstatus #[(elt) "A@\207" [elt] 1]) (put 'ediff-get-file-eqstatus 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-set-file-eqstatus #[(elt value) "A \240\207" [elt value] 2]) (put 'ediff-set-file-eqstatus 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-get-session-activity-marker #[(session) "\211@)\211\204\303\202%\n\203$\304\n!\203$\305\304\n!!\203$\306\202%\307)\207" [session elt session-buf nil get-buffer buffer-name 43 45] 4]) (defalias 'ediff-meta-session-p #[(session-info) "\302 8@);\205D\303\302 8@)!\205D\304 8@);\205D\303\304 8@)!\205D\305 8@);\203C\303\305 8@)!\207\306\207" [session-info elt 2 file-directory-p 3 4 t] 3]) (defalias 'ediff-setup-meta-map #[nil "\304 \305!\210\306\307\310#\210\306\311\312#\210\306\313\314#\210\306\315\316#\210\306\317 #\210\306\320 #\210\306\321\322#\210\306\323\322#\210\306\324\325#\210\306\326\325#\210\306\327\325#\210\306\330\325#\210\331 \204l\306\332\333#\210\306\334\335#\210\306\336\335#\210\306\337\335#\210\n\203v\306\340\325#\210 \203\203\306\341 #\210\202\211\306\342 #\210\343!\210\344\345!\207" [ediff-meta-buffer-map ediff-meta-action-function ediff-no-emacs-help-in-control-buffer ediff-emacs-p make-sparse-keymap suppress-keymap define-key "q" ediff-quit-meta-buffer "T" ediff-toggle-filename-truncation "R" ediff-show-registry "E" ediff-documentation "v" " " " " ediff-next-meta-item "n" "" ediff-previous-meta-item "p" [delete] [backspace] ediff-one-filegroup-metajob "=" nil "==" ediff-meta-mark-equal-files "=m" "=h" "" [mouse-2] [button2] use-local-map run-hooks ediff-meta-buffer-keymap-setup-hook] 4]) #@516 This mode controls all operations on Ediff session groups. It is entered through one of the following commands: `ediff-directories' `edirs' `ediff-directories3' `edirs3' `ediff-merge-directories' `edirs-merge' `ediff-merge-directories-with-ancestor' `edirs-merge-with-ancestor' `ediff-directory-revisions' `edir-revisions' `ediff-merge-directory-revisions' `edir-merge-revisions' `ediff-merge-directory-revisions-with-ancestor' `edir-merge-revisions-with-ancestor' Commands: \{ediff-meta-buffer-map} (defalias 'ediff-meta-mode #[nil "\302 \210\303\304\211\207" [major-mode mode-name kill-all-local-variables ediff-meta-mode "MetaEdiff"] 2 (#$ . 9703)]) (byte-code "\301!\210\302\303\304#\210\302\305\306#\210\302\307\306#\210\302\310\311#\210\302\312\311#\210\302\313\311#\210\302\314\311#\207" [ediff-dir-diffs-buffer-map suppress-keymap define-key "q" ediff-bury-dir-diffs-buffer " " next-line "n" "" previous-line "p" [delete] [backspace]] 4) #@140 Move to the next item in Ediff registry or session group buffer. Moves in circular fashion. With numeric prefix arg, skip this many items. (defalias 'ediff-next-meta-item #[(count) "\204\302\303\304W\2051S\305 \210\306`!\211\203\307 \310\"\203\305 \210\306`!\211\204\202)\207" [count overl 1 nil 0 ediff-next-meta-item1 ediff-get-meta-overlay-at-pos ediff-overlay-get invisible] 4 (#$ . 10682) "p"]) (defalias 'ediff-next-meta-item1 #[nil "\302\303`!\211\203 b\210 \304=\203)\305p\306#\2054\307\310\302\311#\2054\312\302x\2024\313\302w\314V\2054\315\316!)\207" [pos ediff-metajob-name nil ediff-next-meta-overlay-start ediff-registry ediff-get-meta-info noerror search-forward "*Ediff" t "a-zA-Z*" "-+?H* 0-9" 0 backward-char 1] 5]) #@144 Move to the previous item in Ediff registry or session group buffer. Moves in circular fashion. With numeric prefix arg, skip this many items. (defalias 'ediff-previous-meta-item #[(count) "\204\302\303\304W\2051S\305 \210\306`!\211\203\307 \310\"\203\305 \210\306`!\211\204\202)\207" [count overl 1 nil 0 ediff-previous-meta-item1 ediff-get-meta-overlay-at-pos ediff-overlay-get invisible] 4 (#$ . 11452) "p"]) (defalias 'ediff-previous-meta-item1 #[nil "\302\303`!\211\203 b\210 \304=\203)\305p\306#\2054\307\310\302\311#\2054\312\302x\2024\313\302w\314V\2054\315\316!)\207" [pos ediff-metajob-name nil ediff-previous-meta-overlay-start ediff-registry ediff-get-meta-info noerror search-forward "*Ediff" t "a-zA-Z*" "-+?H* 0-9" 0 backward-char 1] 5]) (defalias 'ediff-add-slash-if-directory #[(dir file) "\302 P!\203\f\303 !\207 \207" [dir file file-directory-p file-name-as-directory] 3]) (put 'ediff-add-slash-if-directory 'byte-optimizer 'byte-compile-inline-expand) #@153 Toggle truncation of long file names in session group buffers. Set `ediff-meta-truncate-filenames' variable if you want to change the default behavior. (defalias 'ediff-toggle-filename-truncation #[nil "?\301p\302\"\207" [ediff-meta-truncate-filenames ediff-update-meta-buffer must-redraw] 3 (#$ . 12463) nil]) (defalias 'ediff-intersect-directories #[(jobname diff-var regexp dir1 dir2 &optional dir3 merge-autostore-dir comparison-func) "\206\306\307\211\211\211\211\211\211\211\310!\311\f\307#\312\313\"\312\314\"\315\316\"\310 !\315\317\311 \307#\"!;\203a\310!!\315\320\311\n\307#\"\";\203m\310\"!\"\321#\203\221#\211$\206\204%\322>)\203\221\321 #\323\324 !\325\"\326\327\211## #\312\313 \"\323\324\312\314 \"!\325\"\315\330 \"\315\331 \"\210\f \nF B& L\210\f \n\"\257\315\332 \".B\207" [comparison-func difflist auxdir3 auxdir2 auxdir1 common string= nil file-name-as-directory directory-files delete "." ".." mapcar #[(elt) " \304 \nP!\203\305\n!\202\n*\207" [auxdir1 elt file dir file-directory-p file-name-as-directory] 3] #[(elt) " \304 \nP!\203\305\n!\202\n*\207" [auxdir2 elt file dir file-directory-p file-name-as-directory] 3] #[(elt) " \304 \nP!\203\305\n!\202\n*\207" [auxdir3 elt file dir file-directory-p file-name-as-directory] 3] ediff-intersection (ediff-directories3 ediff-filegroups3) sort ediff-copy-list string-lessp ediff-set-difference ediff-union #[(elt) "\301B\207" [elt 1] 2] #[(elt) "@ \235\203\211A\304_\241\210@\n\235\203\211A\305_\241\210@ \235\205)\211A\306_\241\207" [elt lis1 lis2 lis3 2 3 5] 3] #[(elt) " P\n P \205,\f  \306 P!\203\307 !\202 *\310\f P!\205,\f PE\207" [auxdir1 elt auxdir2 lis3 auxdir3 file file-directory-p file-name-as-directory file-exists-p dir] 5] lis3 lis2 lis1 dir1 regexp dir2 dir3 merge-autostore-dir jobname metajob ediff-metajob-name diff-var] 9]) (defalias 'ediff-get-directory-files-under-revision #[(jobname regexp dir1 &optional merge-autostore-dir) "\306\211\211\211\307\f!\310\306 #;\203\307! \203q @ A\311\nP!\203P\n\311P!\203G\307!\202I* B\202\312\n\313Q!\203`\n B\202\312\314\n\313R!\203\n B\202\315\316 \"\315\317 \"\315\320 \"\321\322 !\323\" \306\211\257\324\325 \",B\207" [auxdir1 common elt lis1 dir1 regexp nil file-name-as-directory directory-files file-directory-p file-exists-p ",v" "RCS/" delete "./" "../" "RCS" sort ediff-copy-list string-lessp mapcar #[(elt) " P\302\211E\207" [auxdir1 elt nil] 3] merge-autostore-dir file dir] 5]) (defalias 'ediff-prepare-meta-buffer #[(action-func meta-list meta-buffer-name redraw-function jobname &optional startup-hooks) "\306\307\"\310!\211\203\311 !\203\312\311 !!\203r q\210\313 \210\n\f34 5\314 \2104\315=\203H 678\3169\317\320#\210\202V 7@B\321\3227A\"B8 6=\204c :B:\f8!\210\323;\324\325!\210\326\327!\210\n\330=\203\371 <@B)\203\324\3169\347\350#\210\202\3533\211=\206\3364\351>)\203\353\3169\347\352#\210\3169\353\354#\210\3169\355\356#\2104\315=\203\326\357!\210\202 \326\360!\210)\202>\361=\204\362?!\210 *\207" [meta-buffer-name meta-buffer action-func ediff-meta-action-function redraw-function ediff-meta-redraw-function ediff-unique-buffer-name "*" get-buffer-create get-buffer buffer-name ediff-meta-mode ediff-setup-meta-map ediff-registry define-key "M" ediff-show-meta-buff-from-registry mapcar #[(elt) "\301\211\302\303\"BB\207" [elt nil mapcar #[(obj) "\301D\207" [obj nil] 2]] 5] t set-buffer-modified-p nil run-hooks startup-hooks ediff-filegroup-action ediff-one-filegroup-metajob ediff-draw-dir-diffs "h" ediff-mark-for-hiding-at-pos "x" ediff-hide-marked-sessions "m" ediff-mark-for-operation-at-pos "u" "um" ediff-unmark-all-for-operation "uh" ediff-unmark-all-for-hiding (ediff-directories ediff-directory-revisions ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) "P" ediff-collect-custom-diffs (ediff-multifile-patch) ediff-meta-show-patch "^" ediff-up-meta-hierarchy "D" ediff-show-dir-diffs ediff-registry-setup-hook ediff-session-group-setup-hook ediff-quit error jobname ediff-metajob-name ediff-meta-buffer ediff-registry-buffer meta-list ediff-meta-list ediff-meta-buffer-map ediff-session-registry buffer-read-only ediff-dir-difference-list metajob this-command ediff-KILLED-VITAL-BUFFER] 5]) (defalias 'ediff-insert-session-activity-marker-in-meta-buffer #[(session) "\301!\206\302c\207" [session ediff-get-session-activity-marker " "] 2]) (defalias 'ediff-insert-session-status-in-meta-buffer #[(session) "\211A@)\206\n\302c\207" [session elt " "] 2]) (defalias 'ediff-replace-session-activity-marker-in-meta-buffer #[(point new-marker) "\306!\307 \310\"\311\n!\312 \204 \204\313 \314 !\205/\203,\315 !\202/\316 !)b\210`f =?\205D c\210\317\320!\210\321\312!,\207" [point overl session-info activity-marker buffer-read-only new-marker ediff-get-meta-overlay-at-pos ediff-overlay-get ediff-meta-info ediff-get-session-activity-marker nil 32 ediff-overlayp overlay-start extent-start-position delete-char 1 set-buffer-modified-p ediff-emacs-p] 3]) (defalias 'ediff-replace-session-status-in-meta-buffer #[(point new-status) "\306!\307 \310\"\211\211A@)\311\206\f\206\312 \313 !\2054\2031\314 !\2024\315 !)b\210\316u\210`f=?\205Nc\210\317\316!\210\320\311!,\207" [point overl session-info elt status buffer-read-only ediff-get-meta-overlay-at-pos ediff-overlay-get ediff-meta-info nil 32 ediff-overlayp overlay-start extent-start-position 1 delete-char set-buffer-modified-p new-status ediff-emacs-p] 4]) (defalias 'ediff-insert-session-info-in-meta-buffer #[(session-info sessionNum) "\306 8)\307 8)\310 8)`\211A@)\311=\312!\210\313!\210\314\315!\316\261\210\317!\210\317 !\210\317\f!\210\320 `\n%-\207" [session-info elt hidden pt f3 f2 2 3 4 73 ediff-insert-session-activity-marker-in-meta-buffer ediff-insert-session-status-in-meta-buffer " Session " int-to-string ":\n" ediff-meta-insert-file-info1 ediff-set-meta-overlay f1 sessionNum] 7]) (defalias 'ediff-redraw-directory-group-buffer #[(meta-list) "\211@@)\306\307\310\211\211\211\211\211+,-\211.\2031\311.!\2031\312\311.!!\2031r.q\210`\313 \210/\203I\314\315\316\317\211\"\"\210\202M\320\321!\210\3220\3231!\"c\210\211@A@)+\324@8)\31021\325>)\203y\326c\210\202\207\31021\327>)\203\207\330c\210\331c\210\332 \204\226\333\334\335\336\261\210\337c\210+;\203\256+G\307V\203\256\322\340+\"c\210\341!\2103\203\315\31021\342>)\203\315\f;\203\315\322\343\f\"c\210\344c\210A\211\211\203\371-\203\371\n@\203\362\n@\211A@)\345=\204\362\310-\nA\211\204\331-\203\346c\210\203$@A,T, \211A@)\345=\204\347 ,\"\210\202\350\310!\210 b\210.)\202<4\351=\206<\3525!. \207" [meta-list buffer-read-only tmp-list point merge-autostore-dir elt t 0 nil get-buffer buffer-name erase-buffer mapcar delete-overlay overlays-in 1 map-extents delete-extent format ediff-abbrev-jobname 5 (ediff-directories ediff-directory-revisions ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) " P: collect custom diffs of all marked sessions\n" (ediff-multifile-patch) " P: show patch appropriately for the context (session or group)\n" " ^: show parent session group\n" ediff-one-filegroup-metajob " D: show differences among directories\n" " ==: for each session, show which files are identical\n" " =h: like ==, but also marks those sessions for hiding\n" " =m: like ==, but also marks those sessions for operation\n\n" "\n" "*** Filter-through regular expression: %s\n" ediff-insert-dirs-in-meta-buffer (ediff-merge-directories ediff-merge-directories-with-ancestor ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ediff-merge-filegroups-with-ancestor) "\nMerge results are automatically stored in:\n %s\n" "\n\n Size Last modified Name\n ----------------------------------------------\n\n" 73 " ****** ****** This session group has no members\n" ediff-insert-session-info-in-meta-buffer set-buffer-modified-p ediff-quit error regexp sessionNum empty meta-buf ediff-emacs-p ediff-meta-buffer-message ediff-metajob-name metajob ediff-autostore-merges this-command ediff-KILLED-VITAL-BUFFER] 10]) (defalias 'ediff-update-markers-in-dir-meta-buffer #[(meta-list) "\211@@)\306\211\211\211\211\203\233\307 !\203\233\310\307 !!\203\233r q\210`eb\210\311 \210o\204\220\312 `\313#\314`!\f\203\212\f\211A@)\315=\203X\n\203\212\316\n\317\320#\210\202\212\f\211A@)\321=\203x\n\203x\322\n\317\"\203x\316\n\317\306#\210\202\212\323`\324\f!\"\210\325`\f\211A@)\"\210\311 \210\202-\326\306!\210 b\210)\202\247\327=\204\247\330!\210 -\207" [meta-list buffer-read-only overl point session-info meta-buf nil get-buffer buffer-name ediff-next-meta-item1 ediff-get-meta-info no-error ediff-get-meta-overlay-at-pos 73 ediff-overlay-put invisible t 72 ediff-overlay-get ediff-replace-session-activity-marker-in-meta-buffer ediff-get-session-activity-marker ediff-replace-session-status-in-meta-buffer set-buffer-modified-p ediff-quit error elt this-command ediff-KILLED-VITAL-BUFFER] 6]) (defalias 'ediff-update-session-marker-in-dir-meta-buffer #[(session-num) "\306\211\211\211\f\203\307\310!\202$\311 \312 @ A\"\313\306\314\315 \"\"@\211\204.\316\317 \"\210\320 \321\" \322 !\205I\203F\323 !\202I\324 !)b\210\325`\326\n!\"\210\327`\n\211A@)\"\210,\330 \207" [buffer-read-only overl session-info buffer-meta-overlays ediff-xemacs-p session-num nil map-extents #[(ext maparg) "\302\303\"\205\302\304\" =\205\207" [ext session-num ediff-overlay-get ediff-meta-info ediff-meta-session-number] 3] overlay-lists append delq mapcar #[(overl) "\302\303\"\205\302\304\" =\205\207" [overl session-num ediff-overlay-get ediff-meta-info ediff-meta-session-number] 3] error "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S" ediff-overlay-get ediff-meta-info ediff-overlayp overlay-start extent-start-position ediff-replace-session-activity-marker-in-meta-buffer ediff-get-session-activity-marker ediff-replace-session-status-in-meta-buffer ediff-next-meta-item1 ediff-emacs-p elt] 6]) (defalias 'ediff-problematic-session-p #[(session) "\306 8@)\307 8@)\310 8@)\211;\203G\311\f!\204G ;\203G\311 !\204G\n;\2039\311\n!\203G\312 \313>)\203G\314\202H\312+\207" [session elt f3 f2 f1 metajob 2 3 4 file-directory-p nil (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor) ancestor-is-dir ediff-metajob-name] 5]) (defalias 'ediff-meta-insert-file-info1 #[(fileinfo) "@\211A@)\n\203\306 \307Z\202\310\311\211\211;\204'\312\202U\313!\204S\314!\203N \315 \316\") \315 \317\")\202U\312\202U\320;\205\261\321\322\203f\323\202g\324\321\325 \320U\203s\326\202~ \320W\203}\326\202~ \" \320U\203\211\327\202\230 \320W\203\223\330\202\230\331\332\f!!;\204\250 \320W\203\250\333\202\257\334\335! \"%c-\207" [fileinfo elt ediff-meta-truncate-filenames file-size file-modtime max-filename-width window-width 41 500 nil -2 ediff-file-remote-p file-exists-p ediff-file-attributes 7 5 -1 format "%s %s %-20s %s\n" "=" " " "%10s" "--" "*remote file*" "*file doesn't exist*" ediff-format-date decode-time "-------" ediff-truncate-string-left ediff-abbreviate-file-name feq fname filename] 9]) #@28 Months' associative array. (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr") (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug") (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec")) (#$ . 24350)) (defalias 'ediff-fill-leading-zero #[(num) "\301W\203 \302\303\"\207\304!\207" [num 10 format "0%d" number-to-string] 3]) (put 'ediff-fill-leading-zero 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-format-date #[(time) "\303\304\305\3068 \"A\3078\3108\3118\211\312W\203 \303\313\n\"\202#\314\n!)A@\211\312W\2035\303\313\n\"\2028\314\n!)@\211\312W\203I\303\313\n\"\202L\314\n!)&\207" [time ediff-months num format "%s %2d %4d %s:%s:%s" assoc 4 3 5 2 10 "0%d" number-to-string] 11]) (defalias 'ediff-insert-dirs-in-meta-buffer #[(meta-list) "\304\305@8)!\306@8)\211;\205\304\n!\307@8)\211;\205+\304 !\310 \311\261\210\n\203<\312\n\311\261\210 \203F\313 \311\261\210\311c-\207" [meta-list dir1 dir2 dir3 ediff-abbreviate-file-name 2 3 4 "*** Directory A: " "\n" "*** Directory B: " "*** Directory C: "] 4]) (defalias 'ediff-draw-dir-diffs #[(diff-list) "\204\306\307!\210\310\311\312\"\211@A@)\313\314\n@8)!\313\315\n@8)!\316\n@8)\2112;\205;\3132!2\211@@)3\317\320\321\"4\3225\3226\3227A\323 !\2118\203\241\3248!\203\241\325\3248!!\203\241r8q\210\3269!\210\327 \2103:\330c\210\331c\210 ;\203\231 G\332V\203\231\333\334 \"c\210\335c\210\333\336\337\313\340\f!!\341\"\337\313\340 !!\341\"#c\2102\203\307\333\342\337\313\3402!!\341\"\"c\210\202\312\335c\210\333\3434\211#c\2102;\203\342\333\3444\"c\210\202\345\345c\210\204\354\346c\210\203\227@@5@A6A\3476\314\"\332U\203&\333\350\337\313\351\f5P!\203\3405!\2025!\352\"\"c\210\202,\333\350\353\"c\210\3476\315\"\332U\203U\333\354\337\313\351 5P!\203J\3405!\202L5!\352\"\"c\210\202[\333\354\353\"c\2102;\203\221\3476\355\"\332U\203\213\333\356\337\313\35125P!\203\200\3405!\202\2025!\352\"\"c\210\202\221\333\356\353\"c\210\335c\210\202\354\3577\360\322!)\202\254;\361=\206\254\306)\206\211\206 \307>))\203\310\311!\210\n\203/\312\n!\203/\313\312\n!!\2043\314 !\210\n\315\316!\210\317\320 \f\"\210eb)\207" [metajob ediff-metajob-name ediff-dir-diffs-buffer ediff-dir-difference-list buf nil (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) (ediff-multifile-patch) error "This command is inapplicable in the present context" get-buffer buffer-name ediff-draw-dir-diffs other-window 1 set-window-buffer selected-window] 4 (#$ . 27658) nil]) #@40 Go to the parent session group buffer. (defalias 'ediff-up-meta-hierarchy #[nil "\203\302!\203\303\302!!\203\304 \"\207\305\306!\207" [ediff-parent-meta-buffer ediff-meta-session-number get-buffer buffer-name ediff-show-meta-buffer error "This session group has no parent"] 3 (#$ . 28315) nil]) (defalias 'ediff-redraw-registry-buffer #[(&optional ignore) "\203\306!\203\307\306!!\203rq\210`\310\211\211\211\211\211\211\211\211\211\211-./0123\311 \2104\203H\312\313\314\315\211\"\"\210\202L\316\317!\210\320c\210\312\3215\"\2105\204]\322c\2105\n\203\374\n@2\nA2\203`\3062!\203`\307\3062!!\203`2\203\256\3062!\203\256\307\3062!!\203\256r2q\210676\205\2526\323=?)\202\2718\324=\204\274\3259!\203`\326\327\3072!\330\f!#c\210\326\331\332 \333 @8)!\332 \334 @8);\203\353 \334 @8)\202\354\335!\332 \336 @8);\203 \336 @8)\202\335!$c\210\337 `2#\210\202`2\203\304\3062!\203\304\307\3062!!\203\304r2q\210:\203H\306:!\203H\307\306:!!\203H\307:!\202I\3401;\203g\306;!\203g\307\306;!!\203g\307;!\202h\3400<\204x=\204x\335\202\225>\203\224\306>!\203\224\307\306>!!\203\224\307>!\202\225\340/\326\341?\"-@\342U\203\251\343\202\273@?U\203\265\344\202\273\326\345@T\".A)\202\3208\324=\204\320\3259!\210`.\346-\347\3072!\326\350\330\f!\"\261\210\3511\3520\352/\353\261\210\337 `2#\210\202`\354\310!\2103b. \2078\324=\206\3259!\207" [ediff-registry-buffer buffer-read-only registry-list meta-list job-name pt get-buffer buffer-name nil erase-buffer mapcar delete-overlay overlays-in 1 map-extents delete-extent "This is a registry of all active Ediff sessions.\n\nUseful commands:\n button2, `v', RET over a session record: switch to that session\n M over a session record: display the associated session group\n R in any Ediff session: display session registry\n n,SPC: next session\n p,DEL: previous session\n E: browse Ediff on-line manual\n q: bury registry\n\n\n Active Ediff Sessions:\n ----------------------\n\n" #[(elt) "\205\302!\205\303\302!!?\205\304 \"\211\207" [elt ediff-session-registry get-buffer buffer-name delq] 3] " ******* No active Ediff sessions *******\n" ediff-registry ediff-quit error format " *group* %s: %s\n" ediff-abbrev-jobname " %s %s %s\n" ediff-abbreviate-file-name 2 3 "" 4 ediff-set-meta-overlay "!!!killed buffer!!!" "%-4d" -1 " _" " $" "%4d" "/" " " ": %s" "\n " " " "\n" set-buffer-modified-p total-diffs cur-diff bufCname bufBname bufAname elt point ediff-emacs-p ediff-session-registry ediff-metajob-name ediff-meta-list this-command ediff-KILLED-VITAL-BUFFER ediff-buffer-A ediff-buffer-B ediff-3way-comparison-job ediff-merge-job ediff-buffer-C ediff-number-of-differences ediff-current-difference ediff-job-name] 12]) (defalias 'ediff-set-meta-overlay #[(b e prop &optional session-number hidden) "\306\307 \n\" \203\310\311\312#\210\202\310\312\313#\210\310\314\f#\210\310\315 #\210\247\2052\310\316#)\207" [overl b e ediff-emacs-p prop hidden nil ediff-make-overlay ediff-overlay-put mouse-face highlight t ediff-meta-info invisible ediff-meta-session-number session-number] 4]) #@51 Mark session for hiding. With prefix arg, unmark. (defalias 'ediff-mark-for-hiding-at-pos #[(unmark) "\306!\307!\310\n \" \311\f\203'\312\f!\203'\313\312\f!!\203'\f\202(p\211\203I\312\f!\203I\313\312\f!!\203Ir\fq\210\314\315 !\316\")\202T\317=\206T\320!*\321 \"\210\322\323!\210\212\324\n\311#-\207" [last-command-event pos meta-buf info meta-buffer point ediff-event-point ediff-event-buffer ediff-get-meta-info nil get-buffer buffer-name ediff-overlay-get ediff-get-meta-overlay-at-pos ediff-meta-session-number ediff-quit error ediff-mark-session-for-hiding ediff-next-meta-item 1 ediff-update-meta-buffer this-command ediff-KILLED-VITAL-BUFFER session-number unmark] 5 (#$ . 31580) "P"]) (defalias 'ediff-mark-session-for-hiding #[(info unmark) "\211@)\306\f\307=\203\306\202)\211A@)\310=\203#\311\202)\f\203)\311\n\204J\f\203?\306\211\nA \240\210*\202J\310\211\nA \240\210**\f\207" [info elt ignore session-buf unmark new-status nil mark 72 t session-info] 3]) #@62 Mark session for a group operation. With prefix arg, unmark. (defalias 'ediff-mark-for-operation-at-pos #[(unmark) "\306!\307!\310\n \" \311\f\203'\312\f!\203'\313\312\f!!\203'\f\202(p\211\203I\312\f!\203I\313\312\f!!\203Ir\fq\210\314\315 !\316\")\202T\317=\206T\320!*\321 \"\210\322\323!\210\212\324\n\311#-\207" [last-command-event pos meta-buf info meta-buffer point ediff-event-point ediff-event-buffer ediff-get-meta-info nil get-buffer buffer-name ediff-overlay-get ediff-get-meta-overlay-at-pos ediff-meta-session-number ediff-quit error ediff-mark-session-for-operation ediff-next-meta-item 1 ediff-update-meta-buffer this-command ediff-KILLED-VITAL-BUFFER session-number unmark] 5 (#$ . 32603) "P"]) (defalias 'ediff-mark-session-for-operation #[(info unmark) "\306 \307=\203 \306\202#\n\211A@)\310=\203\311\202# \203#\311\204B \2038\n\306\211A\f\240\210*\202B\n\310\211A\f\240\210*) \207" [ignore unmark info elt new-status session-info nil mark 42 t] 3]) #@48 Hide marked sessions. With prefix arg, unhide. (defalias 'ediff-hide-marked-sessions #[(unhide) "\211@@)A\n\203\306\202\307\n\203\307\202\306\310\311\211\211 \203n @ A \211@) \211A@)=\203*T\306=\203]\312\f!\203]\313\202* \211A\240\210*\202*\310V\203}\314!\210\202\217\315 \210\n\203\213\316\317!\210\202\217\316\320!\210 \205\226\316\321!.\207" [ediff-meta-list meta-list unhide elt session-buf active-sessions-exist 73 72 0 nil buffer-live-p t ediff-update-meta-buffer beep message "Nothing to reveal..." "Nothing to hide..." "Note: Ediff didn't hide active sessions!" numMarked to from grp-buf new-status session-info] 9 (#$ . 33621) "P"]) (defalias 'ediff-operate-on-marked-sessions #[(operation) "\211@@)A\306\307\211\n\310\211 \203\243 @ AT \211A@)=\203F\212T \"\210)\202\311 !\203 \211@)\211\203\312 \211@)\211!\203\313\312 \211@)\211!!\203\f\203\222\312\f!\203\222\313\312\f!!\203\222r\fq\210 \314!)\202\235\315=\206\235\316!\\\202\317\320\"\210.\207" [ediff-meta-list meta-list ediff-meta-diff-buffer elt session-buf diff-buffer 42 0 nil ediff-meta-session-p get-buffer buffer-name ediff-operate-on-marked-sessions ediff-quit error ediff-update-meta-buffer must-redraw sessionNum numMarked marksym grp-buf operation this-command ediff-KILLED-VITAL-BUFFER] 9]) (defalias 'ediff-append-custom-diff #[(session sessionNum) "\306 \204 \307\310!\210\211@)\n \311\211\211\203f\312!\203f\313\312!!\203f\203Z\312!\203Z\313\312!!\203Zrq\210=\203V\314 \210)\202f \315=\204f\307!!\210\203{\312!\203{\313\312!!\204\307\316!\210\f\203\243\312\f!\203\243\313\312\f!!\203\243\212q\210db\210\317\f!\210\320c)\202\347\321>\203\342\212\322\"!\211q\210\323 \210\324\325\326#$\327 8@)\330 8@)%\331\"\210)\212q\210db\210\317 !\210\320c)\202\347\307\332%\"-\207" [session elt ediff-meta-diff-buffer ediff-metajob-name custom-diff-buf tmp-buf ediff-collect-diffs-metajob error "Hmm, I'd hate to do it to you ..." nil get-buffer buffer-name ediff-compute-custom-diffs-maybe ediff-quit "Ediff: something wrong--no multiple diffs buffer" insert-buffer "\n" (ediff-directories ediff-merge-directories ediff-merge-directories-with-ancestor) get-buffer-create erase-buffer shell-command format "%s %s %s %s" 2 3 t "Can't make context diff for Session %d" metajob meta-diff-buff session-buf ediff-control-buffer ediff-custom-diff-buffer this-command ediff-KILLED-VITAL-BUFFER ediff-tmp-buffer ediff-custom-diff-program ediff-custom-diff-options sessionNum] 9]) #@300 Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'. This operation is defined only for `ediff-directories' and `ediff-directory-revisions', since its intent is to produce multifile patches. For `ediff-directory-revisions', we insist that all marked sessions must be active. (defalias 'ediff-collect-custom-diffs #[nil "\203\303!\203\304\303!!\204\305\306\307\310\"!\2036\303!\2036\304\303!!\2036rq\210\311 \210)\202@ \312=\204@\313\n!\210\314\315!\316V\203M\317\320\"\207\321 \210\322\323!\207" [ediff-meta-diff-buffer this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*Ediff Multifile Diffs" "*" erase-buffer ediff-quit error ediff-operate-on-marked-sessions ediff-append-custom-diff 0 display-buffer not-this-window beep message "No marked sessions found"] 4 (#$ . 36272) nil]) #@63 Show the multi-file patch associated with this group session. (defalias 'ediff-meta-show-patch #[nil "\306!\307!\310\n \311#\f\211\203z\312 !\203z\313\312 !!\203z \203l\312 !\203l\313\312 !!\203lr q\210\214 \204B~\210\202V \3148@) \3158@)}\210\316!q\210\317 \210\320 !\210\321\322\"*\202}\323=\206}\324!\202}\324\325!,\207" [last-command-event pos meta-buf info ediff-meta-patchbufer patchbuffer ediff-event-point ediff-event-buffer ediff-get-meta-info noerror get-buffer buffer-name 3 4 get-buffer-create erase-buffer insert-buffer display-buffer not-this-window ediff-quit error "The patch buffer wasn't found" elt ediff-tmp-buffer this-command ediff-KILLED-VITAL-BUFFER] 5 (#$ . 37160) nil]) #@54 Execute appropriate action for the selected session. (defalias 'ediff-filegroup-action #[nil "\306!\307!\310\n \"\211\211@) \n<=<\2033\311\316=\206e\317?!*@\320A\320B\320C\320D\320E \321\f8@)B \322\f8@)C \323\f8@)D \211A@)\324>\203\301\325 \210\326\327!\203\275 \320F\211GAF\240\210*\330\n\320@#\210\202\301\317\331!\210\n\203\333\311\n!\203\333\312\311\n!!\203\333r\nq\210HI\332I@8)A b\210\333 !\2034 \203\311 !\203\312\311 !!\203\334 !\202\327\335\336\320\337#E\340BCDEJK\341\342\320\343\344\3453D\315@\257\346\345 D\347BBFD&\202\327\320L\320LK\350>)\206OL\211L\206LK\351>))\203\250\320LK\350>)\203\250\352B!\203\250 \203}\311 !\203}\312\311 !!\203}\334 !\202\327\335\336\320\337#E\353BEJK\341\342\320\343\344\3453D\315@\257\346\345 D\354BBFD%\202\327 \203\351\311 !\203\351\312\311 !!\203\351 \203\333\311 !\203\333\312\311 !!\203\333r q\210\355 M\356\357!)\202\327>\316=\206\327\317?!\202\327\360 !\203'\325 \210\326\361!\203!\362BC\341\342\320\343\363p\315@\257\343\364A\365\366B!QE\346\345 D\367BB\257D#\202\327\317\331!\202\327\320L\320LK\350>)\206BL\211L\206?K\351>))\203nJB\341\342\320\343\363p\315@\257\343\364A\365\366B!QE\346\345 D\370BB\257D\"\202\327\320LK\371>)\204\243JBC\341\342\320\343\363p\315@\257\343\364A\365\366B!QE\346\345 D\372BB\257D#\202\327\320LK\371>)\205\327JBCD\341\342\320\343\364A\365\366B!QE\343\363p\315@\257\346\345 D\373BB\257D$)\202\346>\316=\206\346\317?!.\n\207" [last-command-event pos meta-buf info elt session-buf ediff-event-point ediff-event-buffer ediff-get-meta-info get-buffer buffer-name ediff-overlay-get ediff-get-meta-overlay-at-pos ediff-meta-session-number ediff-quit error nil 2 3 4 (73) beep y-or-n-p "This session is marked as hidden, unmark? " ediff-update-meta-buffer "Aborted" 5 ediff-meta-session-p ediff-show-meta-buffer read-string "Filter through regular expression: " ediff-filtering-regexp-history ediff-directories-internal list lambda setq ediff-parent-meta-buffer quote setcar (ediff-meta-buffer) (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) (ediff-multifile-patch) file-directory-p ediff-directory-revisions-internal (ediff-meta-buffer) mouse-pixel-position ediff-recenter no-rehighlight ediff-problematic-session-p "This session has no ancestor. Merge without the ancestor? " ediff-merge-files ediff-meta-buffer ediff-merge-store-file "merge_" file-name-nondirectory (ediff-control-buffer) (ediff-control-buffer) (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor ediff-directories3 ediff-filegroups3) (ediff-control-buffer) (ediff-control-buffer) meta-buffer point this-command ediff-KILLED-VITAL-BUFFER session-number merge-autostore-dir file1 file2 file3 regexp new-status session-info ediff-meta-list meta-list ediff-session-action-function ediff-metajob-name metajob ediff-mouse-pixel-position] 16 (#$ . 37894) nil]) #@31 Switch to a selected session. (defalias 'ediff-registry-action #[nil "\306!\307!\310\n \"\211\203\201\311 !\203\201\312\311 !!\203\201 \203>\311 !\203>\312\311 !!\203>r q\210\313\314!)\315=\202G\f\316=\204J\317 !\203R\320 \321\"\210\202\213 \203t\311 !\203t\312\311 !!\203tr q\210\322 \323\324!\210)\202\213\f\316=\204\213\317 !\210\202\213\325 \210\326\327!\210\330 \210\n\203\247\311\n!\203\247\312\311\n!!\203\247r\nq\210 b)\202\260\f\316=\206\260\317 !+\207" [last-command-event pos buf ctl-buf this-command ediff-KILLED-VITAL-BUFFER ediff-event-point ediff-event-buffer ediff-get-meta-info get-buffer buffer-name key-binding "q" ediff-quit-meta-buffer ediff-quit error ediff-show-meta-buffer t mouse-pixel-position ediff-recenter no-rehighlight beep message "You've selected a stale session --- try again" ediff-update-registry ediff-mouse-pixel-position] 4 (#$ . 41047) nil]) #@32 Show the session group buffer. (defalias 'ediff-show-meta-buffer #[(&optional meta-buf session-number) "\306\211\211 \203\f\307 \206\f\310 !\204\311\312!\210\2025 \2031\313 !\2031\314\313 !!\2045\311\315!\210 \247\203C\316 \306 #\210\202K \204K\317 !\210 \203\355\313 !\203\355\314\313 !!\203\355r q\210\212\320 !\211\203~\204r\321\322!\210\323\n \"\210\324\n!\210\202\351\325\"\211!\203\224\323\" \"\210\324\n!\210\202\351\325#\211!\203\252\323# \"\210\324\n!\210\202\351\325$\211!\203\300\323$ \"\210\324\n!\210\202\351\320%!\211\203\337\326 \203\337\324\n!\210\327\330!\210\323\331 \"\210\202\351\332\333!\210\323\331 \"\210*\202\371&\334=\204\371\311'!\210\326 \203\325\320 !\211!\203\335\n!\336 !\210\337 !\210\340\341!+\207" [silent frame wind meta-buf ediff-meta-buffer session-number nil t bufferp error "This Ediff session is not part of a session group" get-buffer buffer-name "Can't find this session's group panel -- session itself is ok" ediff-update-meta-buffer ediff-cleanup-meta-buffer ediff-get-visible-buffer-window message "Already showing the group panel for this session" set-window-buffer select-window window-live-p ediff-window-display-p other-window 1 selected-window ediff-skip-unsuitable-frames ok-unsplittable ediff-quit window-frame raise-frame ediff-reset-mouse run-hooks ediff-show-session-group-hook ediff-window-C ediff-window-A ediff-window-B ediff-registry-buffer this-command ediff-KILLED-VITAL-BUFFER] 4 (#$ . 41963) nil]) (defalias 'ediff-show-current-session-meta-buffer #[nil "\301\302\"\207" [ediff-meta-session-number ediff-show-meta-buffer nil] 3 nil nil]) #@64 Display the session group buffer for a selected session group. (defalias 'ediff-show-meta-buff-from-registry #[nil "\306!\307!\310\n \"\211\211\203-\311\f!\203-\312\311\f!!\203-r\fq\210\313\314\315\")\2027 \316=\2067\317!,\207" [last-command-event pos meta-buf info meta-or-session-buf this-command ediff-event-point ediff-event-buffer ediff-get-meta-info get-buffer buffer-name ediff-show-meta-buffer nil t ediff-quit error ediff-KILLED-VITAL-BUFFER] 4 (#$ . 43627) nil]) #@27 Display Ediff's registry. (defalias 'ediff-show-registry #[nil "\306 \210\203\307!\203\310\307!!\204\311\312!\210\313\211\203\257\307!\203\257\310\307!!\203\257rq\210\212\314!\211\203L\315\316!\210\317\n\"\210\320\n!\210\202\253\321 !\203^\317 \"\210\320 !\210\202\253\321\f!\203p\317\f\"\210\320\f!\210\202\253\321 !\203\202\317 \"\210\320 !\210\202\253\314!\211\203\241\322 \203\241\320\n!\210\323\324!\210\317\325 \"\210\202\253\326\327!\210\317\325 \"\210*\202\273\330=\204\273\311 !\210\322 \203\316\331\314!!\332 !\210\333 !\210\334\335!*\207" [ediff-registry-buffer frame wind ediff-window-C ediff-window-A ediff-window-B ediff-update-registry get-buffer buffer-name error "No active Ediff sessions or corrupted session registry" nil ediff-get-visible-buffer-window message "Already showing the registry" set-window-buffer select-window window-live-p ediff-window-display-p other-window 1 selected-window ediff-skip-unsuitable-frames ok-unsplittable ediff-quit window-frame raise-frame ediff-reset-mouse run-hooks ediff-show-registry-hook ediff-meta-buffer this-command ediff-KILLED-VITAL-BUFFER] 3 (#$ . 44119) nil]) (defalias 'eregistry 'ediff-show-registry) (defalias 'ediff-update-meta-buffer #[(meta-buf &optional must-redraw session-number) "\205L\306!\205L\307\306!!\205L\203B\306!\203B\307\306!!\203Brq\210 \2032\n !\202@\f\247\203=\310\f!\202@\311 !)\207 \312=\206L\313\f!\207" [meta-buf must-redraw ediff-meta-redraw-function ediff-meta-list session-number this-command get-buffer buffer-name ediff-update-session-marker-in-dir-meta-buffer ediff-update-markers-in-dir-meta-buffer ediff-quit error ediff-KILLED-VITAL-BUFFER] 3]) (defalias 'ediff-update-registry #[nil "p\2036\304p!\2036\305\304p!!\2036rpq\210\203-\304!\203-\305\304!!\203-\306 \2024\307\310 \311\306\312%)\207\n\313=\206?\314 !\207" [ediff-registry-buffer ediff-session-registry this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-redraw-registry-buffer ediff-prepare-meta-buffer ediff-registry-action "*Ediff Registry" ediff-registry ediff-quit error] 6]) (defalias 'ediff-cleanup-meta-buffer #[(meta-buffer) "\205N\305!\205N\306\305!!\205N\203E\305!\203E\306\305!!\203Erq\210\307!\210 \205C\305 !\205C\306\305 !!\205C\307 \310\n#)\207 \311=\206N\312\f!\207" [meta-buffer ediff-parent-meta-buffer ediff-meta-session-number this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-update-meta-buffer nil ediff-quit error] 4]) (defalias 'ediff-safe-to-quit #[(meta-buffer) "\205s\306!\205s\307\306!!\205s \310\311\203g\306!\203g\307\306!!\203grq\210\fA \203b\f\203b\f\211@@)\203\\\306\f\211@@)!\203\\\307\306\f\211@@)!!\203\\\311\fA\2021 )\202r\f\312=\206r\313 !+\207" [meta-buffer ediff-meta-list buffer-read-only cont lis meta-list get-buffer buffer-name t nil ediff-quit error this-command ediff-KILLED-VITAL-BUFFER] 4]) #@224 If the group has no active session, delete the meta buffer. If no session is in progress, ask to confirm before deleting meta buffer. Otherwise, bury the meta buffer. If this is a session registry buffer then just bury it. (defalias 'ediff-quit-meta-buffer #[nil "p   =\211\203\306 \210\202\245\307!\2038\310\311!\2038\312\313!\210\314\315!\210\316!\210\202H\307!\203D\306 \210\202H\317\320!\210\321\322#\210\n\211\203j\323!\203j\324\323!!\203j\325\323!!\210)\f\211\203\205\323!\203\205\324\323!!\203\205\325\323!!\210)\203\245\323!\203\245\324\323!!\203\245\326\327\"\210\206\254\330 .\207" [buf ediff-dir-diffs-buffer dir-diffs-buffer ediff-meta-diff-buffer meta-diff-buffer ediff-meta-session-number bury-buffer ediff-safe-to-quit y-or-n-p "Quit this session group? " run-hooks ediff-quit-session-group-hook message "" ediff-dispose-of-meta-buffer error "This session group has active sessions---cannot exit" ediff-update-meta-buffer nil get-buffer buffer-name kill-buffer t ediff-show-meta-buffer ediff-show-registry session-number ediff-parent-meta-buffer parent-buf ediff-registry-buffer dont-show-registry] 5 (#$ . 47087) nil]) (defalias 'ediff-dispose-of-meta-buffer #[(buf) "\305 \"\2035\306!\2035\307\306!!\2035rq\210\n\2031\306\n!\2031\307\306\n!!\2031\310\n!\210)\202? \311=\204?\312\f!\210\310!\207" [buf ediff-session-registry ediff-dir-diffs-buffer this-command ediff-KILLED-VITAL-BUFFER delq get-buffer buffer-name kill-buffer ediff-quit error] 3]) (defalias 'ediff-get-meta-info #[(buf point &optional noerror) "\306\211\211 \203|\f\203|\307\f!\203|\310\307\f!!\203|\f\203p\307\f!\203p\310\307\f!!\203pr\fq\210 \203H\311 \f\312#\211\205D\313\312\"\202l\314 !\315\316 \"\211\203i @\204i\317 @\320\"\203i A\211\204U @)\202|\321=\204|\322!\210\n\203\204\n\202\220?\205\220\323 \210\322\324!+\207" [tmp olist result point buf ediff-xemacs-p nil get-buffer buffer-name extent-at ediff-meta-info ediff-overlay-get overlays-at mapcar #[(elt) "\301\302\"\207" [elt overlay-get ediff-meta-info] 3] overlay-get invisible ediff-quit error ediff-update-registry "No session info in this line" this-command ediff-KILLED-VITAL-BUFFER noerror] 5]) (defalias 'ediff-get-meta-overlay-at-pos #[(point) "\203\n\304 p\305#\207\306 !\211@\211\203&\307 \305\"\204&\nA\211@\211\204 *\207" [ediff-xemacs-p point overl-list overl extent-at ediff-meta-info overlays-at overlay-get] 5]) (defalias 'ediff-get-session-number-at-pos #[(point &optional meta-buffer) "\203\304!\203\305\304!!\203\202p\211\2036\304!\2036\305\304!!\2036rq\210\306\307 !\310\")\207\n\311=\206?\312 !\207" [meta-buffer point this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-overlay-get ediff-get-meta-overlay-at-pos ediff-meta-session-number ediff-quit error] 4]) (put 'ediff-get-session-number-at-pos 'byte-optimizer 'byte-compile-inline-expand) (defalias 'ediff-next-meta-overlay-start #[(point) "m\203eb\207\303!\n\203, \203\304 !\202\304p! \203(\305 !\2029d\2029 \2036\306 !\2029\307!)\207" [point overl ediff-xemacs-p ediff-get-meta-overlay-at-pos next-extent extent-start-position overlay-end next-overlay-change] 2]) (defalias 'ediff-previous-meta-overlay-start #[(point) "o\203db\207\303!\n\203, \203\304 !\202\304p! \203(\305 !\202Ie\202I \2034\306 !o\204;S\307!\310!@\204He)\207" [point overl ediff-xemacs-p ediff-get-meta-overlay-at-pos previous-extent extent-start-position overlay-start previous-overlay-change overlays-at] 2]) (defalias 'ediff-patch-file-form-meta #[(file &optional startup-hooks) "\306!\307!\310\n \"\f\311\311\311\312!\204'\313\314\"\203/\315\316\317!\"\210 \211@) \3208@) \3218@)\203b\322!\203b\323\322!!\204k\203k\315\324!\210 \203\225\322 !\203\225\323\322 !!\203\225r q\210\214~\210}\210\325 #*\202\240\326=\206\240\315!.\207" [last-command-event pos meta-buf info ediff-meta-patchbufer meta-patchbuf ediff-event-point ediff-event-buffer ediff-get-meta-info nil file-directory-p string-match "/dev/null" error "`%s' is not an ordinary file" file-name-as-directory 3 4 get-buffer buffer-name "Patch has been already applied to this file--cannot be repeated!" ediff-patch-file-internal ediff-quit session-buf beg-marker end-marker file elt startup-hooks this-command ediff-KILLED-VITAL-BUFFER] 5]) #@43 Unmark all sessions marked for operation. (defalias 'ediff-unmark-all-for-operation #[nil "A\211@\211\203\303\n\304\"\210 A\211\202)\305p\306\"\207" [ediff-meta-list list elt ediff-mark-session-for-operation unmark ediff-update-meta-buffer must-redraw] 4 (#$ . 51560) nil]) #@40 Unmark all sessions marked for hiding. (defalias 'ediff-unmark-all-for-hiding #[nil "A\211@\211\203\303\n\304\"\210 A\211\202)\305p\306\"\207" [ediff-meta-list list elt ediff-mark-session-for-hiding unmark ediff-update-meta-buffer must-redraw] 4 (#$ . 51848) nil]) #@130 Run though the session list and mark identical files. This is used only for sessions that involve 2 or 3 files at the same time. (defalias 'ediff-meta-mark-equal-files #[nil "A\306\211\211\211\211\211\211\211@\211\203\266 \307 8) \310 8) \311 8)\f\306\211A\240\210* \306\211A\240\210*\n\306\211A\240\210*\312\312\312\313\f \"\204f\306\306\314>)\203\204\313\f\n\"\204{\306\313 \n\"\204\204\306\203\255\203\255 \203\255\315=\203\241\316 \317\"\210\202\255\320=\203\255\321 \317\"\210A\211\202.\322p\323\"\207" [ediff-meta-list elt fileinfo3 fileinfo2 fileinfo1 marked3 nil 2 3 4 t ediff-mark-if-equal (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor ediff-directories3 ediff-filegroups3) 104 ediff-mark-session-for-hiding mark 109 ediff-mark-session-for-operation ediff-update-meta-buffer must-redraw marked2 marked1 list value metajob ediff-metajob-name last-command-char] 9 (#$ . 52128) nil]) (defalias 'ediff-mark-if-equal #[(fileinfo1 fileinfo2) "@ @\306 !\203\307\2026\306\n!\203\307\2026\310 \n\"\2056\311\211A\f\240\210* \311\211A\f\240\210*\311*\207" [fileinfo1 fileinfo2 f2 f1 value elt file-directory-p nil ediff-same-file-contents t] 4])