Linux iad1-shared-b7-18 6.6.49-grsec-jammy+ #10 SMP Thu Sep 12 23:23:08 UTC 2024 x86_64
Apache
: 67.205.6.31 | : 216.73.216.47
Cant Read [ /etc/named.conf ]
8.2.29
fernandoquevedo
Terminal
AUTO ROOT
Adminer
Backdoor Destroyer
Linux Exploit
Lock Shell
Lock File
Create User
CREATE RDP
PHP Mailer
BACKCONNECT
UNLOCK SHELL
HASH IDENTIFIER
README
+ Create Folder
+ Create File
/
usr /
share /
emacs /
27.1 /
lisp /
vc /
[ HOME SHELL ]
Name
Size
Permission
Action
add-log.elc
37.32
KB
-rw-r--r--
compare-w.elc
11.43
KB
-rw-r--r--
cvs-status.elc
20.93
KB
-rw-r--r--
diff-mode.elc
79.3
KB
-rw-r--r--
diff.elc
8.12
KB
-rw-r--r--
ediff-diff.elc
35.59
KB
-rw-r--r--
ediff-help.elc
11.75
KB
-rw-r--r--
ediff-hook.elc
6.46
KB
-rw-r--r--
ediff-init.elc
61.37
KB
-rw-r--r--
ediff-merg.elc
9.59
KB
-rw-r--r--
ediff-mult.elc
62.71
KB
-rw-r--r--
ediff-ptch.elc
20.25
KB
-rw-r--r--
ediff-util.elc
119.86
KB
-rw-r--r--
ediff-vers.elc
5.25
KB
-rw-r--r--
ediff-wind.elc
28.56
KB
-rw-r--r--
ediff.elc
41.19
KB
-rw-r--r--
emerge.elc
78.92
KB
-rw-r--r--
log-edit.elc
36.48
KB
-rw-r--r--
log-view.elc
18.74
KB
-rw-r--r--
pcvs-defs.elc
15.37
KB
-rw-r--r--
pcvs-info.elc
22.11
KB
-rw-r--r--
pcvs-parse.elc
14.9
KB
-rw-r--r--
pcvs-util.elc
21.53
KB
-rw-r--r--
pcvs.elc
85.67
KB
-rw-r--r--
smerge-mode.elc
39.76
KB
-rw-r--r--
vc-annotate.elc
26.25
KB
-rw-r--r--
vc-bzr.elc
41.48
KB
-rw-r--r--
vc-cvs.elc
36.24
KB
-rw-r--r--
vc-dav.elc
4.49
KB
-rw-r--r--
vc-dir.elc
43.58
KB
-rw-r--r--
vc-dispatcher.elc
17.4
KB
-rw-r--r--
vc-filewise.elc
1.91
KB
-rw-r--r--
vc-git.elc
74.65
KB
-rw-r--r--
vc-hg.elc
58.67
KB
-rw-r--r--
vc-hooks.elc
30.18
KB
-rw-r--r--
vc-mtn.elc
14.04
KB
-rw-r--r--
vc-rcs.elc
34.65
KB
-rw-r--r--
vc-sccs.elc
14.63
KB
-rw-r--r--
vc-src.elc
7.25
KB
-rw-r--r--
vc-svn.elc
23.45
KB
-rw-r--r--
vc.elc
75.95
KB
-rw-r--r--
Delete
Unzip
Zip
${this.title}
Close
Code Editor : ediff-mult.elc
;ELC ;;; Compiled ;;; in Emacs version 27.1 ;;; with all optimizations. ;;; This file uses dynamic docstrings, first added in Emacs 19.29. ;;; This file does not contain utf-8 non-ASCII characters, ;;; and so can be loaded in Emacs versions earlier than 23. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (byte-code "\300\301\302\303\304\305\306\307&\210\310\311!\210\310\312!\210\310\313!\210\310\314!\207" [custom-declare-group ediff-mult nil "Multi-file and multi-buffer processing in Ediff." :prefix "ediff-" :group ediff require ediff-init ediff-diff ediff-wind ediff-util] 8) #@2 (defvar ediff-meta-buffer nil (#$ . 685)) (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 (#$ . 853)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-parent-meta-buffer put permanent-local t] 4) (defvar ediff-registry-buffer nil) (defconst ediff-meta-buffer-brief-message "Ediff Session Group Panel: %s\n\n Type ? to show useful commands in this buffer\n\n") (defconst ediff-meta-buffer-verbose-message "Ediff Session Group Panel: %s\n\nUseful commands (type ? to hide them and free up screen):\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 manual\n T: toggle truncation of long file names\n q: quit this session group\n") #@33 The keymap for the meta buffer. (defvar ediff-meta-buffer-map nil (#$ . 1909)) (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 (byte-code "\300 \301!\210\302\303\304#\210\302\305\306#\210\302\307\306#\210\302\310\311#\210\302\312\311#\210\302\313\314#\210\302\315\314#\210\302\316\311#\210\302\317\311#\210\211\207" [make-sparse-keymap suppress-keymap define-key "q" ediff-bury-dir-diffs-buffer " " next-line "n" "" previous-line "p" "C" ediff-dir-diff-copy-file [mouse-2] [delete] [backspace]] 5) (#$ . 2118)) #@2 (defvar ediff-meta-action-function nil (#$ . 2635)) (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 (#$ . 2822)) (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 (#$ . 3009)) (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 (#$ . 3202)) (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 (#$ . 3373)) (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-recurse-to-subdirectories nil (#$ . 3552)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-recurse-to-subdirectories put permanent-local t] 4) #@2 (defvar ediff-filtering-regexp-history nil (#$ . 3749)) (byte-code "\300\301\302\303\304DD\305\306\307\310\311&\207" [custom-declare-variable ediff-default-filtering-regexp funcall function #[0 "\300\207" [nil] 1] "The default regular expression used as a filename filter in multifile comparisons.\nShould be a sexp. For instance (car ediff-filtering-regexp-history) or nil." :type sexp :risky t] 8) #@2 (defvar ediff-meta-list nil (#$ . 4157)) (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 (#$ . 4322)) (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 (#$ . 4507)) (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 (#$ . 4692)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-dir-diffs-buffer put permanent-local t] 4) (defvar ediff-session-registry nil) (byte-code "\300\301\302\303\304DD\305\306\307%\210\300\310\302\303\311DD\312\306\313%\210\300\314\302\303\315DD\316\306\313%\210\300\317\302\303\320DD\321\306\313\322\323&\210\324\317\325\326#\210\300\327\302\303\330DD\331\306\313%\210\300\332\302\303\333DD\334\306\313%\210\300\335\302\303\336DD\337\306\313%\210\300\340\302\303\341DD\342\306\313%\210\300\343\302\303\344DD\345\306\313%\207" [custom-declare-variable ediff-meta-truncate-filenames funcall function #[0 "\300\207" [t] 1] "If non-nil, truncate long file names in the session group buffers.\nThis can be toggled with `ediff-toggle-filename-truncation'." :type boolean ediff-meta-mode-hook #[0 "\300\207" [nil] 1] "Hooks run just after setting up meta mode." hook ediff-registry-setup-hook #[0 "\300\207" [nil] 1] "Hooks run just after the registry control panel is set up." ediff-before-session-group-setup-hooks #[0 "\300\207" [nil] 1] "Hook run before Ediff arranges the window for group-level operations.\nIt is used by commands such as `ediff-directories'.\nThis hook can be used to save the previous window config, which can be restored\non `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'." :group ediff-hook make-obsolete-variable nil "27.1" ediff-after-session-group-setup-hook #[0 "\300\207" [nil] 1] "Hooks run just after a meta-buffer controlling a session group, such as\nediff-directories, is run." ediff-quit-session-group-hook #[0 "\300\207" [nil] 1] "Hooks run just before exiting a session group." ediff-show-registry-hook #[0 "\300\207" [nil] 1] "Hooks run just after the registry buffer is shown." ediff-show-session-group-hook #[0 "\300\207" [(delete-other-windows)] 1] "Hooks run just after a session group buffer is shown." ediff-meta-buffer-keymap-setup-hook #[0 "\300\207" [nil] 1] "Hooks run just after setting up the `ediff-meta-buffer-map'.\nThis keymap controls key bindings in the meta buffer and is a local variable.\nThis means that you can set different bindings for different kinds of meta\nbuffers."] 8) #@2 (defvar ediff-meta-patchbufer nil (#$ . 6928)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-meta-patchbufer put permanent-local t] 4) #@18 (fn META-LIST) (defalias 'ediff-get-group-buffer #[257 "\211@@\207" [] 2 (#$ . 7106)]) (put 'ediff-get-group-buffer 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn META-LIST) (defalias 'ediff-get-group-regexp #[257 "\211@A@\207" [] 2 (#$ . 7275)]) (put 'ediff-get-group-regexp 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn META-LIST) (defalias 'ediff-get-group-objA #[257 "\300@8\207" [2] 3 (#$ . 7445)]) (put 'ediff-get-group-objA 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn META-LIST) (defalias 'ediff-get-group-objB #[257 "\300@8\207" [3] 3 (#$ . 7612)]) (put 'ediff-get-group-objB 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn META-LIST) (defalias 'ediff-get-group-objC #[257 "\300@8\207" [4] 3 (#$ . 7779)]) (put 'ediff-get-group-objC 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn META-LIST) (defalias 'ediff-get-group-merge-autostore-dir #[257 "\300@8\207" [5] 3 (#$ . 7946)]) (put 'ediff-get-group-merge-autostore-dir 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn META-LIST) (defalias 'ediff-get-group-comparison-func #[257 "\300@8\207" [6] 3 (#$ . 8143)]) (put 'ediff-get-group-comparison-func 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-buffer #[257 "\211@\207" [] 2 (#$ . 8332)]) (put 'ediff-get-session-buffer 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-status #[257 "\211A@\207" [] 2 (#$ . 8498)]) (put 'ediff-get-session-status 'byte-optimizer 'byte-compile-inline-expand) #@32 (fn SESSION-INFO NEW-STATUS) (defalias 'ediff-set-session-status #[514 "A\240\207" [] 4 (#$ . 8665)]) (put 'ediff-set-session-status 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-objA #[257 "\3008\207" [2] 3 (#$ . 8853)]) (put 'ediff-get-session-objA 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-objB #[257 "\3008\207" [3] 3 (#$ . 9017)]) (put 'ediff-get-session-objB 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-objC #[257 "\3008\207" [4] 3 (#$ . 9181)]) (put 'ediff-get-session-objC 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-objA-name #[257 "\3008@\207" [2] 3 (#$ . 9345)]) (put 'ediff-get-session-objA-name 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-objB-name #[257 "\3008@\207" [3] 3 (#$ . 9520)]) (put 'ediff-get-session-objB-name 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-session-objC-name #[257 "\3008@\207" [4] 3 (#$ . 9695)]) (put 'ediff-get-session-objC-name 'byte-optimizer 'byte-compile-inline-expand) #@12 (fn ELT) (defalias 'ediff-get-file-eqstatus #[257 "\211A@\207" [] 2 (#$ . 9870)]) (put 'ediff-get-file-eqstatus 'byte-optimizer 'byte-compile-inline-expand) #@18 (fn ELT VALUE) (defalias 'ediff-set-file-eqstatus #[514 "A\240\207" [] 4 (#$ . 10035)]) (put 'ediff-set-file-eqstatus 'byte-optimizer 'byte-compile-inline-expand) #@23 (fn OBJ1 OBJ2 OBJ3) (defalias 'ediff-make-new-meta-list-element #[771 "\300\211\300D\300D\300D\257\207" [nil] 9 (#$ . 10208)]) #@67 (fn REGEXP OBJA OBJB OBJC MERGE-AUTO-STORE-DIR COMPARISON-FUNC) (defalias 'ediff-make-new-meta-list-header #[1542 "\257\207" [] 12 (#$ . 10347)]) #@16 (fn SESSION) (defalias 'ediff-get-session-activity-marker #[257 "\211\211@\262\211\204 \300\202' \211\211\205 \301!\205 \302\301!!\262\203& \303\202' \304\207" [nil get-buffer buffer-name 43 45] 6 (#$ . 10508)]) #@21 (fn SESSION-INFO) (defalias 'ediff-meta-session-p #[257 "\211\3008@\262;\205D \301\3008@\262!\205D \211\3028@\262;\205D \301\3028@\262!\205D \211\3038@\262;\203C \301\3038@\262!\207\304\207" [2 file-directory-p 3 4 t] 5 (#$ . 10735)]) #@124 If t, display redundant help in ediff-directories and other meta buffers. Toggled by ediff-toggle-verbose-help-meta-buffer (defvar ediff-verbose-help-enabled nil (#$ . 10994)) (byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-verbose-help-enabled put permanent-local t] 4) #@56 Toggle showing tediously verbose help in meta buffers. (defalias 'ediff-toggle-verbose-help-meta-buffer #[0 "?\301p\302\"\207" [ediff-verbose-help-enabled ediff-update-meta-buffer must-redraw] 3 (#$ . 11305) nil]) (defalias 'ediff-setup-meta-map #[0 "\304 \305!\210\306\307\310#\210\306\311\312#\210\306\313\314#\210\306\315\316#\210\306\317\320#\210\306\321 #\210\306\322 #\210\306\323\324#\210\306\325\324#\210\306\326\327#\210\306\330\327#\210\306\331\327#\210\306\332\327#\210\304\333!\306\334\333B#\210\306\335\336#\210\306\337\340#\210\306\341\342#\210\306\343\344#\210\345\211\211\206 \n\346>\262\206\224 \211\211\206\214 \n\347=\205\222 \350\262\262\204\261 \306\351\345#\210\306\352\353#\210\306\354\353#\210\306\355\353#\210\306\356\357#\210\306\360\361#\266 \203\310 \306\362\327#\210\306\363 #\210\364!\210\365\366!\207" [ediff-meta-buffer-map ediff-meta-action-function ediff-metajob-name ediff-no-emacs-help-in-control-buffer make-sparse-keymap suppress-keymap define-key "?" ediff-toggle-verbose-help-meta-buffer "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-Meta" [menu-bar ediff-meta-mode] [ediff-quit-meta-buffer] (menu-item "Quit" ediff-quit-meta-buffer :help "Quit the meta buffer") [ediff-toggle-filename-truncation] (menu-item "Truncate filenames" ediff-toggle-filename-truncation :help "Toggle truncation of long file names in session group buffers" :button (:toggle . ediff-meta-truncate-filenames)) [ediff-show-registry] (menu-item "Display Ediff Registry" ediff-show-registry :help "Display Ediff's registry") [ediff-documentation] (menu-item "Show Manual" ediff-documentation :help "Display Ediff's manual") nil (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) ediff-multifile-patch (ediff-multifile-patch) "=" "==" ediff-meta-mark-equal-files "=m" "=h" [ediff-next-meta-item] (menu-item "Next" ediff-next-meta-item :help "Move to the next item in Ediff registry or session group buffer") [ediff-previous-meta-item] (menu-item "Previous" ediff-previous-meta-item :help "Move to the previous item in Ediff registry or session group buffer") "" [mouse-2] use-local-map run-hooks ediff-meta-buffer-keymap-setup-hook] 6]) (defvar ediff-meta-mode-hook nil) (byte-code "\300\301N\204\f \302\300\301\303#\210\304\305!\204 \302\305\306\307#\210\300\207" [ediff-meta-mode-hook variable-documentation put "Hook run after entering MetaEdiff mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp ediff-meta-mode-map definition-name ediff-meta-mode] 4) (defvar ediff-meta-mode-map (make-sparse-keymap)) (byte-code "\301\302N\204 \303\301\302\304\305!#\210\306\307!\204 \303\307\310\311#\210\312\313 !\210\307\302N\204- \303\307\302\304\314!#\210\306\300!\204B \303\300\310\311#\210\315\316\300\317\"\210!\210\300\302N\204P \303\300\302\304\320!#\210\303\311\321\317#\207" [ediff-meta-mode-abbrev-table ediff-meta-mode-map variable-documentation put purecopy "Keymap for `ediff-meta-mode'." boundp ediff-meta-mode-syntax-table definition-name ediff-meta-mode (lambda (#1=#:def-tmp-var) (defvar ediff-meta-mode-syntax-table #1#)) make-syntax-table "Syntax table for `ediff-meta-mode'." (lambda (#1#) (defvar ediff-meta-mode-abbrev-table #1#)) define-abbrev-table nil "Abbrev table for `ediff-meta-mode'." derived-mode-parent] 5) #@621 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} This mode runs the hook `ediff-meta-mode-hook', as the final or penultimate step during initialization. (defalias 'ediff-meta-mode #[0 "\306\300!\210\307\310 \210\311\312\313 !\210\314\f!\210 )\315\316!\207" [delay-mode-hooks major-mode mode-name ediff-meta-mode-map ediff-meta-mode-syntax-table ediff-meta-mode-abbrev-table make-local-variable t kill-all-local-variables ediff-meta-mode "MetaEdiff" use-local-map set-syntax-table run-mode-hooks ediff-meta-mode-hook local-abbrev-table] 2 (#$ . 14903) nil]) #@153 Move to the next item in Ediff registry or session group buffer. Moves in circular fashion. With numeric prefix arg, skip this many items. (fn COUNT) (defalias 'ediff-next-meta-item #[257 "\211\204 \300\262\301\302W\2050 S\262\303 \210\304`!\262\211\203 \305\306\"\203 \303 \210\304`!\262\202 \207" [1 nil 0 ediff-next-meta-item1 ediff-get-meta-overlay-at-pos overlay-get invisible] 5 (#$ . 15939) "p"]) (defalias 'ediff-next-meta-item1 #[0 "\301\302`!\262\211\203 \211b\210\303=\203) \304p\305#\2053 \306\307\301\310#\2053 \311\301x\2023 \312\301w\313V\2053 \314u\207" [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 -1] 5]) #@157 Move to the previous item in Ediff registry or session group buffer. Moves in circular fashion. With numeric prefix arg, skip this many items. (fn COUNT) (defalias 'ediff-previous-meta-item #[257 "\211\204 \300\262\301\302W\2050 S\262\303 \210\304`!\262\211\203 \305\306\"\203 \303 \210\304`!\262\202 \207" [1 nil 0 ediff-previous-meta-item1 ediff-get-meta-overlay-at-pos overlay-get invisible] 5 (#$ . 16689) "p"]) (defalias 'ediff-previous-meta-item1 #[0 "\301\302`!\262\211\203 \211b\210\303=\203) \304p\305#\2053 \306\307\301\310#\2053 \311\301x\2023 \312\301w\313V\2053 \314u\207" [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 -1] 5]) #@17 (fn DIR FILE) (defalias 'ediff-add-slash-if-directory #[514 "\300P!\203\f \301!\207\207" [file-directory-p file-name-as-directory] 5 (#$ . 17458)]) (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 #[0 "?\301p\302\"\207" [ediff-meta-truncate-filenames ediff-update-meta-buffer must-redraw] 3 (#$ . 17698) nil]) (defvar ediff-membership-code1 2) (defvar ediff-membership-code2 3) (defvar ediff-membership-code3 5) (defvar ediff-product-of-memcodes (* ediff-membership-code1 ediff-membership-code2 ediff-membership-code3)) #@68 (fn JOBNAME REGEXP DIR1 DIR2 &optional DIR3 MERGE-AUTOSTORE-DIR) (defalias 'ediff-intersect-directories #[1540 "\301C\301C\301C\301\211C\301C\301C\301\211\302!\240\210\303\242\301#\240\210\304\305 \242\"\240\210\304\306 \242\"\240\210\307\310\311\312\313\314 !\315\"\316\317% \242\"\240\210\302 !\240\210\303\242\301#\240\210\304\305\n\242\"\240\210\304\306\n\242\"\240\210\307\310\311\312\313\314\n!\320\"\316\317%\n\242\"\240\210\n;\203\312 \302\f!\240\210\303\242\301#\240\210\304\305 \242\"\240\210\304\306 \242\"\240\210\307\310\311\312\313\314 !\321\"\316\317% \242\"\240\210 \211;\205\325 \211\322\230?\262\203\340 \302\n!\262\n\323 \242 \242\324#\262\242\203 \211\206\370 \325>\262\203 \323\242\324#\262\326\327!\330\"\262\331\332\211 \242 \242\324# \242\324#\324#\262\304\305\"\262\326\327\304\306\"!\330\"\262\307\333\"\262\334\310\311\335\313\314#\336\"\337\317%\"\210\340\242\242\242\324&B\262\340\242\242\242\324&\307\310\311\341\313\314 \f\f\f$\342\"\343\317%\"B\262B\207" [ediff-metajob-name nil file-name-as-directory directory-files delete "." ".." mapcar make-byte-code 257 "\300\242\301P!\203 \302!\207\207" vconcat vector [file-directory-p file-name-as-directory] 6 "\n\n(fn ELT)" [file-directory-p file-name-as-directory] [file-directory-p file-name-as-directory] "" ediff-intersection string= (ediff-directories3 ediff-filegroups3) sort ediff-copy-list string-lessp ediff-set-difference ediff-union #[257 "\211\300B\207" [1] 3 "\n\n(fn ELT)"] mapc "\211@\300\242\235\203 \211A _\241\210\211@\301\242\235\203 \211A\f_\241\210\211@\302\242\235\205, \211A _\241\207" [ediff-membership-code1 ediff-membership-code2 ediff-membership-code3] 4 ediff-make-new-meta-list-header "\304\305\301\242P!\305\302\242P!\300\242\2058 \303\242\306P!\203% \307!\266\202\202' \262\262\310\303\242P!\2058 \305\303\242P!#\207" [ediff-make-new-meta-list-element expand-file-name file-directory-p file-name-as-directory file-exists-p] 9] 26 (#$ . 18225)]) #@58 (fn JOBNAME REGEXP DIR1 &optional MERGE-AUTOSTORE-DIR) (defalias 'ediff-get-directory-files-under-revision #[1027 "\300\211\211\211C\211\301!\240\210\302\242\300 #\262\211;\205 \211\303\230?\262\203) \301!\262\203\226 @\262A\262\304\242P!\203Z \211\242\304P!\203Q \301!\266\202\202S \262B\262\202) \305\306!\203q \307\242P!\203q B\262\202) \310\242\311Q!\203\203 B\262\202) \310\242\312\311R!\203) B\262\202) \313\314\"\262\313\315\"\262\313\316\"\262\313\317\"\262\320\321!\322\"\262\323\242\300\211 \300&\324\325\326\327\330\331!\332\"\333\334%\"B\207" [nil file-name-as-directory directory-files "" file-directory-p featurep vc-hooks vc-backend file-exists-p ",v" "RCS/" delete "./" "../" "RCS" "CVS" sort ediff-copy-list string-lessp ediff-make-new-meta-list-header mapcar make-byte-code 257 "\301\302\300\242P!\303\211#\207" vconcat vector [ediff-make-new-meta-list-element expand-file-name nil] 5 "\n\n(fn ELT)"] 16 (#$ . 20334)]) #@95 (fn ACTION-FUNC META-LIST META-BUFFER-NAME REDRAW-FUNCTION JOBNAME &optional STARTUP-HOOKS) (defalias 'ediff-prepare-meta-buffer #[1541 "\306\307\"\310!\211\211\205 \311!\205 \312\311!!\262\203gr\211q\210\313 \210\211\314 \210\n\315=\203D \211\316@\317\320#\210\202N \211@BAB\211\f=\204Z \211ABA !\210\321B\322\323!\210\324\325\"\210\326=\203J\211C@BCABC\211\211\206\203 \n\327>\262\206\230 \211\211\206\220 \n\330=\205\226 \331\262\262\204\242 \332C!\210\316@\333\334#\210\316@\335\336#\210\316@\337\340#\210\316@\341\323#\210\316@\342\343#\210\316@\344\345#\210\316@\346\347#\210\316@\350\351#\210\316@\352\353#\210\316@\354\355#\210\316@\356\357#\210\211\206\365 \n\360>\262\203 \316@\361\362#\210\316@\363\364#\210\202,\211\206\n\330=\205\365\262\203,\316@\366\367#\210\316@\363\370#\210\316@\371\372#\210\316@\373\374#\210\316@\375\376#\210\316@\377\201F #\210\n\315=\203[\201G \201H !\210\202c\201G \201I !\210)\202wD\201J =\204w\201K E!\210\207" [ediff-meta-action-function ediff-meta-redraw-function ediff-metajob-name ediff-meta-buffer ediff-registry-buffer ediff-meta-list 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 t set-buffer-modified-p nil mapc funcall ediff-filegroup-action (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) ediff-multifile-patch (ediff-multifile-patch) 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 [menu-bar ediff-meta-mode ediff-hide-marked-sessions] (menu-item "Hide marked" ediff-hide-marked-sessions :help "Hide marked sessions. With prefix arg, unhide") [menu-bar ediff-meta-mode ediff-mark-for-hiding-at-pos] (menu-item "Mark for hiding" ediff-mark-for-hiding-at-pos :help "Mark session for hiding. With prefix arg, unmark") [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos] (menu-item "Mark for group operation" ediff-mark-for-operation-at-pos :help "Mark session for a group operation. With prefix arg, unmark") [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding] (menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding :help "Unmark all sessions marked for hiding") [menu-bar ediff-meta-mode ediff-unmark-all-for-operation] (menu-item "Unmark all for group operation" ediff-unmark-all-for-operation :help "Unmark all sessions marked for operation") (ediff-directories ediff-merge-directories ediff-merge-directories-with-ancestor ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) [menu-bar ediff-meta-mode ediff-collect-custom-diffs] (menu-item "Collect diffs" ediff-collect-custom-diffs :help "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'") "P" ediff-collect-custom-diffs (ediff-multifile-patch) [menu-bar ediff-meta-mode ediff-meta-show-patch] (menu-item "Show multi-file patch" ediff-meta-show-patch :help "Show the multi-file patch associated with this group session") ediff-meta-show-patch "^" ediff-up-meta-hierarchy "D" ediff-show-dir-diffs [menu-bar ediff-meta-mode ediff-up-meta-hierarchy] (menu-item "Go to parent session" ediff-up-meta-hierarchy :help "Go to the parent session group buffer") [menu-bar ediff-meta-mode ediff-show-dir-diffs] ediff-meta-buffer-map ediff-session-registry buffer-read-only ediff-dir-difference-list this-command ediff-KILLED-VITAL-BUFFER (menu-item "Diff directories" ediff-show-dir-diffs :help "Display differences among the directories involved in session group") run-hooks ediff-registry-setup-hook ediff-after-session-group-setup-hook ediff-quit error] 12 (#$ . 21337)]) #@16 (fn SESSION) (defalias 'ediff-insert-session-activity-marker-in-meta-buffer #[257 "\300!\206 \301c\207" [ediff-get-session-activity-marker " "] 3 (#$ . 25223)]) #@16 (fn SESSION) (defalias 'ediff-insert-session-status-in-meta-buffer #[257 "\211\211A@\262\206\n \300c\207" [" "] 3 (#$ . 25394)]) #@25 (fn POINT NEW-MARKER) (defalias 'ediff-replace-session-activity-marker-in-meta-buffer #[514 "\301!\302\303\"\304!\305\204 \211\204 \306\262\307!\205! \310!\262b\210`f=?\2057 c\210\311\312!\210\313\305!)\207" [buffer-read-only ediff-get-meta-overlay-at-pos overlay-get ediff-meta-info ediff-get-session-activity-marker nil 32 overlayp overlay-start delete-char 1 set-buffer-modified-p] 8 (#$ . 25532)]) #@25 (fn POINT NEW-STATUS) (defalias 'ediff-replace-session-status-in-meta-buffer #[514 "\301!\302\303\"\211\211A@\262\304\206 \211\206 \305\262\306!\205$ \307!\262b\210\310u\210`f=?\205= c\210\311\310!\210\312\304!)\207" [buffer-read-only ediff-get-meta-overlay-at-pos overlay-get ediff-meta-info nil 32 overlayp overlay-start 1 delete-char set-buffer-modified-p] 8 (#$ . 25956)]) #@32 (fn SESSION-INFO SESSIONNUM) (defalias 'ediff-insert-session-info-in-meta-buffer #[514 "\3008\262\3018\262\3028\262`\211A@\262\303=\304!\210\305!\210\306\307!\310\261\210\311!\210\311!\210\311!\210\312` %\207" [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] 13 (#$ . 26355)]) #@18 (fn META-LIST) (defalias 'ediff-redraw-directory-group-buffer #[257 "\211\211@@\262\306\307\310\211\211\211\211\211\211\205 \311!\205 \312\311!!\262\203brq\210`\262\313 \210\314\315\316\317\211\"\"\210\211@A@\262\262\320@8\262\262 \203\255 \321\n\322 !\"c\210\310\211\206^ \323>\262\203k \324c\210\202 \310\211\206q \325=\205w \326\262\203 \327c\210\330c\210\310\211\211\206\211 \331>\262\206\236 \211\211\206\226 \325=\205\234 \332\262\262\204\265 \333\334\335\336\261\210\202\265 \321\f\322 !\"c\210\337c\210;\203\313 G\307V\203\313 \321\340\"c\210\341 !\210 \203\366 \310\211\206\332 \342>\262\203\366 \211;\205\353 \211\343\230?\262\203\366 \321\344\"c\210\345c\210A\262 \262\211\203&\203&\211@\203 \211@\211A@\262\346=\204 \310\262\211A\262\202\203.\347c\210\203U@\262A\262 T\262\211A@\262\346=\204.\350\"\210\202.\351\310!\210b\210)\202m,\352=\206m\353-!)\207" [buffer-read-only ediff-verbose-help-enabled ediff-meta-buffer-verbose-message ediff-metajob-name ediff-meta-buffer-brief-message ediff-autostore-merges t 0 nil get-buffer buffer-name erase-buffer mapc delete-overlay overlays-in 1 5 format ediff-abbrev-jobname (ediff-directories ediff-merge-directories ediff-merge-directories-with-ancestor ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) " P: collect custom diffs of all marked sessions\n" ediff-multifile-patch (ediff-multifile-patch) " P: show patch appropriately for the context (session or group)\n" " ^: show parent session group\n" (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) (ediff-multifile-patch) " D: show differences among directories\n" " ==: for each session, show which files are identical\n" " =h: like ==, but also marks sessions for hiding\n" " =m: like ==, but also marks 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 this-command ediff-KILLED-VITAL-BUFFER] 14 (#$ . 26808)]) #@18 (fn META-LIST) (defalias 'ediff-update-markers-in-dir-meta-buffer #[257 "\211\211@@\262\303\211\211\211\211\205 \304!\205 \305\304!!\262\203\232 rq\210`\262eb\210\306 \210o\204\217 \307`\310#\262\311`!\262\203\211 \211A@\262\312=\203Y \211\203\211 \313\314\315#\210\202\211 \211A@\262\316=\203x \211\203x \317\314\"\203x \313\314\303#\210\202\211 \320`\321!\"\210\322`\211A@\262\"\210\306 \210\202- \323\303!\210b\210)\202\244 \324=\204\244 \325\n!\210)\207" [buffer-read-only this-command ediff-KILLED-VITAL-BUFFER 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 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] 9 (#$ . 29412)]) #@20 (fn SESSION-NUM) (defalias 'ediff-update-session-marker-in-dir-meta-buffer #[257 "\301\211\211\211\302 \262\303@A\"\262\304\301\305\306\307\310\311\312 !\313\"\314\315%\"\"@\262\211\2041 \316\317\"\210\320\321\"\262\211\322!\205A \323!\262b\210\324`\325!\"\210\326`\211A@\262\"\210)\266\327 \207" [buffer-read-only nil overlay-lists append delq mapcar make-byte-code 257 "\301\302\"\205 \301\303\"\300=\205 \211\207" vconcat vector [overlay-get ediff-meta-info ediff-meta-session-number] 4 "\n\n(fn OVERL)" error "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S" overlay-get ediff-meta-info overlayp overlay-start ediff-replace-session-activity-marker-in-meta-buffer ediff-get-session-activity-marker ediff-replace-session-status-in-meta-buffer ediff-next-meta-item1] 13 (#$ . 30307)]) #@16 (fn SESSION) (defalias 'ediff-problematic-session-p #[257 "\211\3018@\262\3028@\262\3038@\262;\203G \304!\204G ;\203G \304!\204G \211;\2036 \304!\203G \305\211\206< \306>\262\203G \307\202H \305\207" [ediff-metajob-name 2 3 4 file-directory-p nil (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor) ancestor-is-dir] 7 (#$ . 31163)]) #@17 (fn FILEINFO) (defalias 'ediff-meta-insert-file-info1 #[257 "\211@\211A@\262\203 \301 \302Z\202 \303\304\211;\204! \305\262\202K \306!\203H \307!\203B \310\311\"\262\262\310\312\"\262\262\202K \305\262\202K \313\262;\205\247 \314\315\203Z \316\202[ \317\314\320\313U\203g \321\202r \313W\203q \321\202r \"\313U\203} \322\202\215 \313W\203\207 \323\202\215 \324\325!! ;\204\235 \313W\203\235 \326\202\245 \327\330 ! \"%c\207" [ediff-meta-truncate-filenames window-width 41 500 nil -2 ediff-listable-file 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] 14 (#$ . 31544)]) #@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")) (#$ . 32333)) #@12 (fn NUM) (defalias 'ediff-fill-leading-zero #[257 "\211\300W\203 \301\302\"\207\303!\207" [10 format "0%d" number-to-string] 4 (#$ . 32553)]) (put 'ediff-fill-leading-zero 'byte-optimizer 'byte-compile-inline-expand) #@13 (fn TIME) (defalias 'ediff-format-date #[257 "\301\302\303\3048\"A\3058\3068\3078\211\310W\203\" \301\311\"\262\202' \312!\262A@\211\310W\203: \301\311\"\262\202? \312!\262\313@\314\"\211\310W\203T \301\311\"\262\202Y \312!\262&\207" [ediff-months format "%s %2d %4d %s:%s:%s" assoc 4 3 5 2 10 "0%d" number-to-string time-convert integer] 12 (#$ . 32781)]) #@18 (fn META-LIST) (defalias 'ediff-insert-dirs-in-meta-buffer #[257 "\300\301@8\262!\302@8\262\211;\205 \300!\303@8\262\211;\205' \300!\304\305\261\210\2037 \306\305\261\210\211\203A \307\305\261\210\305c\207" [ediff-abbreviate-file-name 2 3 4 "*** Directory A: " "\n" "*** Directory B: " "*** Directory C: "] 9 (#$ . 33169)]) #@37 (fn DIFF-LIST &optional BUF-NAME) (defalias 'ediff-draw-dir-diffs #[513 "\204 \306\307!\210\211\206 \310\311\312\"\262\211@A@\262\313\314@8\262!\313\315@8\262!\316@8\262\211;\205: \313!\211@@\262\317\320\321\"\322\211\211\211 A\262\f\323 !\211\211\205d \324!\205d \325\324!!\262\203\357r q\210`\262\326\n!\210\327 \210\330c\210\331c\210\332\333\n\"c\210\203\222 \332\334 \"c\210\203\235 \332\335\"c\210 ;\203\262 G\336V\203\262 \332\337 \"c\210\340c\210\332\341\342\343#c\210\203\311 \332\344\345\"c\210\202\314 \340c\210\332\346\211#c\210;\203\341 \332\347\"c\210\202\344 \350c\210 \204\354 \351c\210 \203\343 @@\262 @A\262 A\262\f\352\f\"\336U\203C`\332\353\354\313\355 P!\203!\356!\202#!\357\"\"c\210\360` P\257#\266\202I\332\353\361\"c\210\352 \"\336U\203\212`\332\362\354\313\355 P!\203h\356!\202j!\357\"\"c\210\360` P\257#\266\202\220\332\362\361\"c\210;\203\335\3528\"\336U\203\327`\332\363\354\313\355 P!\203\265\356!\202\267!\357\"\"c\210\360` P\257#\266\202\335\332\363\361\"c\210\340c\210\202\354 \364\365\322!\210\211b)\202\3729\366=\206\372\367:!)\207" [buffer-read-only ediff-dir-diffs-buffer ediff-dir-diffs-buffer-map ediff-meta-buffer ediff-membership-code1 ediff-membership-code2 user-error "Lost difference info on these directories" ediff-unique-buffer-name "*Ediff File Group Differences" "*" ediff-abbreviate-file-name 2 3 4 make-string 26 45 nil get-buffer-create get-buffer buffer-name use-local-map erase-buffer " *** Directory Differences ***\n" "\nUseful commands:\n C,button2: over file name -- copy this file to directory that doesn't have it\n q: hide this buffer\n n,SPC: next line\n p,DEL: previous line\n\n" format "\n*** Directory A: %s\n" "*** Directory B: %s\n" "*** Directory C: %s\n" 0 "*** Filter-through regular expression: %s\n" "\n" "\n%-27s%-26s" "Directory A" "Directory B" " %-25s\n" "Directory C" "%s%s" "%s\n\n" "\n\n" "\n *** No differences ***\n" mod "%-27s" ediff-truncate-string-left file-directory-p file-name-as-directory 24 ediff-set-meta-overlay "---" "%-26s" " %-25s" t set-buffer-modified-p ediff-quit error ediff-membership-code3 this-command ediff-KILLED-VITAL-BUFFER] 23 (#$ . 33520)]) #@73 Bury the directory difference buffer. Display the meta buffer instead. (defalias 'ediff-bury-dir-diffs-buffer #[0 "\302 \211\211\205 \303!\205 \304\303!!\262\205 \305\303!!\266\306!\211\262\203. \307!\2023 \310\311 \"\207" [ediff-meta-buffer ediff-dir-diffs-buffer nil get-buffer buffer-name kill-buffer ediff-get-visible-buffer-window select-window set-window-buffer selected-window] 7 (#$ . 35842) nil]) #@70 Display differences among the directories involved in session group. (defalias 'ediff-show-dir-diffs #[0 "\303\211\211\206 \304>\262\206 \211\211\206 \305=\205 \306\262\262\203% \307\310!\210 \211\2055 \311!\2055 \312\311!!\262\204> \313\n!\210 \314\315!\210\316\317 \"\210eb\207" [ediff-metajob-name ediff-dir-diffs-buffer ediff-dir-difference-list nil (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) ediff-multifile-patch (ediff-multifile-patch) user-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 (#$ . 36268) nil]) #@73 Copy file described at point to directories where this file is missing. (defalias 'ediff-dir-diff-copy-file #[0 "\305!\306p\307#\211@A@\3108\3118\211\205 \211P\3128\211\205% \211P\3138\211\2051 \211P\314\211C \204= \315\316!\210\n\211\205N \317!\205N \320\317!!\262\203c r\nq\210 \262\211\n\240\210)\202m \321=\204m \315\f!\210\322\323\324\325\326\327\n $\330\"\331\332%\310B\311B\313BE\"\210\333!\203\276 \333!\203\276 \203\247 \333!\203\276 \334\335 !\335!\205\272 \335!#C\244\210\336 \337\"\207" [last-command-event ediff-meta-list ediff-dir-difference-list this-command ediff-KILLED-VITAL-BUFFER ediff-event-point ediff-get-meta-info noerror 2 3 4 5 nil error "No file suitable for copying described at this location" get-buffer buffer-name ediff-quit mapc make-byte-code 257 "\211@A\205M \306!\206M \307\310\311\301#!\205M \312\300\303\242\"\211A_\313\301\"\210\241\210\314\303\242\315 \"\210\316\317!\210\211\fU\204F \211 V\205K \302?\205K \320\303\242\"\266\202\207" vconcat vector [ediff-product-of-memcodes ediff-membership-code3 file-exists-p y-or-n-p format "Copy %s to %s? " assoc copy-file ediff-draw-dir-diffs buffer-name sit-for 0 delq] 8 "\n\n(fn OTHERFILE-STRUCT)" file-exists-p ediff-make-new-meta-list-element expand-file-name ediff-update-meta-buffer must-redraw] 23 (#$ . 36973) nil]) #@40 Go to the parent session group buffer. (defalias 'ediff-up-meta-hierarchy #[0 "\211\205 \302!\205 \303\302!!\262\203 \304 \"\207\305\306!\207" [ediff-parent-meta-buffer ediff-meta-session-number get-buffer buffer-name ediff-show-meta-buffer user-error "This session group has no parent"] 4 (#$ . 38342) nil]) #@25 (fn &optional IGNORE) (defalias 'ediff-redraw-registry-buffer #[256 "\211\205 \306!\205 \307\306!!\262\203\366rq\210`\310\211\211\211\211\211\211\211\211\211\211\311 \210\312\313\314\315\211\"\"\210\316\317!c\210\312\320\n\"\210\n\204B \321c\210\n\262\211\203\352\211@\262\n\211A\262 \211\205b \306!\205b \307\306!!\262\203E \211\205x \306!\205x \307\306!!\262\203\224 r q\210 \262\f\262 \205\220 \322=?)\202\236 \323=\204\241 \324,!\203\373 `\262\325\326\307\f!\327!#c\210\325\330\331\332@8\262!\331\333@8\262;\203\322 \333@8\262\202\323 \334!\331\335@8\262;\203\354 \335@8\262\202\355 \334!$c\210\336`\f#\210\202E \211\205\f\306!\205\f\307\306!!\262\203\262r q\210-\211\205'\306!\205'\307\306!!\262\2033\307-!\2024\337\262 .\211\205G\306!\205G\307\306!!\262\203S\307.!\202T\337\262/\204d0\204d\334\202\2021\211\205u\306!\205u\307\306!!\262\203\201\3071!\202\202\337\262\325\3402\"\2623\341U\203\226\342\202\25032U\203\242\343\202\250\325\3443T\"\2624\262)\202\275 \323=\204\275\324,!\210`\262\345\346\307!\325\347\327\n!\"\261\210\350 \351\n\351 \352\261\210\336`\f#\210\202E \353\310!\210\nb)\266\213)\207 \323=\206 \324,!\207" [ediff-registry-buffer buffer-read-only ediff-session-registry ediff-metajob-name ediff-meta-list this-command get-buffer buffer-name nil erase-buffer mapc delete-overlay overlays-in 1 substitute-command-keys "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 manual\n q: bury registry\n\n\n Active Ediff Sessions:\n ----------------------\n\n" #[257 "\211\211\205 \301!\205 \302\301!!\262?\205 \303\"\211\207" [ediff-session-registry get-buffer buffer-name delq] 5 "\n\n(fn ELT)"] " ******* 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 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] 21 (#$ . 38665)]) #@49 (fn B E PROP &optional SESSION-NUMBER HIDDEN) (defalias 'ediff-set-meta-overlay #[1283 "\300\301\"\262\302\303\304#\210\302\305#\210\302\306#\210\302\307\310#\210\247\205, \302\311#\207" [nil make-overlay ediff-overlay-put mouse-face highlight ediff-meta-info invisible follow-link t ediff-meta-session-number] 10 (#$ . 41253)]) #@65 Mark session for hiding. With prefix arg, unmark. (fn UNMARK) (defalias 'ediff-mark-for-hiding-at-pos #[257 "\301!\302!\303\"\304!\305\"\210\306\307!\210\212\310\311#)\207" [last-command-event ediff-event-point ediff-event-buffer ediff-get-meta-info ediff-get-session-number-at-pos ediff-mark-session-for-hiding ediff-next-meta-item 1 ediff-update-meta-buffer nil] 9 (#$ . 41605) "P"]) #@20 (fn INFO UNMARK) (defalias 'ediff-mark-session-for-hiding #[514 "\300\301=\203 \300\262\202% \211A@\262\302=\203 \303\262\202% \203% \303\262\211\204@ \2038 \300A\240\266\202@ \302A\240\266\210\207" [nil mark 72 t] 7 (#$ . 42009)]) #@76 Mark session for a group operation. With prefix arg, unmark. (fn UNMARK) (defalias 'ediff-mark-for-operation-at-pos #[257 "\301!\302!\303\"\304!\305\"\210\306\307!\210\212\310\311#)\207" [last-command-event ediff-event-point ediff-event-buffer ediff-get-meta-info ediff-get-session-number-at-pos ediff-mark-session-for-operation ediff-next-meta-item 1 ediff-update-meta-buffer nil] 9 (#$ . 42267) "P"]) #@20 (fn INFO UNMARK) (defalias 'ediff-mark-session-for-operation #[514 "\300\301=\203 \300\262\202% \211A@\262\302=\203 \303\262\202% \203% \303\262\211\204@ \2038 \300A\240\266\202@ \302A\240\266\210\207" [nil mark 42 t] 7 (#$ . 42688)]) #@62 Hide marked sessions. With prefix arg, unhide. (fn UNHIDE) (defalias 'ediff-hide-marked-sessions #[257 "\211@@\262A\203 \301\202 \302\203 \302\202 \301\303\304\211\211\203a @\262A\262\211\211@\262\262\211\211A@\262=\203 T\262\301=\203V \305!\203V \306\262\202 \211A\240\266\202 \303V\203p \307\310\"\210\202\203 \311 \210\203 \312\313!\210\202\203 \312\314!\210\205\212 \312\315!\207" [ediff-meta-list 73 72 0 nil buffer-live-p t ediff-update-meta-buffer must-redraw beep message "Nothing to reveal..." "Nothing to hide..." "Note: Ediff didn't hide active sessions!"] 13 (#$ . 42949) "P"]) #@18 (fn OPERATION) (defalias 'ediff-operate-on-marked-sessions #[257 "\211@@\262A\304\305\211 \306\211\203\221 @\262A\262T\262\211\211A@\262=\203< \212T\262\"\210)\202 \307!\203 \211\211@\262\211\262\211\205Y \310!\205Y \311\310!!\262\203 \211\205o \310!\205o \311\310!!\262\203\202 rq\210\312\n!)\202\213 \n\313=\206\213 \314 !\\\262\202 \315\316\"\210\207" [ediff-meta-list ediff-meta-diff-buffer this-command ediff-KILLED-VITAL-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] 14 (#$ . 43588)]) #@27 (fn SESSION SESSIONNUM) (defalias 'ediff-append-custom-diff #[514 "\306\211\206 \307>\262\204 \310\311!\210\211@\262 \306\211\211\205* \312!\205* \313\312!!\262\203b \211\205? \312!\205? \313\312!!\262\203X rq\210\n=\203T \314 \210 \262)\202b \f\315=\204b \310 !\210\211\205r \312!\205r \313\312!!\262\204{ \316\317!\210\211\211\205\213 \312!\205\213 \313\312!!\262\203\241 rq\210db\210\320!\210\321c)\202 \322>\203\347 r\323 !\211\262q\210\324 \210\325\326\327\330 ! \330\f\3318@\262!\330 \3328@\262!%\333\"\210)rq\210db\210\320!\210\321c)\202 \211\211\205\370 \312!\205\370 \313\312!!\262\205\334\312!!\266\316\335\"\207" [ediff-metajob-name ediff-meta-diff-buffer ediff-control-buffer ediff-custom-diff-buffer this-command ediff-KILLED-VITAL-BUFFER nil (ediff-directories ediff-merge-directories ediff-merge-directories-with-ancestor ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) error "Can't compute multifile patch in this context" get-buffer buffer-name ediff-compute-custom-diffs-maybe ediff-quit user-error "Ediff: something wrong--killed multiple diff's buffer" insert-buffer-substring "\n" (ediff-directories ediff-merge-directories ediff-merge-directories-with-ancestor) get-buffer-create erase-buffer shell-command format "%s %s %s %s" shell-quote-argument 2 3 t kill-buffer "Session %d compares versions of file. Such session must be active to enable multifile patch collection" ediff-tmp-buffer ediff-custom-diff-program ediff-custom-diff-options] 17 (#$ . 44234)]) #@301 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 #[0 "\n\211\205 \306!\205 \307\306!!\262\204 \310\311\312\313\"!\n\211\205. \306!\205. \307\306!!\262\203@ r\nq\210\314\315 \210)\202J \f\316=\204J \317 !\210\320\321!\322V\203\224 \323\n\324\"\210\n\211\205g \306!\205g \307\306!!\262\203z r\nq\210\325\314!\210\326)\202\204 \f\316=\204\204 \317 !\210\327\330!\205\232 r\nq\210\330 )\202\232 \331 \210\332\333!)\207" [ediff-coding-system-for-read coding-system-for-read ediff-meta-diff-buffer buffer-read-only this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*Ediff Multifile Diffs" "*" nil erase-buffer ediff-quit error ediff-operate-on-marked-sessions ediff-append-custom-diff 0 display-buffer not-this-window set-buffer-modified-p t fboundp diff-mode beep message "No marked sessions found"] 4 (#$ . 45835) nil]) #@63 Show the multi-file patch associated with this group session. (defalias 'ediff-meta-show-patch #[0 "\305!\306!\307\310# \211\211\205 \311!\205 \312\311!!\262\203w \211\211\2051 \311!\2051 \312\311!!\262\203k r\211q\210\214\204D ~\210\202T \3138@\262\3148@\262}\210\315\n!q\210\316 \210\317!\210eb\210\320\n\321\"*\202z \322=\206z \323\f!\202z \324\325!\207" [last-command-event ediff-meta-patchbufer ediff-tmp-buffer this-command ediff-KILLED-VITAL-BUFFER ediff-event-point ediff-event-buffer ediff-get-meta-info noerror get-buffer buffer-name 3 4 get-buffer-create erase-buffer insert-buffer-substring display-buffer not-this-window ediff-quit error user-error "The patch buffer wasn't found"] 8 (#$ . 47019) nil]) #@52 Execute appropriate action for a selected session. (defalias 'ediff-filegroup-action #[0 "\306!\307!\310\"\211\211@\262\311\"\312 \313\"\314\211\211\211\211\3158@\262\262\3168@\262\262\3178@\262\262\211A@\262\320=\203g \321 \210\322\323!\203c \314A\240\266\324\n\314 #\210\202g \325\326!\210 \211\205x \327!\205x \330\327!!\262\203Sr q\210\n\331@8\262\262\nb\210\332 !\203\357 \211\205\247 \327!\205\247 \330\327!!\262\203\263 \333!\202O\334;\203\302 \335\336\"\202\303 \337\314\340\312 \313\"$\262\341 \f\342\343\314\344\345\346 D\347\257\350\346D\351BBFD&\202O\314\211\211\206\366 \f\352>\262\206 \211\211\206\f\353=\205 \354\262\262\203g\314\211\206\f\355>\262\203g\356!\203g\211\2054\327!\2054\330\327!!\262\203@\333!\202O\334\337\314\340#\262\357 \f\342\343\314\344\345\346 D\347\257\350\346D\360BBFD%\202O\211\205x\327!\205x\330\327!!\262\203\261\211\205\216\327!\205\216\330\327!!\262\203\243rq\210\361 @\362\363!)\202OA\364=\206O\365B!\202O\366 !\203\321 \210\322\367!\203\370\342\343\314\371\372\343\314\373\374pD\333pEEE\375BBB\344\305p\347\257\344\376\211;\205\357\211\377\230?\262\205\377C\201D !QE\350\346D\201E BB\257D#\202O\325\326!\202O\314\211\211\206 \f\352>\262\2063\211\211\206+\f\353=\2051\354\262\262\203\213 \342\343\314\371\201F \343\314\373\374pD\333pEEE\201G BBB\344\305p\347\257\344\376 \211;\205i\211\377\230?\262\205y C\201D !QE\350\346D\201H BB\257D\"\202O\314\211\206\221\f\201I >\262\204\356 \342\343\314\371\201J \343\314\373\374pD\333pEEE\201K BBB\344\305p\347\257\344\376\211;\205\314\211\377\230?\262\205\334C\201D !QE\350\346D\201L BB\257D#\202O\314\211\206\364\f\201I >\262\205O \342\343\314\371\201M \343\314\373\374pD\333pEEE\201N BBB\344\376\211;\205(\211\377\230?\262\2058C\201D !QE\344\305p\347\257\350\346D\201O BB\257D$)\202^A\364=\206^\365B!\207" [last-command-event ediff-default-filtering-regexp ediff-meta-list ediff-session-action-function ediff-metajob-name ediff-meta-buffer ediff-event-point ediff-event-buffer ediff-get-meta-info ediff-get-session-number-at-pos eval t nil 2 3 4 73 beep y-or-n-p "This session is marked as hidden, unmark? " ediff-update-meta-buffer user-error "Aborted" get-buffer buffer-name 5 ediff-meta-session-p ediff-show-meta-buffer read-string format "Filter filenames through regular expression (default %s): " "Filter filenames through regular expression: " ediff-filtering-regexp-history ediff-directories-internal list lambda setq ediff-parent-meta-buffer quote ediff-meta-session-number setcar (ediff-meta-buffer) (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) ediff-multifile-patch (ediff-multifile-patch) (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) file-directory-p ediff-directory-revisions-internal (ediff-meta-buffer) mouse-pixel-position ediff-recenter no-rehighlight ediff-quit error ediff-problematic-session-p "This session has no ancestor. Merge without the ancestor? " ediff-merge-files add-hook 'ediff-after-quit-hook-internal if ediff-buffer-live-p (nil 'local) ediff-merge-store-file "" ediff-mouse-pixel-position this-command ediff-KILLED-VITAL-BUFFER ediff-merge-filename-prefix file-name-nondirectory (ediff-control-buffer) 'ediff-after-quit-hook-internal (nil 'local) (ediff-control-buffer) (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor ediff-directories3 ediff-filegroups3) 'ediff-after-quit-hook-internal (nil 'local) (ediff-control-buffer) 'ediff-after-quit-hook-internal (nil 'local) (ediff-control-buffer)] 27 (#$ . 47762) nil]) #@31 Switch to a selected session. (defalias 'ediff-registry-action #[0 "\304!\305!\306\"\211\211\205 \307!\205 \310\307!!\262\203\206 \211\211\205/ \307!\205/ \310\307!!\262\203A r\211q\210\311\312!)\313=\202J \314=\204M \315\n!\203U \316\317\"\210\202\220 \211\211\205e \307!\205e \310\307!!\262\203y r\211q\210\320 \321\322!\210)\202\220 \314=\204\220 \315\n!\210\202\220 \323 \210\324\325!\210\326 \210\211\205\240 \307!\205\240 \310\307!!\262\203\257 rq\210b)\202\270 \314=\206\270 \315\n!\207" [last-command-event this-command ediff-KILLED-VITAL-BUFFER ediff-mouse-pixel-position 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] 7 (#$ . 51585) nil]) #@72 Show the session group buffer. (fn &optional META-BUF SESSION-NUMBER) (defalias 'ediff-show-meta-buffer #[512 "\306\307!\210\310\211\211\203 \311\262\206 \262\312!\204\" \313\314!\210\202; \211\2052 \315!\2052 \316\315!!\262\204; \317\320!\210\247\203J \321\310#\210\202R \204R \322!\210\211\205b \315!\205b \316\315!!\262\203\373 rq\210\212\323!\211\262\203\212 \211\204} \324\325!\210\326\"\210\327!\210\202\367 \330 \211\262!\203\240 \326 \"\210\327!\210\202\367 \330\n\211\262!\203\266 \326\n\"\210\327!\210\202\367 \330 \211\262!\203\314 \326 \"\210\327!\210\202\367 \323\f!\211\262\203\354 \331 \203\354 \327!\210\332\333!\210\326\334 \"\210\202\367 \335\336!\210\326\334 \"\210*\202 \337=\204\317&!\210\331 \203$\330\323!\211\262!\203$\340!\262\341!\210\342!\210\343\344!\210\306\345!\207" [ediff-meta-buffer ediff-window-C ediff-window-A ediff-window-B ediff-registry-buffer this-command run-hooks ediff-before-directory-setup-hooks nil t bufferp user-error "This Ediff session is not part of a session group" get-buffer buffer-name error "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 sit-for 0 ediff-show-session-group-hook ediff-KILLED-VITAL-BUFFER] 9 (#$ . 52515) nil]) (defalias 'ediff-show-current-session-meta-buffer #[0 "\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 #[0 "\303!\304!\305\"\211\211\211\205 \306!\205 \307\306!!\262\203, r\211q\210\310\311\312\")\2025 \313=\2065 \314\n!\207" [last-command-event this-command ediff-KILLED-VITAL-BUFFER ediff-event-point ediff-event-buffer ediff-get-meta-info get-buffer buffer-name ediff-show-meta-buffer nil t ediff-quit error] 8 (#$ . 54262) nil]) #@27 Display Ediff's registry. (defalias 'ediff-show-registry #[0 "\306 \210\211\205 \307!\205 \310\307!!\262\204 \311\312!\210\313\211\211\205. \307!\205. \310\307!!\262\203\264 rq\210\212\314!\211\262\203Q \315\316!\210\317\"\210\320!\210\202\260 \321 !\203c \317 \"\210\320 !\210\202\260 \321\n!\203u \317\n\"\210\320\n!\210\202\260 \321 !\203\207 \317 \"\210\320 !\210\202\260 \314\f!\211\262\203\246 \322 \203\246 \320!\210\323\324!\210\317\325 \"\210\202\260 \326\327!\210\317\325 \"\210*\202\277 \330=\204\277 \331 !\210\322 \203\323 \332\314!!\262\333!\210\334!\210\335\336!\207" [ediff-registry-buffer ediff-window-C ediff-window-A ediff-window-B ediff-meta-buffer this-command ediff-update-registry get-buffer buffer-name user-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 error window-frame raise-frame ediff-reset-mouse run-hooks ediff-show-registry-hook ediff-KILLED-VITAL-BUFFER] 6 (#$ . 54717) nil]) (defalias 'eregistry 'ediff-show-registry) #@54 (fn META-BUF &optional MUST-REDRAW SESSION-NUMBER) (defalias 'ediff-update-meta-buffer #[769 "\211\205 \304!\205 \305\304!!\262\205r \211\205% \304!\205% \305\304!!\262\203i rq\210\306\203: !\210\202J \247\203F \307!\210\202J \310 !\210\311`!\262\211\205e \312\313\"\205e \314 \210\311`!\262\202O \262)\207\n\315=\206r \316 !\207" [ediff-meta-redraw-function ediff-meta-list this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name nil ediff-update-session-marker-in-dir-meta-buffer ediff-update-markers-in-dir-meta-buffer ediff-get-meta-overlay-at-pos overlay-get invisible ediff-next-meta-item1 ediff-quit error] 7 (#$ . 55954)]) (defalias 'ediff-update-registry #[0 "p\211\205 \304!\205 \305\304!!\262\203< rpq\210\211\205) \304!\205) \305\304!!\262\2033 \306 \202: \307\310 \311\306\312%)\207\n\313=\206E \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]) #@20 (fn META-BUFFER) (defalias 'ediff-cleanup-meta-buffer #[257 "\211\211\205 \304!\205 \305\304!!\262\205W \211\211\205% \304!\205% \305\304!!\262\203N r\211q\210\306!\210\211\205B \304!\205B \305\304!!\262\205L \306\307 #)\207\n\310=\206W \311 !\207" [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] 5 (#$ . 57057)]) #@20 (fn META-BUFFER) (defalias 'ediff-safe-to-quit #[257 "\211\211\205 \304!\205 \305\304!!\262\205s \306\307\211\205) \304!\205) \305\304!!\262\203g rq\210A\262\211\203b \203b \211@@\262\211\205S \304!\205S \305\304!!\262\203[ \307\262A\262\2026 )\211\202p \n\310=\206p \311 !)\266\202\207" [ediff-meta-list buffer-read-only this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name t nil ediff-quit error] 7 (#$ . 57506)]) #@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 #[0 "p \n \f=\211\203 \305 \210\202\235 \306!\203/ \307\310!\203/ \311\312!\210\313\314!\210\315!\210\202@ \306!\203< \305 \210\202@ \316\317!\210\320\321#\210\211\211\205W \322!\205W \323\322!!\262\205a \324\322!!\266\211\211\205t \322!\205t \323\322!!\262\205~ \324\322!!\266\211\205\220 \322!\205\220 \323\322!!\262\203\235 \325\262\326\"\210\211\206\243 \327 \207" [ediff-dir-diffs-buffer ediff-meta-diff-buffer ediff-meta-session-number ediff-parent-meta-buffer ediff-registry-buffer 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] 11 (#$ . 57963) nil]) #@12 (fn BUF) (defalias 'ediff-dispose-of-meta-buffer #[257 "\304\"\211\211\205 \305!\205 \306\305!!\262\203; r\211q\210 \211\205. \305!\205. \306\305!!\262\2037 \307 !\210)\202E \n\310=\204E \311 !\210\307!\207" [ediff-session-registry ediff-dir-diffs-buffer this-command ediff-KILLED-VITAL-BUFFER delq get-buffer buffer-name kill-buffer ediff-quit error] 5 (#$ . 59086)]) #@36 (fn BUF POINT &optional NOERROR) (defalias 'ediff-get-meta-info #[770 "\302\211\203_ \211\205 \303!\205 \304\303!!\262\203_ \211\205+ \303!\205+ \304\303!!\262\203U rq\210\305\306\307!\"\262\211\203M \211@\204M \211A\262\202= \211@\262)\202_ \310=\204_ \311 !\210\206n ?\205n \312 \210\313\314!\207" [this-command ediff-KILLED-VITAL-BUFFER nil get-buffer buffer-name mapcar #[257 "\300\301\"?\205\f \300\302\"\207" [overlay-get invisible ediff-meta-info] 4 "\n\n(fn ELT)"] overlays-at ediff-quit error ediff-update-registry user-error "No session info in this line"] 9 (#$ . 59475)]) #@14 (fn POINT) (defalias 'ediff-get-meta-overlay-at-pos #[257 "\300!\211@\211\203 \301\302\"\204 A\262@\262\202 \207" [overlays-at overlay-get ediff-meta-info] 6 (#$ . 60089)]) #@36 (fn POINT &optional META-BUFFER) (defalias 'ediff-get-session-number-at-pos #[513 "\211\211\205 \302!\205 \303\302!!\262\203 \211\202 p\262\211\211\205, \302!\205, \303\302!!\262\203= r\211q\210\304\305!\306\")\207\307=\206F \310 !\207" [this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name overlay-get ediff-get-meta-overlay-at-pos ediff-meta-session-number ediff-quit error] 6 (#$ . 60279)]) #@14 (fn POINT) (defalias 'ediff-next-meta-overlay-start #[257 "m\203 eb\207\300!\211\203 \301!\202 \302!\207" [ediff-get-meta-overlay-at-pos overlay-end next-overlay-change] 4 (#$ . 60703)]) #@14 (fn POINT) (defalias 'ediff-previous-meta-overlay-start #[257 "o\203 db\207\300!\211\203 \301!\262o\204 S\262\302!\262\303!@\204* e\262\207" [ediff-get-meta-overlay-at-pos overlay-start previous-overlay-change overlays-at] 4 (#$ . 60904)]) (autoload 'ediff-patch-file-internal "ediff-ptch") #@37 (fn FILE &optional STARTUP-HOOKS) (defalias 'ediff-patch-file-form-meta #[513 "\304!\305!\306\" \307\211\211\310 !\204 \311\312\n\"\203% \313\314\315 !\"\210\211@\262\262\3168@\262\262\3178@\262\262\211\205N \320!\205N \321\320!!\262\204[ \203[ \322\323!\210\211\205k \320!\205k \321\320!!\262\203\206 rq\210\214~\210}\210\324\n\n#*\202\217 \n\325=\206\217 \322 !\207" [last-command-event ediff-meta-patchbufer this-command ediff-KILLED-VITAL-BUFFER ediff-event-point ediff-event-buffer ediff-get-meta-info nil file-directory-p string-match "/dev/null" user-error "`%s' is not an ordinary file" file-name-as-directory 3 4 get-buffer buffer-name error "Patch has already been applied to this file -- can't repeat!" ediff-patch-file-internal ediff-quit] 13 (#$ . 61216)]) #@43 Unmark all sessions marked for operation. (defalias 'ediff-unmark-all-for-operation #[0 "A\301@\211\262\203 \302\303\"\210A\262\202 \266\304p\305\"\207" [ediff-meta-list nil ediff-mark-session-for-operation unmark ediff-update-meta-buffer must-redraw] 5 (#$ . 62028) nil]) #@40 Unmark all sessions marked for hiding. (defalias 'ediff-unmark-all-for-hiding #[0 "A\301@\211\262\203 \302\303\"\210A\262\202 \266\304p\305\"\207" [ediff-meta-list nil ediff-mark-session-for-hiding unmark ediff-update-meta-buffer must-redraw] 5 (#$ . 62316) nil]) #@372 Run through the session list and mark identical files. This is used only for sessions that involve 2 or 3 files at the same time. ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark for operation, or simply indicate which are equal files. If it is nil, then `last-command-event' is used to decide which action to take. (fn &optional ACTION) (defalias 'ediff-meta-mark-equal-files #[256 "\211\204 \262 A\304\211\211\211\211\211\211\305\306!\210@\211\262\203\252 \211\3078\262\262\211\3108\262\262\211\3118\262\262\304A\240\266\304A\240\266\304A\240\266\312\262\312\262\312\262\313\"\204` \304\262\304\211\206f \n\314>\262\203\201 \313\"\204w \304\262\313\"\204\201 \304\262\203\242 \203\242 \203\242 \315\267\202\242 \316\317\"\210\202\242 \320\317\"\210A\262\202 \305\321!\266 \304\322p\323\"\207" [last-command-event ediff-meta-list ediff-metajob-name ediff-recurse-to-subdirectories nil message "Comparing files..." 2 3 4 t ediff-mark-if-equal (ediff-merge-directories-with-ancestor ediff-merge-filegroups-with-ancestor ediff-directories3 ediff-filegroups3) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (104 149 109 157)) ediff-mark-session-for-hiding mark ediff-mark-session-for-operation "Comparing files... Done" ediff-update-meta-buffer must-redraw] 13 (#$ . 62596) nil]) #@28 (fn FILEINFO1 FILEINFO2) (defalias 'ediff-mark-if-equal #[514 "@@;\205% \211;\205% \300\"\205% \301A\240\266\301A\240\266\202\207" [ediff-same-contents t] 8 (#$ . 64003)]) (provide 'ediff-mult)
Close
