ikan Uploader :
Directory : /usr/share/emacs/25.2/lisp/vc/
Upload File : |
| Current File : //usr/share/emacs/25.2/lisp/vc/ediff-mult.elc |
;ELC
;;; Compiled
;;; in Emacs version 25.2.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!\210\302\301\303\304\305\306\307\310&\210\311\312!\210\311\313!\210\311\314!\210\311\315!\207" [provide ediff-mult custom-declare-group 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 (#$ . 708))
(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 (#$ . 876))
(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 (#$ . 1932))
(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) (#$ . 2141))
#@2
(defvar ediff-meta-action-function nil (#$ . 2297))
(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 (#$ . 2484))
(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 (#$ . 2671))
(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 (#$ . 2864))
(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 (#$ . 3035))
(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 (#$ . 3214))
(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 (#$ . 3411))
#@161 The default regular expression used as a filename filter in multifile comparisons.
Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil.
(custom-declare-variable 'ediff-default-filtering-regexp nil '(#$ . 3475) :type 'sexp :risky t :group 'ediff-mult)
#@2
(defvar ediff-meta-list nil (#$ . 3755))
(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 (#$ . 3920))
(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 (#$ . 4105))
(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 (#$ . 4290))
(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\304\305\306\307&\210\300\310\311\312\304\313\306\307&\210\300\314\311\315\304\313\306\307&\210\300\316\311\317\304\313\306\320&\210\300\321\311\322\304\313\306\307&\210\300\323\311\324\304\313\306\307&\210\300\325\311\326\304\313\306\307&\210\300\327\330\331\304\313\306\307&\210\300\332\311\333\304\313\306\307&\207" [custom-declare-variable ediff-meta-truncate-filenames t "If non-nil, truncate long file names in the session group buffers.\nThis can be toggled with `ediff-toggle-filename-truncation'." :type boolean :group ediff-mult ediff-meta-mode-hook nil "Hooks run just after setting up meta mode." hook ediff-registry-setup-hook "Hooks run just after the registry control panel is set up." ediff-before-session-group-setup-hooks "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'." ediff-hook ediff-after-session-group-setup-hook "Hooks run just after a meta-buffer controlling a session group, such as\nediff-directories, is run." ediff-quit-session-group-hook "Hooks run just before exiting a session group." ediff-show-registry-hook "Hooks run just after the registry buffer is shown." ediff-show-session-group-hook '(delete-other-windows) "Hooks run just after a session group buffer is shown." ediff-meta-buffer-keymap-setup-hook "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 (#$ . 6244))
(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-group-comparison-func #[(meta-list) "\301@8\207" [meta-list 6] 2])
(put 'ediff-get-group-comparison-func '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-make-new-meta-list-element #[(obj1 obj2 obj3) "\303\211\303D \303D\n\303D\257\207" [obj1 obj2 obj3 nil] 6])
(defalias 'ediff-make-new-meta-list-header #[(regexp objA objB objC merge-auto-store-dir comparison-func) " \n \f
\257\207" [regexp objA objB objC merge-auto-store-dir comparison-func] 6])
(defalias 'ediff-get-session-activity-marker #[(session) "\211@)\211\204 \304\202( \n\211\205 \305 !\205 \306\305 !!)\203' \307\202( \310)\207" [session elt session-buf 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])
#@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 (#$ . 9912))
(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 #[nil "?\301p\302\"\207" [ediff-verbose-help-enabled ediff-update-meta-buffer must-redraw] 3 (#$ . 10222) nil])
(defalias 'ediff-setup-meta-map #[nil "\306 \307!\210\310\311\312#\210\310\313\314#\210\310\315\316#\210\310\317\320#\210\310\321\322#\210\310\323 #\210\310\324 #\210\310\325\326#\210\310\327\326#\210\310\330\331#\210\310\332\331#\210\310\333\331#\210\310\334\331#\210\306\335!\310\336\335\nB#\210\310\n\337\340#\210\310\n\341\342#\210\310\n\343\344#\210\310\n\345\346#\210\347\211\211\206\202 \f\350>)\206\222 \211\206\217 \f\351>))\204\256 \310\352\347#\210\310\353\354#\210\310\355\354#\210\310\356\354#\210\310\n\357\360#\210\310\n\361\362#\210)
\203\305 \310\363\331#\210\310\364 #\210\365!\210\366\367!\207" [ediff-meta-buffer-map ediff-meta-action-function menu-map metajob 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-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])
#@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\305\306!\207" [major-mode mode-name kill-all-local-variables ediff-meta-mode "MetaEdiff" run-hooks ediff-meta-mode-hook] 2 (#$ . 12618)])
(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\314#\210\302\315\314#\210\302\316\311#\210\302\317\311#\207" [ediff-dir-diffs-buffer-map 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]] 4)
#@141 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\2051 S\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 (#$ . 13709) "p"])
(defalias 'ediff-next-meta-item1 #[nil "\302\303`!\211\203
b\210 \304=\203) \305p\306#\2053 \307\310\302\311#\2053 \312\302x\2023 \313\302w\314V\2053 \315u)\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 -1] 5])
#@145 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\2051 S\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 (#$ . 14463) "p"])
(defalias 'ediff-previous-meta-item1 #[nil "\302\303`!\211\203
b\210 \304=\203) \305p\306#\2053 \307\310\302\311#\2053 \312\302x\2023 \313\302w\314V\2053 \315u)\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 -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 (#$ . 15458) 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))
(defalias 'ediff-intersect-directories #[(jobname regexp dir1 dir2 &optional dir3 merge-autostore-dir comparison-func) "\206 \306\307\211\211\211\211\211\211\211\211 !\310\"!\311
\307##!\312\313!\"!\312\314!\"!\315\316!\"!\310$!\311\f\307## \312\313 \" \312\314 \" \315\317 \" %;\203\210 \310%!\311 \307## \312\313 \" \312\314 \" \315\320 \" &\211 ';\205\226 '\321\230?)\203\240 \310&!&\322! # \203\307 (\211 )\206\270 *\323>)\203\307 \322 # \324\325 !\326\" \327\330\211! # # #\312\313 \"\324\325\312\314 \"!\326\"\315\331 \"\332\333 \"\210\334#
\f && B\334#
\f &&\315\335 \"B\211 . B\207" [comparison-func difflist common-part auxdir3 auxdir2 auxdir1 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] mapc #[(elt) "@ \235\203 \211A\n_\241\210@ \235\203 \211A\f_\241\210@
\235\205* \211A_\241\207" [elt lis1 ediff-membership-code1 lis2 ediff-membership-code2 lis3 ediff-membership-code3] 3] ediff-make-new-meta-list-header #[(elt) "\306\307 P!\307\n P! \2053 \f \310
P!\203# \311
!\202$
*\312\f P!\2053 \307\f P!#\207" [auxdir1 elt auxdir2 lis3 auxdir3 file ediff-make-new-meta-list-element expand-file-name file-directory-p file-name-as-directory file-exists-p dir] 6] common lis3 lis2 lis1 dir1 regexp dir2 dir3 merge-autostore-dir string jobname metajob ediff-metajob-name] 10])
(defalias 'ediff-get-directory-files-under-revision #[(jobname regexp dir1 &optional merge-autostore-dir) "\306\211\211\211\307\f!\310\306
# \211 ;\205 \311\230?)\203* \307 ! \203\222 @ A\312\nP!\203\\ \n \312 P!\203S \307 !\202U * B\202* \313\314!\203q \315\nP!\203q \n B\202* \316\n\317Q!\203\201 \n B\202* \316\320\n\317R!\203* \n B\202* \321\322 \"\321\323 \"\321\324 \"\321\325 \"\326\327 !\330\"\331
\306\211 \306&\332\333 \",B\207" [auxdir1 common elt lis1 dir1 regexp 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 #[(elt) "\302\303 P!\304\211#\207" [auxdir1 elt ediff-make-new-meta-list-element expand-file-name nil] 4] merge-autostore-dir string file dir] 8])
(defalias 'ediff-prepare-meta-buffer #[(action-func meta-list meta-buffer-name redraw-function jobname &optional startup-hooks) "\306\307\"\310!\211\211\205 \311\n!\205 \312\311\n!!)\203pr q\210\313 \210
@AB C\314 \210B\315=\203L DEF\316G\317\320#\210\202W E@BEABF D=\204d HBH
F!\210\321I\322\323!\210\324\325!\210 \326=\203V J@BJABJA\211 K\211 K\206\222 B\327>)\206\245 K\211 K\206\242 B\330>))\204\256 \331J!\210\316G\332\333#\210\316G\334\335#\210\316G\336\337#\210\316G\340\323#\210\316G\341\342#\210\316G\343\344#\210\316G\345\346#\210\316G\347\350#\210\316G\351\352#\210\316G\353\354#\210\316G\355\356#\210A\211 K\206B\357>)\203 \316G\360\361#\210\316G\362\363#\210\202:A\211 K\206&B\364>)\203:\316G\365\366#\210\316G\362\367#\210\316G\370\371#\210\316G\372\373#\210\316G\374\375#\210\316G\376\377#\210B\315=\203f\324\201N !\210\202l\324\201O !\210)\202\200L\201P =\204\200\201Q M!\210 *\207" [meta-buffer-name meta-buffer buf action-func ediff-meta-action-function 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 t set-buffer-modified-p nil run-hooks startup-hooks ediff-filegroup-action (ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor) (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] (menu-item "Diff directories" ediff-show-dir-diffs :help "Display differences among the directories involved in session group") ediff-meta-redraw-function 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 ediff-registry-setup-hook ediff-after-session-group-setup-hook ediff-quit error] 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$ \315 !)b\210`f
=?\2059
c\210\316\317!\210\320\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 delete-char 1 set-buffer-modified-p] 3])
(defalias 'ediff-replace-session-status-in-meta-buffer #[(point new-status) "\306!\307 \310\"\211\211A@) \311 \206 \f\206 \312 \313 !\205) \314 !)b\210\315u\210`f=?\205C c\210\316\315!\210\317\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 1 delete-char set-buffer-modified-p new-status] 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 .\211 /\205/ \311/!\205/ \312\311/!!)\203er.q\210`\313 \210\314\315\316\317\211\"\"\210\211@A@)+\320@8)0\203\264 \3211\3222!\"c\210\310 32\323>)\203v \324c\210\202\204 \310 32\325>)\203\204 \326c\210\327c\210\310\211 3\211 3\206\223 2\330>)\206\246 3\211 3\206\243 2\331>))\204\276 \332\333\334\335\261\210\202\276 \3214\3222!\"c\210\336c\210+;\203\326 +G\307V\203\326 \321\337+\"c\210\340!\2105\203\310 32\341>)\203\f\211 6;\205\367 6\342\230?)\203\321\343\f\"c\210\344c\210A\211\211\203--\203-\n@\203&\n@\211 A@)\345=\204&\310-\nA\211\204
-\2035\346c\210\203X@A,T,
\211 A@)\345=\2045\347
,\"\210\2025\350\310!\210 b\210.)\202p7\351=\206p\3528!. \207" [meta-list buffer-read-only tmp-list point merge-autostore-dir elt 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) " 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 regexp sessionNum empty meta-buf buf ediff-verbose-help-enabled ediff-meta-buffer-verbose-message ediff-metajob-name metajob ediff-meta-buffer-brief-message ediff-autostore-merges string this-command ediff-KILLED-VITAL-BUFFER] 10])
(defalias 'ediff-update-markers-in-dir-meta-buffer #[(meta-list) "\211@@)\306\211\211\211 \211 \211 \205# \307!\205# \310\307!!)\203\241 r
q\210`eb\210\311 \210o\204\226 \312
`\313#\314`!\f\203\220 \f\211 A@)\315=\203^ \n\203\220 \316\n\317\320#\210\202\220 \f\211 A@)\321=\203~ \n\203~ \322\n\317\"\203~ \316\n\317\306#\210\202\220 \323`\324\f!\"\210\325`\f\211 A@)\"\210\311 \210\2023 \326\306!\210 b\210)\202\255 \327=\204\255 \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 buf elt this-command ediff-KILLED-VITAL-BUFFER] 6])
(defalias 'ediff-update-session-marker-in-dir-meta-buffer #[(session-num) "\306\211\211\211\307 \310 @ A\"\311\306\312\313 \"\"@\211\204$ \314\315\f\"\210\316 \317\" \320 !\2054 \321 !)b\210\322`\323\n!\"\210\324`\n\211 A@)\"\210,\325 \207" [buffer-read-only overl session-info buffer-meta-overlays session-num elt nil 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 ediff-replace-session-activity-marker-in-meta-buffer ediff-get-session-activity-marker ediff-replace-session-status-in-meta-buffer ediff-next-meta-item1] 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 !\203S \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-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 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")) (#$ . 29743))
(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 &optional buf-name) "\204 \306\307!\210 \206 \310\311\312\"\211@A@)\313\314\n@8)! \313\315\n@8)! \316\n@8)\211 7;\205? \3137! 7\211@@) 8\317\320\321\" 9\322\211 : ;\322\211 < =A\323 !\211>\211 ?\205w \324?!\205w \325\324?!!)\203r>q\210`<\326@!\210\327 \2108A\330c\210\331c\210\332\333\f\"c\210
\203\245 \332\334
\"c\2107\203\261 \332\3357\"c\210 ;\203\303 G\336V\203\303 \332\337 \"c\210\340c\210\332\341\342\343#c\2107\203\333 \332\344\345\"c\210\202\336 \340c\210\332\3469\211#c\2107;\203\366 \332\3479\"c\210\202\371 \350c\210\204 \351c\210\203\367@@:@A;A\352;B\"\336U\203S` C\332\353\354\313\355\f:P!\2033\356:!\2025:!\357\"\"c\210\360C`8:\f:P\f
7\257#\210)\202Y\332\353\361\"c\210\352;D\"\336U\203\233` C\332\362\354\313\355
:P!\203{\356:!\202}:!\357\"\"c\210\360C`8:
:P\f
7\257#\210)\202\241\332\362\361\"c\2107;\203\361\352;E\"\336U\203\353` C\332\363\354\313\3557:P!\203\312\356:!\202\314:!\357\"\"c\210\360C`8:7:P\f
7\257#\210)\202\361\332\363\361\"c\210\340c\210\202 \364=\365\322!\210<b)\202F\366=\206\306G!. \207" [diff-list buf-name meta-list regexp dir1 dir2 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 dir3 meta-buf underline file membership-code saved-point buffer-read-only ediff-dir-diffs-buffer buf ediff-dir-diffs-buffer-map ediff-meta-buffer ediff-membership-code1 beg ediff-membership-code2 ediff-membership-code3 this-command ediff-KILLED-VITAL-BUFFER] 10])
#@73 Bury the directory difference buffer. Display the meta buffer instead.
(defalias 'ediff-bury-dir-diffs-buffer #[nil "\304 \211\211\205 \305\n!\205 \306\305\n!!)\205 \307\305\n!!)\210\310\n!\211\2030 \311 !\2025 \312\313 \n\"*\207" [ediff-meta-buffer wind buf ediff-dir-diffs-buffer nil get-buffer buffer-name kill-buffer ediff-get-visible-buffer-window select-window set-window-buffer selected-window] 4 (#$ . 33189) nil])
#@70 Display differences among the directories involved in session group.
(defalias 'ediff-show-dir-diffs #[nil "\305\211\211\206 \306>)\206 \211\206 \307>))\203! \310\311!\210\n\211\2052 \312 !\2052 \313\312 !!)\204: \314\f!\210\n\315\316!\210\317\320 \"\210eb)\207" [metajob ediff-metajob-name ediff-dir-diffs-buffer buf ediff-dir-difference-list 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 (#$ . 33628) nil])
#@73 Copy file described at point to directories where this file is missing.
(defalias 'ediff-dir-diff-copy-file #[nil "\306!\307p \310#\211@\nA@ \311\n8 \312\n8\211 \205\" \fP \313\n8\211 \2051 \fP \314\n8\211 \205@ \fP \315\211 !\n\204P \316\317!\210 \211 \"\205d \320\"!\205d \321\320\"!!)\203x r q\210# $!)\202\204 %\322=\204\204 \316&!\210\323\324\311B \312B \314BE\"\210\325!\203\307 \325 !\203\307 \203\257 \325 !\203\307 \326\327!\327 ! \205\303 \327 !#C\244\210\330 \331\".
\207" [last-command-event pos info meta-buf file-tail file-abs 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 #[(otherfile-struct) "@A\211\205W \306\n!\206W \307\310\311 \n#!\205W \312\f
\"\211 A _ \313 \n\"\210\241\210\314
\315 \"\210\316\317!\210U\204Q V\205V ?\205V \320
\"**\207" [otherfile-struct file-mem-code otherfile file-abs file-tail dir-diff-list 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 file-diff-record new-mem-code ediff-product-of-memcodes ediff-membership-code3 otherfile3] 6] file-exists-p ediff-make-new-meta-list-element expand-file-name ediff-update-meta-buffer must-redraw otherdir1 otherfile1 otherdir2 otherfile2 otherdir3 otherfile3 meta-list dir-diff-list buf ediff-meta-list ediff-dir-difference-list this-command ediff-KILLED-VITAL-BUFFER] 7 (#$ . 34299) nil])
#@40 Go to the parent session group buffer.
(defalias 'ediff-up-meta-hierarchy #[nil "\211\205 \303 !\205 \304\303 !!)\203 \305\n\"\207\306\307!\207" [ediff-parent-meta-buffer buf ediff-meta-session-number get-buffer buffer-name ediff-show-meta-buffer error "This session group has no parent"] 4 (#$ . 35822) nil])
(defalias 'ediff-redraw-registry-buffer #[(&optional _ignore) "\211\205 \306 !\205 \307\306 !!)\203\nrq\210`\310\211\211\211\211\211\211\211\211\211\211 , - . / 0 1 2 3\311 \210\312\313\314\315\211\"\"\210\316\317!c\210\312\3204\"\2104\204W \321c\2104 \203 @2 A2\211\205w \306 !\205w \307\306 !!)\203Z 2\211\205\215 \306 !\205\215 \307\306 !!)\203\252 r2q\210565\205\246 5\322=?)\202\265 7\323=\204\270 \3248!\203`,\325\326\3072!\327
!#c\210\325\330\331\f \332\f@8)!\331\f \333\f@8);\203\350 \f \333\f@8)\202\351 \334!\331\f \335\f@8);\203 \f \335\f@8)\202\334!$c\210\336,`2#\210\202Z 2\211\205\"\306 !\205\"\307\306 !!)\203\306r2q\2109\211\205=\306 !\205=\307\306 !!)\203H\3079!\202I\3371:\211\205]\306 !\205]\307\306 !!)\203h\307:!\202i\3370;\204y<\204y\334\202\227=\211\205\213\306 !\205\213\307\306 !!)\203\226\307=!\202\227\337/\325\340>\"-?\341U\203\253\342\202\275?>U\203\267\343\202\275\325\344?T\".@)\202\3227\323=\204\322\3248!\210`,.\345-\346\3072!\325\347\327
!\"\261\210\3501\3510\351/\352\261\210\336,`2#\210\202Z \353\310!\2103b.
\2077\323=\206\3248!\207" [ediff-registry-buffer buf buffer-read-only registry-list meta-list job-name 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" #[(elt) "\211\205 \303 !\205 \304\303 !!)?\205 \305\n\"\211\207" [elt buf ediff-session-registry get-buffer buffer-name delq] 4] " ******* 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 pt total-diffs cur-diff bufCname bufBname bufAname elt point 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] 13])
(defalias 'ediff-set-meta-overlay #[(b e prop &optional session-number hidden) "\306\307 \n\"\310\311\312#\210\310\313 #\210\310\314\f#\210\310\315\316#\210
\247\205) \310\317
#)\207" [overl b e prop hidden session-number nil ediff-make-overlay ediff-overlay-put mouse-face highlight ediff-meta-info invisible follow-link t ediff-meta-session-number] 4])
#@52 Mark session for hiding. With prefix arg, unmark.
(defalias 'ediff-mark-for-hiding-at-pos #[(unmark) "\306!\307!\310\n \"\311 ! \312
\"\210\313\314!\210\212\315\n\316\f#-\207" [last-command-event pos meta-buf info session-number unmark 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] 4 (#$ . 39083) "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])
#@63 Mark session for a group operation. With prefix arg, unmark.
(defalias 'ediff-mark-for-operation-at-pos #[(unmark) "\306!\307!\310\n \"\311 ! \312
\"\210\313\314!\210\212\315\n\316\f#-\207" [last-command-event pos meta-buf info session-number unmark 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] 4 (#$ . 39823) "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 \211 A\f\240*\210\202B \n\310 \211 A\f\240*\210) \207" [ignore unmark info elt new-status session-info nil mark 42 t] 3])
#@49 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* \211 A\240*\210\202* \310V\203~ \314\315\"\210\202\220 \316 \210\n\203\214 \317\320!\210\202\220 \317\321!\210
\205\227 \317\322!.\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 must-redraw 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 (#$ . 40558) "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\211 \205f \312!\205f \313\312!!)\203 \f\211 \205\200 \312!\205\200 \313\312!!)\203\222 r\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 buf this-command ediff-KILLED-VITAL-BUFFER] 9])
(defalias 'ediff-append-custom-diff #[(session sessionNum) "\306 \307>)\204
\310\311!\210\n\211@)\f \306\211 \211 \211 \2052 \312 !\2052 \313\312 !!)\203r \211 \205K \312 !\205K \313\312 !!)\203f r q\210! =\203b \314 \210\")\202r #\315=\204r \310$!\210 \211 \205\207 \312 !\205\207 \313\312 !!)\204\217 \310\316!\210
\211 \205\243 \312 !\205\243 \313\312 !!)\203\271 r q\210db\210\317
!\210\320c)\202(\321>\203\377 r\322%!\211 q\210\323 \210\324\325\326\327&!'\327\n\330 8@)!\327\n\331 8@)!%\332\"\210)r q\210db\210\317 !\210\320c)\202( \211 \211 \205\312 !\205\313\312 !!)\205!\333\312 !!)\210\310\334(\"-\207" [metajob ediff-metajob-name session elt ediff-meta-diff-buffer custom-diff-buf 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 "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" tmp-buf meta-diff-buff session-buf 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] 10])
#@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 #[nil "\n\211\205 \306 !\205 \307\306 !!)\204 \310\311\312\313\"!\n\211\205/ \306 !\205/ \307\306 !!)\203@ r\nq\210\314\315 \210)\202K
\316=\204K \317 !\210\320\321!\322V\203\226 \323\n\324\"\210\n\211\205i \306 !\205i \307\306 !!)\203{ r\nq\210\325\314!\210\326)\202\206
\316=\204\206 \317 !\210\327\330!\205\234 r\nq\210\330 )\202\234 \331 \210\332\333!)\207" [ediff-coding-system-for-read coding-system-for-read ediff-meta-diff-buffer buf buffer-read-only this-command 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" ediff-KILLED-VITAL-BUFFER] 5 (#$ . 43626) 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 \211 \205$ \312!\205$ \313\312!!)\203\211
\211 \205< \312!\205< \313\312!!)\203{ r
q\210\214 \204N ~\210\202b \3148@) \3158@)}\210\316!q\210\317 \210\320
!\210eb\210\321\322\"*\202\214 \323=\206\214 \324!\202\214 \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-substring display-buffer not-this-window ediff-quit error "The patch buffer wasn't found" buf elt ediff-tmp-buffer this-command ediff-KILLED-VITAL-BUFFER] 5 (#$ . 44807) nil])
#@52 Execute appropriate action for a selected session.
(defalias 'ediff-filegroup-action #[nil "\306!\307!\310\n \"\211\211 @) \311 \n\" @\312A! B\313\211 C D\313\211 E F\313 G \314\f8@)D \315\f8@)E \316\f8@)F \211 A@)\317>\203x \320 \210\321\322!\203t \313 H\211 IAH\240*\210\323\n\313@#\210\202x \324\325!\210\n\211 J\205\214 \326J!\205\214 \327\326J!!)\203xr\nq\210K L\330L@8)C b\210\331 !\203
\211 J\205\275 \326J!\205\275 \327\326J!!)\203\307 \332
!\202t\333B;\203\326 \334\335B\"\202\327 \336\313\337\312A!$G\340DEFGMN\341\342\313\343\344\345;D\346@\257\347\345 D\350BBFD&\202t\313\211 O\211 O\206N\351>)\206(O\211 O\206%N\352>))\203\207\313 ON\353>)\203\207\354D!\203\207
\211 J\205R\326J!\205R\327\326J!!)\203\\\332
!\202t\333\336\313\337#G\355DGMN\341\342\313\343\344\345;D\346@\257\347\345 D\356BBFD%\202t
\211 J\205\233\326J!\205\233\327\326J!!)\203\324
\211 J\205\263\326J!\205\263\327\326J!!)\203\306r
q\210\357 P\360\361!)\202tQ\362=\206t\324R!\202t\363 !\2038\320 \210\321\364!\2032\365DE\341\342\313\366\367\342\313\370\371pD\332p@EEE\372BBB\343\373p\346@\257\343\374C\211 S;\205S\375\230?)\205#CT\376D!QE\347\345 D\377BB\257D#\202t\324\325!\202t\313\211 O\211 O\206DN\351>)\206WO\211 O\206TN\352>))\203\257MD\341\342\313\366\201U \342\313\370\371pD\332p@EEE\201V BBB\343\373p\346@\257\343\374C\211 S;\205\221S\375\230?)\205\236CT\376D!QE\347\345 D\201W BB\257D\"\202t\313 ON\201X >)\204MDE\341\342\313\366\201Y \342\313\370\371pD\332p@EEE\201Z BBB\343\373p\346@\257\343\374C\211 S;\205\364S\375\230?)\205CT\376D!QE\347\345 D\201[ BB\257D#\202t\313 ON\201X >)\205tMDEF\341\342\313\366\201\\ \342\313\370\371pD\332p@EEE\201] BBB\343\374C\211 S;\205QS\375\230?)\205^CT\376D!QE\343\373p\346@\257\347\345 D\201^ BB\257D$)\202\203Q\362=\206\203\324R!. \207" [last-command-event pos meta-buf info elt session-buf ediff-event-point ediff-event-buffer ediff-get-meta-info ediff-get-session-number-at-pos eval nil 2 3 4 (73) beep y-or-n-p "This session is marked as hidden, unmark? " ediff-update-meta-buffer error "Aborted" get-buffer buffer-name 5 ediff-meta-session-p ediff-show-meta-buffer read-string format "Filter through regular expression (default %s): " "Filter 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-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 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-meta-buffer ediff-merge-store-file "" file-name-nondirectory (ediff-control-buffer) session-number ediff-default-filtering-regexp default-regexp merge-autostore-dir file1 file2 file3 regexp new-status session-info buf ediff-meta-list meta-list ediff-session-action-function ediff-metajob-name metajob ediff-mouse-pixel-position this-command ediff-KILLED-VITAL-BUFFER string ediff-merge-filename-prefix '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)] 17 (#$ . 45591) nil])
#@31 Switch to a selected session.
(defalias 'ediff-registry-action #[nil "\306!\307!\310\n \"\211\211\205 \311\n!\205 \312\311\n!!)\203\212 \211\2053 \311\n!\2053 \312\311\n!!)\203D r q\210\313\314!)\315=\202M \f\316=\204P \317
!\203X \320 \321\"\210\202\224 \211\205i \311\n!\205i \312\311\n!!)\203} r q\210\322 \323\324!\210)\202\224 \f\316=\204\224 \317
!\210\202\224 \325 \210\326\327!\210\330 \210\n\211\205\245 \311\n!\205\245 \312\311\n!!)\203\263 r\nq\210 b)\202\274 \f\316=\206\274 \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 (#$ . 49428) nil])
#@32 Show the session group buffer.
(defalias 'ediff-show-meta-buffer #[(&optional meta-buf session-number) "\306\307!\210\310\211\211 \203 \311 \206 \f\312 !\204# \313\314!\210\202< \211 \2054 \315
!\2054 \316\315
!!)\204< \313\317!\210%\247\203L \320 \310%#\210\202U %\204U \321 !\210 \211 \205f \315
!\205f \316\315
!!)\203\372 r q\210\212\322 !\211\203\213 \204 \323\324!\210\325\n \"\210\326\n!\210\202\366 \327&\211!\203\241 \325& \"\210\326\n!\210\202\366 \327'\211!\203\267 \325' \"\210\326\n!\210\202\366 \327(\211!\203\315 \325( \"\210\326\n!\210\202\366 \322)!\211\203\354 \330 \203\354 \326\n!\210\331\332!\210\325\333 \"\210\202\366 \334\335!\210\325\333 \"\210*\202*\336=\204\313+!\210\330 \203!\327\322 !\211!\203!\337\n!\340 !\210\341 !\210\342\343!\210\306\344!+\207" [silent frame wind meta-buf ediff-meta-buffer buf run-hooks ediff-before-directory-setup-hooks 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 sit-for 0 ediff-show-session-group-hook session-number ediff-window-C ediff-window-A ediff-window-B ediff-registry-buffer this-command ediff-KILLED-VITAL-BUFFER] 5 (#$ . 50368) 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 \211 \205 \311
!\205 \312\311
!!)\2030 r\fq\210\313\314\315\")\202; \316=\206; \317!,\207" [last-command-event pos meta-buf info meta-or-session-buf buf ediff-event-point ediff-event-buffer ediff-get-meta-info get-buffer buffer-name ediff-show-meta-buffer nil t ediff-quit error this-command ediff-KILLED-VITAL-BUFFER] 4 (#$ . 52110) nil])
#@27 Display Ediff's registry.
(defalias 'ediff-show-registry #[nil "\306 \210\211\205 \307 !\205 \310\307 !!)\204 \311\312!\210\313\211\211\2051 \307 !\2051 \310\307 !!)\203\270 rq\210\212\314!\211\203R \315\316!\210\317 \"\210\320 !\210\202\264 \321\f!\203d \317\f\"\210\320\f!\210\202\264 \321
!\203v \317
\"\210\320
!\210\202\264 \321 !\203\213 \317 \"\210\320 !\210\202\264 \314 !\211\203\252 \322 \203\252 \320 !\210\323\324!\210\317\325 \"\210\202\264 \326\327!\210\317\325 \"\210*\202\304 \330=\204\304 \311!!\210\322 \203\327 \331\314!!\332\n!\210\333\n!\210\334\335!*\207" [ediff-registry-buffer buf frame wind ediff-window-C ediff-window-A 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-window-B ediff-meta-buffer this-command ediff-KILLED-VITAL-BUFFER] 4 (#$ . 52611) nil])
(defalias 'eregistry 'ediff-show-registry)
(defalias 'ediff-update-meta-buffer #[(meta-buf &optional must-redraw session-number) "\211\205 \306 !\205 \307\306 !!)\205u \211\205& \306 !\205& \307\306 !!)\203j rq\210\310 \203; \f
!\210\202M \247\203I \311!\210\202M \312
!\210\313`!\211\205h \314\n\315\"\205h \316 \210\313`!\211\204U \310*\207\317=\206u \320!\207" [meta-buf buf overl must-redraw ediff-meta-redraw-function ediff-meta-list 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 ediff-overlay-get invisible ediff-next-meta-item1 ediff-quit error session-number this-command ediff-KILLED-VITAL-BUFFER] 4])
(defalias 'ediff-update-registry #[nil "p\211\205 \305!\205 \306\305!!)\203< rpq\210 \211\205* \305!\205* \306\305!!)\2033 \307 \202: \310\311\n\312\307\313%)\207 \314=\206E \315\f!\207" [buf 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] 7])
(defalias 'ediff-cleanup-meta-buffer #[(meta-buffer) "\211\205 \306 !\205 \307\306 !!)\205W \211\205& \306 !\205& \307\306 !!)\203N rq\210\310!\210\n\211\205C \306 !\205C \307\306 !!)\205L \310\n\311 #)\207\f\312=\206W \313
!\207" [meta-buffer buf 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])
(defalias 'ediff-safe-to-quit #[(meta-buffer) "\211\205 \306 !\205 \307\306 !!)\205s \n\310\311 \211\205, \306 !\205, \307\306 !!)\203g rq\210
A\f\203b
\203b
\211 \f@@)\211\205V \306 !\205V \307\306 !!)\203\\ \311
A\2027 \f)\202r
\312=\206r \313!+\207" [meta-buffer buf ediff-meta-list buffer-read-only cont lis get-buffer buffer-name t nil ediff-quit error meta-list 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\254 \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\211\205c \323!\205c \324\323!!)\205l \325\323!!)\210\f\211\211\205\201 \323!\205\201 \324\323!!)\205\212 \325\323!!)\210\211\205\236 \323!\205\236 \324\323!!)\203\254 \326 \327\"\210 \206\263 \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 (#$ . 55821) nil])
(defalias 'ediff-dispose-of-meta-buffer #[(buf) "\305 \"\211\205 \306!\205 \307\306!!)\203; rq\210\n\211\205/ \306!\205/ \307\306!!)\2037 \310\n!\210)\202E \311=\204E \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] 4])
(defalias 'ediff-get-meta-info #[(buf point &optional noerror) "\306\211\211 \203a \f\211 \205 \307\f!\205 \310\307\f!!)\203a \f\211 \2050 \307\f!\2050 \310\307\f!!)\203V r\fq\210\311\312\313 !\"\211\203O @\204O A\211\204C @)\202a
\314=\204a \315!\210\n\206q ?\205q \316 \210\315\317!+\207" [tmp olist result point buf this-command nil get-buffer buffer-name mapcar #[(elt) "\301\302\"?\205\f \301\303\"\207" [elt overlay-get invisible ediff-meta-info] 3] overlays-at ediff-quit error ediff-update-registry "No session info in this line" ediff-KILLED-VITAL-BUFFER noerror] 5])
(defalias 'ediff-get-meta-overlay-at-pos #[(point) "\303!\211@\211\203 \304\n\305\"\204 A\211@\211\204 \n*\207" [point overl-list overl overlays-at overlay-get ediff-meta-info] 4])
(defalias 'ediff-get-session-number-at-pos #[(point &optional meta-buffer) "\211\205 \305 !\205 \306\305 !!)\203 \202 p\211\211\205, \305 !\205, \306\305 !!)\203< rq\210\307\310\n!\311\")\207 \312=\206E \313\f!\207" [meta-buffer buf 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])
(defalias 'ediff-next-meta-overlay-start #[(point) "m\203 eb\207\302!\211\203 \303 !\202 \304!)\207" [point overl ediff-get-meta-overlay-at-pos overlay-end next-overlay-change] 3])
(defalias 'ediff-previous-meta-overlay-start #[(point) "o\203 db\207\302!\211\203 \303 !o\204 S\304!\305!@\204' e)\207" [point overl ediff-get-meta-overlay-at-pos overlay-start previous-overlay-change overlays-at] 3])
(autoload 'ediff-patch-file-internal "ediff-ptch")
(defalias 'ediff-patch-file-form-meta #[(file &optional startup-hooks) "\306!\307!\310\n \"\f \311\211 \311 \312!\204' \313\314\"\203/ \315\316\317!\"\210 \211 @) \3208@) \3218@)\211 \205b \322 !\205b \323\322 !!)\204o \203o \315\324!\210
\211 \205\203 \322 !\205\203 \323\322 !!)\203\237 r
q\210\214~\210}\210\325
#*\202\252 \326=\206\252 \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 already been applied to this file -- can't repeat!" ediff-patch-file-internal ediff-quit session-buf beg-marker end-marker file elt buf startup-hooks this-command ediff-KILLED-VITAL-BUFFER] 5])
#@43 Unmark all sessions marked for operation.
(defalias 'ediff-unmark-all-for-operation #[nil "A\303\211@\211\203 \304 \305\"\210\nA\211\202 *\306p\307\"\207" [ediff-meta-list elt list nil ediff-mark-session-for-operation unmark ediff-update-meta-buffer must-redraw] 4 (#$ . 59930) nil])
#@40 Unmark all sessions marked for hiding.
(defalias 'ediff-unmark-all-for-hiding #[nil "A\303\211@\211\203 \304 \305\"\210\nA\211\202 *\306p\307\"\207" [ediff-meta-list elt list nil ediff-mark-session-for-hiding unmark ediff-update-meta-buffer must-redraw] 4 (#$ . 60227) nil])
#@356 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
`(ediff-last-command-char)' is used to decide which action to take.
(defalias 'ediff-meta-mark-equal-files #[(&optional action) "\204 \306 A\307\211\211\211\211\211\211 \310\311!\210@\211\203\304 \n\312\n8)\n\313\n8)\n\314\n8)
\307 \211A \240*\210\f\307 \211A \240*\210 \307 \211A \240*\210\315\211\315\316
\f\"\204t \307\307 \317>)\203\223 \316
\"\204\211 \307\316\f \"\204\223 \307\203\273 \203\273 \203\273 \320=\203\260 \321\n\322\"\210\202\273 \323=\203\273 \324\n\322\"\210A\211\202\" \310\325!\210.\307 \326p\327\"\207" [action ediff-meta-list elt fileinfo3 fileinfo2 fileinfo1 ediff-last-command-char 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) 104 ediff-mark-session-for-hiding mark 109 ediff-mark-session-for-operation "Comparing files... Done" ediff-update-meta-buffer must-redraw marked3 marked2 marked1 list value metajob ediff-metajob-name ediff-recurse-to-subdirectories] 9 (#$ . 60516) nil])
(defalias 'ediff-mark-if-equal #[(fileinfo1 fileinfo2) "@ @\211;\205* \n;\205* \306 \n\"\205* \307 \211 A\f\240*\210 \307 \211 A\f\240**\207" [fileinfo1 fileinfo2 f2 f1 value elt ediff-same-contents t] 4])
Kontol Shell Bypass