ikan Uploader :
Directory : /usr/share/emacs/25.2/lisp/vc/
Upload File : |
| Current File : //usr/share/emacs/25.2/lisp/vc/ediff-diff.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\303!\210\302\304!\210\305\301\306\307\310\311\312\313&\210\314\315\316\317\320\321\312\301&\210\314\322\323\324\320\321\312\301&\210\325\326M\210\314\327\330\331\320\321\312\301&\210\314\332\333\334\320\321\312\301&\210\314\335\306\336\320\337\312\301&\207" [provide ediff-diff require ediff-init ediff-util custom-declare-group nil "Diff related utilities." :prefix "ediff-" :group ediff custom-declare-variable ediff-diff-program "diff" "Program to use for generating the differential of the two files." :type string ediff-diff3-program "diff3" "Program to be used for three-way comparison.\nMust produce output compatible with Unix's diff3 program." ediff-set-actual-diff-options #[nil "\300\207" [nil] 1] ediff-shell (cond ((memq system-type '(ms-dos windows-nt)) shell-file-name) (t "sh")) "The shell used to run diff and patch.\nIf user's .profile or .cshrc files are set up correctly, any shell\nwill do. However, some people set $prompt or other things\nincorrectly, which leads to undesirable output messages. These may\ncause Ediff to fail. In such a case, set `ediff-shell' to a shell that\nyou are not using or, better, fix your shell's startup file." ediff-cmp-program "cmp" "Utility to use to determine if two files are identical.\nIt must return code 0, if its arguments are identical files." ediff-cmp-options "Options to pass to `ediff-cmp-program'.\nIf GNU diff is used as `ediff-cmp-program', then the most useful options\nare `-I REGEXP', to ignore changes whose lines match the REGEXP." (repeat string)] 8)
(defalias 'ediff-set-diff-options #[(symbol value) " L\210\302 \207" [symbol value ediff-set-actual-diff-options] 2])
#@547 Options to pass to `ediff-diff-program'.
If Unix diff is used as `ediff-diff-program',
then a useful option is `-w', to ignore space.
Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be
toggled interactively using \[ediff-toggle-ignore-case].
Do not remove the default options. If you need to change this variable, add new
options after the default ones.
This variable is not for customizing the look of the differences produced by
the command \[ediff-show-diff-output]. Use the variable
`ediff-custom-diff-options' for that.
(custom-declare-variable 'ediff-diff-options '(if (memq system-type '(ms-dos windows-nt)) "--binary" "") '(#$ . 2097) :set 'ediff-set-diff-options :type 'string :group 'ediff-diff)
#@180 If t, skip over difference regions that differ only in letter case.
This variable can be set either in .emacs or toggled interactively.
Use `setq-default' if setting it in .emacs
(defvar ediff-ignore-case nil (#$ . 2831))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\310\311\312\313\314&\210\305\315\316\317\311\312\313\314&\207" [make-variable-buffer-local ediff-ignore-case put permanent-local t custom-declare-variable ediff-ignore-case-option "-i" "Option that causes the diff program to ignore case of letters." :type string :group ediff-diff ediff-ignore-case-option3 "" "Option that causes the diff3 program to ignore case of letters.\nGNU diff3 doesn't have such an option."] 8)
#@2
(defvar ediff-actual-diff-options ediff-diff-options (#$ . 3539))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\310\311\312\313\314&\210\305\315\316\317\311\312\313\314&\207" [make-variable-buffer-local ediff-actual-diff-options put permanent-local t custom-declare-variable ediff-custom-diff-program ediff-diff-program "Program to use for generating custom diff output for saving it in a file.\nThis output is not used by Ediff internally." :type string :group ediff-diff ediff-custom-diff-options "-c" "Options to pass to `ediff-custom-diff-program'."] 8)
#@69 Pattern to match lines produced by diff3 that describe differences.
(defvar ediff-match-diff3-line "^====\\(.?\\)
?$" (#$ . 4119))
#@43 Options to pass to `ediff-diff3-program'.
(custom-declare-variable 'ediff-diff3-options "" '(#$ . 4256) :set 'ediff-set-diff-options :type 'string :group 'ediff-diff)
#@2
(defvar ediff-actual-diff3-options ediff-diff3-options (#$ . 4428))
(byte-code "\300\301!\210\302\301\303\304#\210\305\306\307\310\311\312\313\314&\207" [make-variable-buffer-local ediff-actual-diff3-options put permanent-local t custom-declare-variable ediff-diff3-ok-lines-regexp "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^
$\\)" "Regexp that matches normal output lines from `ediff-diff3-program'.\nLines that do not match are assumed to be error messages." :type regexp :group ediff-diff] 8)
#@2
(defvar ediff-diff-status "" (#$ . 4965))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-diff-status put permanent-local t] 4)
#@324 If `on', Ediff auto-highlights fine diffs for the current diff region.
If `off', auto-highlighting is not used. If `nix', no fine diffs are shown
at all, unless the user force-refines the region by hitting `*'.
This variable can be set either in .emacs or toggled interactively.
Use `setq-default' if setting it in .emacs
(defvar ediff-auto-refine (byte-code "\300 \203 \301\207\302\207" [ediff-has-face-support-p on nix] 1) (#$ . 5135))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-auto-refine put permanent-local t] 4)
#@200 If t, skip over difference regions that differ only in the white space and line breaks.
This variable can be set either in .emacs or toggled interactively.
Use `setq-default' if setting it in .emacs
(defvar ediff-ignore-similar-regions nil (#$ . 5702))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-ignore-similar-regions put permanent-local t] 4)
#@63 Auto-refine only the regions of this size (in bytes) or less.
(defvar ediff-auto-refine-limit 14000 (#$ . 6092))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-auto-refine-limit put permanent-local t] 4)
#@260 Regexp that matches normal output lines from `ediff-diff-program'.
This is mostly lifted from Emerge, except that Ediff also considers
warnings and `Missing newline'-type messages to be normal output.
Lines that do not match are assumed to be error messages.
(defvar ediff-diff-ok-lines-regexp "^\\([0-9,]+[acd][0-9,]+
?$\\|[<>] \\|---\\|.*Warning *:\\|.*No +newline\\|.*missing +newline\\|^
?$\\)" (#$ . 6338))
#@68 Pattern to match lines produced by diff that describe differences.
(defvar ediff-match-diff-line (byte-code "\301\302\303\304\260)\207" [x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)" "^" "\\([acd]\\)" "
?$"] 5) (#$ . 6756))
#@402 value is a function symbol depending on the kind of job is to be done.
For 2-way jobs and for ediff-merge, it should be `ediff-setup-diff-regions'.
For jobs requiring diff3, it should be `ediff-setup-diff-regions3'.
The function should take three mandatory arguments, file-A, file-B, and
file-C. It may ignore file C for diff2 jobs. It should also take
one optional arguments, diff-number to refine.
(defvar ediff-setup-diff-regions-function nil (#$ . 6984))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-setup-diff-regions-function put permanent-local t] 4)
(defalias 'ediff-setup-diff-regions #[(file-A file-B _file-C) "\306\307\"\203 \310\311!\210 \211\205 \312\n!\205 \313\312\n!!)\204' \314\315\316\317\"!\320 \f#\210\321
\"\210\322\323 #!\207" [ediff-diff-options ediff-diff-buffer buf file-A file-B ediff-diff-ok-lines-regexp string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" error "Options `-c', `-u', and `-i' are not allowed in `ediff-diff-options'" get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-diff" "*" ediff-make-diff2-buffer ediff-prepare-error-list ediff-convert-diffs-to-overlays ediff-extract-diffs ediff-word-mode ediff-narrow-bounds] 6])
(defalias 'ediff-make-diff2-buffer #[(diff-buffer file1 file2) "\306 \307\")\n\306 \307\")\211 \247\204$ \310\311\312!\"\210\313\314!\210\315\202\201 \247\2048 \310\311\312\n!\"\210\313\314!\210\315\202\201 \310\316\317!\317\n!#\210\320
\321\n&\210\310\322!\210\211 \205g \323!\205g \324\323!!)\203v rq\210\325 )\202\201 \326=\206\201 \327 !*\207" [file1 filename file2 file2-size file1-size ediff-diff-program ediff-file-attributes 7 message "Can't find file: %s" ediff-abbreviate-file-name sit-for 2 1 "Computing differences between %s and %s ..." file-name-nondirectory ediff-exec-process synchronize "" get-buffer buffer-name buffer-size ediff-quit error diff-buffer ediff-actual-diff-options buf this-command ediff-KILLED-VITAL-BUFFER] 8])
(defalias 'ediff-setup-fine-diff-regions #[(file-A file-B file-C reg-num) "\211\205 \306 !\205 \307\306 !!)\204 \310\311\312\313\"!\314\211\211\211\211 \211 \2034 \2026 \203A !\202C \" \203N #\202P $\315%TC & '(\203g \316\317'&#\210*\320
\321\f)\203w )\202y **\203\203 *\202\205 ) \205\226 +\203\224 +\202\226 *&\210\322 \"\210\323\314 & '(\203\261 \316\317'&#\210* \203\277 \324\325\326#\202\303 \327\326\" \203\360 )\204\327 \330\331\nA\"\210\202\360 *\204\345 \330\332\nA\"\210\202\360 +\204\360 \330\333\nA\"\210\334\n%\"-\207" [ediff-fine-diff-buffer buf diff-list ok-regexp diff-options diff-program get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-fine-diff" "*" nil "Refining difference region %d ..." apply message ediff-exec-process synchronize ediff-prepare-error-list "" ediff-extract-diffs3 3way-comparison word-mode ediff-extract-diffs mapc #[(elt) "\301\302I\210\303\302I\207" [elt 0 nil 1] 3] #[(elt) "\301\302I\210\303\302I\207" [elt 2 nil 3] 3] #[(elt) "\301\302I\210\303\302I\207" [elt 4 nil 5] 3] ediff-convert-fine-diffs-to-overlays diff3-job ediff-3way-job ediff-diff3-program ediff-diff-program ediff-actual-diff3-options ediff-actual-diff-options ediff-diff3-ok-lines-regexp ediff-diff-ok-lines-regexp reg-num args string ediff-verbose-p file-A file-B file-C] 9])
(defalias 'ediff-prepare-error-list #[(ok-regexp diff-buff) "\211\205 \306 !\205 \307\306 !!)\204 \310\311\312\313\"!\211\205- \306 !\205- \307\306 !!)\203p rq\210\314\315 \210 \211\205K \306 !\205K \307\306 !!)\203Y r q\210\316 )\202b \f\317=\206b \320
!c\210eb\210\321!\210)\202z \f\317=\204z \320
!\210\211\205\213 \306 !\205\213 \307\306 !!)\203\231 rq\210\322 )\202\242 \f\317=\206\242 \320
!\323U?\205\333 \324 \210\325!\210\211\211\205\313 \306 !\205\313 \307\306 !!)\203\325 \326\306 !!\210)\320\327 \"*\207" [ediff-error-buffer buf buffer-undo-list diff-buff this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-errors" "*" t erase-buffer buffer-string ediff-quit error delete-matching-lines buffer-size 0 ediff-skip-unsuitable-frames switch-to-buffer kill-buffer "Errors in diff output. Diff output is in %S" ok-regexp ediff-control-buffer error-buf ctl-buf] 5])
(defalias 'ediff-extract-diffs #[(diff-buffer word-mode &optional bounds) " \n\306\307\306\307\306\307\211\211\211 ! \" # $ %&\203* \310\202+ \311
B'\203X '@ (\312(!\205C \313(!)'A@ (\312(!\205V \313(!)%\211 )\205m \314)!\205m \315\314)!!)\203\205 r%q\210\f\203~ \f\202 eb\210)\202\221 *\316=\204\221 \317+!\210$\211 )\205\246 \314)!\205\246 \315\314)!!)\203\276 r$q\210 \203\267 \202\270 eb\210)\202\312 *\316=\204\312 \317+!\210#\211 )\205\337 \314)!\205\337 \315\314)!!)\203#\211 )\205\370 \314)!\205\370 \315\314)!!)\203r#q\210eb\210)\202*\316=\204\317+!\210,\211 )\205)\314)!\205)\315\314)!!)\203\341r,q\210eb\210\320-\307\321#\203\335\322\306\224\306\225{! .\323\224\323\225 /\211 0\203]\3220/{!\202_.* 1\324\224\324\225{ 2\322\325\224\325\225{! 3\326\224\326\225 /\211 0\203\210\3220/{!\202\2123* 4\307\211 5 6\307\211 7 8\307\211 9 :\307\211 ; <2\327\230\203\2744T4.T\211.1\202\3352\330\230\203\3231T13T\21134\202\3351T14T4=\331=\203\357394:\202\367.91:&\203o
#\211 )\205\314)!\205\315\314)!!)\203?\332.\"Z1.Z3 Z43Z9 Z:9Z\307\211\211\211\211& \202]\332.\"Z1.Z3 Z43Z\307\211\211\211\211\211\211& C\2441\"4 : \202\330%\211 )\205\204\314)!\205\204\315\314)!!)\203\271r%q\210!\206\227\f\206\227eb\210.\"Zy\210`51.Zy\210`61\"6!)\202\305*\316=\204\305\317+!\210$\211 )\205\332\314)!\205\332\315\314)!!)\203r$q\210 \206\355 \206\355eb\2103 Zy\210`743Zy\210`84 8 )\202*\316=\204\317+!\210#\211 )\2050\314)!\2050\315\314)!!)\203\206#\211 )\205I\314)!\205I\315\314)!!)\203zr#q\210 \206Xeb\2109 Zy\210`;:9Zy\210`<: < )\202\206*\316=\204\206\317+!\210
#\211 )\205\234\314)!\205\234\315\314)!!)\203\303\3325678;<\307\211=\331=\203\272\333\202\273\334=\307& \202\325\3325678\307\211\211\211\211\211\211& C\244.
\2025)\202\355*\316=\204\355\317+!\210
.\f\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C shift-B shift-A diff-list 1 nil words points ediff-overlayp overlay-start get-buffer buffer-name ediff-quit error re-search-forward t string-to-number 3 4 5 7 "a" "d" default-B vector A B c-prev-pt c-prev b-prev-pt b-prev a-prev-pt a-prev C-buffer B-buffer A-buffer word-mode bounds overl buf this-command ediff-KILLED-VITAL-BUFFER diff-buffer ediff-match-diff-line a-begin e b a-end diff-type b-begin b-end a-begin-pt a-end-pt b-begin-pt b-end-pt c-begin c-end c-begin-pt c-end-pt ediff-default-variant] 14])
(defalias 'ediff-convert-diffs-to-overlays #[(diff-list) "\305\306\"\210\305\307\"\210 \203 \305\310\"\210\n\203 \305\311\"\210 \203( \312\313\314A\"!\315\316!\207" [diff-list ediff-3way-job ediff-merge-with-ancestor-job ediff-merge-job ediff-state-of-merge ediff-set-diff-overlays-in-one-buffer A B C Ancestor vconcat mapcar #[(elt) "\303H\304H\305\n\205 \306\307\n\" \"*\207" [elt state-of-ancestor state-of-merge 9 10 vector format "%S"] 4] message "Processing difference regions ... done"] 4])
(defalias 'ediff-set-diff-overlays-in-one-buffer #[(buf-type diff-list) "\306 \307=\203\f \n\202' \310=\203 \202' \311=\203 \f\202' \312=\205'
01 23@ 4 \307=\203> 5@\202U \310=\203K 5A@\202U \311=\205U \31358 6\3146!\205b \3156!) 7 \307=\203q 5@\202\210 \310=\203~ 5A@\202\210 \311=\205\210 \31358 6\3146!\205\225 \3166!) 8\317\211 9 :\317\211 ; <\317\211 \" =\317\211 > ?3A\2113G;0\211 @\205\316 \320@!\205\316 \321\320@!!)\203\337 r0q\2107=)\202\353 A\322=\204\353 \323B!\2103\203\240T3@\211: \307=\203\324\202 \310=\203
\313\202 \311=\203\325\202\326H<: \307=\203'\327\202< \310=\2031\330\202< \311=\203;\331\202<\332H\":\333H? ?=\204q \312=\204q?\334>\203q\335 \335?\307\310\311E\"\"@?\336\337?\"?\202t\317?4\340=\20350\211 @\205\220\320@!\205\220\321\320@!!)\203\241r0q\210=b\210)\202\255A\322=\204\255\323B!\2102\211 @\205\302\320@!\205\302\321\320@!!)\203\341r2q\210\341<T0\"<\341\"0\342#\")\202\355A\322=\204\355\323B!\210\"8V\203\3718\"<\"V\203\"<0\211 @\205\320@!\205\321\320@!!)\203(r0q\210`)\2023A\322=\2063\323B!=\343<\"0#>\344>\345#\210\346 \203xC\203xD\203x\347> E\211\350E!\203jF\202lG H\351 H\"A,\"\210\352\353\"\324U\203\211\354\355 ;$\2109\356>\317\211?$C\24493A\2113\204\360 I H\351 H\"A*\3579!L.\207" [current-diff buf-type ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer -1 A B C Ancestor 2 ediff-overlayp overlay-start overlay-end nil get-buffer buffer-name ediff-quit error 0 4 6 1 3 5 7 8 (A B C) delq format "=diff(%S)" words ediff-goto-word end ediff-make-bullet-proof-overlay ediff-overlay-put ediff-diff-num ediff-has-face-support-p ediff-set-overlay-face cl-oddp assoc mod 10 message "Buffer %S: Processing difference region %d of %d" vector vconcat buff ediff-control-buffer ctl-buf diff-list diff-list-type ediff-narrow-bounds overl shift limit diff-overlay-list list-element total-diffs begin pt-saved overlay state-of-diff buf this-command ediff-KILLED-VITAL-BUFFER ediff-use-faces ediff-highlight-all-diffs dif-num ediff-even-diff-face-alist ediff-odd-diff-face-alist alist ediff-difference-vector-alist] 8])
(defalias 'ediff-make-fine-diffs #[(&optional n flag) "\204 \n\306W\203 \307 !\210\f\203 \310\3112\312W\206\352\nY\206\352\3133!456\314\315\"\314\316\"\314\317\"\320\315\"\320\316\"\320\317\"\321 7 8 9 : ; < = > ? @ A\322\321=<;E\"G\306V\203%\323!\203 B\203 \324\317\321#\210C\203\266 \325T=\204\220 \315\202\240 <\204\231 \316\202\240 ;?\205\240 \317D D EF\203\262 \326\327ED#\210*\202\344 \330T=\203\302 \315\202\321 <\203\313 \316\202\321 ;\205\321 \317D D EF\203\343 \326\327ED#\210*:\203\f9\203\f8\203\f\315G H I\331IH\"A*JH\332\333I\210\202\345\315G H I\331IH\"A*JH\332\321I\210\202\345
\334=\203\272\315G H I\331IH\"A*JH\306H\203\272\315G H I\331IH\"A*JH\332H\203\345\327\335T\315G H I\331IH\"A*JH\332H\315=\203z\336\202\265\315G H I\331IH\"A*JH\332H\316=\203\227\337\202\265\315G H I\331IH\"A*JH\332H\317=\203\264\340\202\265\341#\210\202\345
\310=\203\372\315G H I\331IH\"A*JH\306H\204\3452\342>\204\345\343T\344\345!D D EF\203\366\326\327ED#\210*\202\345\346\347\315\350#\347\315\351#JAK%\210\352A\353@#@\346\347\316\350#\347\316\351#LAK%\210\352A\354?#?M\203S\346\347\317\350#\347\317\351#NAK%\210\352A\355>#>@4?5>6M\203u:\203u\356\321?>$\210\202\253M\203\2139\203\213\356@\321>$\210\202\253M\203\2418\203\241\356@?\321$\210\202\253\356@?>$\210\357\315G H I\331IH\"A*JH\306HG\316G H I\331IH\"A*JH\306HG>\203\370B\204\370\317G H I\331IH\"A*JH\306HG\202\371\312#7:\203 9\203 8\204&:\204U9\204UM\203 8\204U7\312=\203U\315G H I\331IH\"A*JH\332\333I\210\360TC D EF\203Q\326\327ED#\210*\202\3457\312=\203\317\335T:\203~\315G H I\331IH\"A*JH\332\315I\210\336\202\2719\203\235\315G H I\331IH\"A*JH\332\316I\210\337\202\2718\205\271\315G H I\331IH\"A*JH\332\317I\210\340D D EF\203\313\326\327ED#\210*\202\345\315G H I\331IH\"A*JH\332\321I\210\361!. \207" [n ediff-current-difference ediff-number-of-differences ediff-NO-DIFFERENCES ediff-word-mode flag 1 error skip nix 0 get-buffer-create ediff-empty-diff-region-p A B C ediff-whitespace-diff-region-p nil delq ediff-looks-like-combined-merge ediff-set-fine-overlays-in-one-buffer "Region %d is empty in all buffers but %S" apply message "Region %d in buffer %S is empty" assoc 2 t noforce "Only white-space differences in region %d %s" "in buffers B & C" "in buffers A & C" "in buffers A & B" "" (off nix) "Region %d exceeds the auto-refinement limit. Type `%s' to refine" substitute-command-keys "\\[ediff-make-or-kill-fine-diffs]" ediff-wordify ediff-get-diff-posn beg end ediff-make-temp-file "fineDiffA" "fineDiffB" "fineDiffC" ediff-setup-fine-diff-regions + "Only white-space differences in region %d" ediff-set-fine-diff-properties ediff-auto-refine ediff-tmp-buffer ediff-temp-file-A ediff-temp-file-B ediff-temp-file-C cumulative-fine-diff-length whitespace-C whitespace-B whitespace-A empty-C empty-B empty-A file-C file-B file-A tmp-buffer ediff-merge-job ediff-3way-comparison-job args string ediff-verbose-p ediff-difference-vector-alist alist buf-type ediff-buffer-A ediff-control-buffer ediff-buffer-B ediff-3way-job ediff-buffer-C] 12])
(defalias 'ediff-install-fine-diff-if-necessary #[(n) "\305=\203@ \203@ \n\306=\204@ \n\307=\204@ \310\311\312\f#\310\311\313\f#ZV\203; \310\314\312\f#\310\314\313\f#ZV\203; \315\f\316\"\207\315\f\317\"\207\306=\205J \315\f\317\"\207" [ediff-auto-refine ediff-use-faces ediff-highlighting-style ediff-auto-refine-limit n on off ascii ediff-get-diff-posn A end beg B ediff-make-fine-diffs noforce skip] 6])
(defalias 'ediff-set-fine-diff-properties #[(n &optional default) "\304 ?\206' \305W\206' Y\206' \306\307\n#\210\306\310\n#\210 \205' \306\311\n#\207" [n ediff-number-of-differences default ediff-3way-job ediff-has-face-support-p 0 ediff-set-fine-diff-properties-in-one-buffer A B C] 4])
(defalias 'ediff-set-fine-diff-properties-in-one-buffer #[(buf-type n &optional default) " \306\n\"A*J H\307H\f?\205
\306\n\"A* \n \310\311 \"*\207" [buf-type ediff-difference-vector-alist alist n default ediff-fine-diff-face-alist assoc 1 mapc #[(overl) "\302 \"\207" [overl face ediff-set-overlay-face] 3] face fine-diff-vector] 4])
(defalias 'ediff-set-fine-overlays-for-combined-merge #[(diff-list reg-num) "\306\211\n\2039 \3071 \310\n@\nA@ #\2110\202 \210\202 \210 B\nG\311V\2032 \nAA\211\202 \312\313!\210\202 \314!\315\f \316
\"A*JH\311\317\320\"I*\207" [overlay-list overlay diff-list ediff-buffer-C ediff-difference-vector-alist alist nil (error) ediff-make-bullet-proof-overlay 1 error "ediff-set-fine-overlays-for-combined-merge: corrupt list of\ndelimiter regions" reverse C assoc apply vector buf-type reg-num] 6])
(defalias 'ediff-set-fine-overlays-in-one-buffer #[(buf-type diff-list region-num) "\306\307 \310\n# \311=\203 \f\202/ \312=\203
\202/ \313=\203' !\202/ \314=\205/ \" #$ %\315\211 & '\315\211 ( )\315\211 *\n + , -\316 -\"A*J+H\211 .\203k \317\320.\321H\"\210) , -\316 -\"A*J+H\321\315I\210*/A/#\211 0\205\234 \3220!\205\234 \323\3220!!)\203\254 r#q\210 b\210)\202\270 1\324=\204\270 \3252!\2103\203\324 \313=\203\324 \326\n!\211&\203\324 \327&\n\"\202\217/\203yT/@\211( \311=\203\354 \330\202\367 \312=\203\366 \331\202\367 \332H)( \311=\203\321\202 \312=\203\333\202\334H )\204 \203p%\211 0\2053\3220!\2053\323\3220!!)\203Rr%q\210\335)T#\")\335 #\336# )\202^1\324=\204^\3252!\210\337) ##*'*C\244'/A\211/\204\331 , -\316 -\"A*J\nH\321\340'!I.\n\207" [current-diff buf-type region-num reg-start ediff-buffer-A ediff-buffer-B -1 ediff-get-diff-posn beg A B C Ancestor nil assoc mapc ediff-delete-overlay 1 get-buffer buffer-name ediff-quit error ediff-looks-like-combined-merge ediff-set-fine-overlays-for-combined-merge 0 2 4 3 5 ediff-goto-word end ediff-make-bullet-proof-overlay vconcat ediff-buffer-C ediff-ancestor-buffer buff ediff-control-buffer ctl-buf combined-merge-diff-list diff-overlay-list list-element begin overlay n ediff-difference-vector-alist alist diff-record diff-list buf this-command ediff-KILLED-VITAL-BUFFER ediff-merge-job] 5])
(defalias 'ediff-convert-fine-diffs-to-overlays #[(diff-list region-num) "\303\304 #\210\303\305 #\210\n\205 \303\306 #\207" [diff-list region-num ediff-3way-job ediff-set-fine-overlays-in-one-buffer A B C] 4])
(defalias 'ediff-get-diff3-group #[(file) "\212\302\303\304Q!\210\305\306!\210\307\224\307\225{\310\230\203> \306\224\203. \311\312\224\312\225{!\311\313\224\313\225{!TD\202H \311\312\224\312\225{!\211\211T)D\202H \311\312\224\312\225{!T\211D)\207" [file x re-search-forward "^" ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)
?$" beginning-of-line 2 4 "c" string-to-number 1 3] 5])
(defalias 'ediff-extract-diffs3 #[(diff-buffer word-mode three-way-comp &optional bounds) " \n \306\307\306\307\306\307\306\307\211\211\211 ! \" # $ % & ' ( ) * + ,-\2034 \310\2025 \311!B!.\203} .@ /\312/!\205O \313/!) .A@ /\312/!\205c \313/!)0\205| \314.8 /\312/!\205{ \313/!),\211 1\205\222 \3151!\205\222 \316\3151!!)\203\254 r,q\210 \203\245 \202\246 eb\210)\202\270 2\317=\204\270 \3203!\210+\211 1\205\315 \3151!\205\315 \316\3151!!)\203\345 r+q\210
\203\336
\202\337 eb\210)\202\361 2\317=\204\361 \3203!\2100\203/*\211 1\205 \3151!\205 \316\3151!!)\203#r*q\210\f\203 \f\202 eb\210)\202/2\317=\204/\3203!\210)\211 1\205D\3151!\205D\316\3151!!)\203y)\211 1\205]\3151!\205]\316\3151!!)\203mr)q\210eb\210)\202y2\317=\204y\3203!\2104\211 1\205\216\3151!\205\216\316\3151!!)\203cr4q\210eb\210\3215\307\322#\203_\323\314!\210\306\224\306\225{ 60\204\2726\324\230\204[\325\326!@ 7\325\326!A@ 8\325\327!@ 9\325\327!A@ :\325\324!@ ;\325\324!A@ <6\326\230\203\354\330\202\3716\327\230\203\367\331\202\371=\211 >\332>\203\333\202\334 ?6\326\230\203\334\202&6\327\230\203 \333\202&6\324\230\205&\335 @\307\211 A B\307\211 C D\307\211 E F\307\211 G H\307\211 I J\307 K;<UA0\203`;B<C\202z=\336=\203r9B:C\202z7B8C-\203\272!\3377(Z87Z9&Z:9ZB$ZCBZ\307\211\211\211\211& C\244!8(:&C$\202Y,\211 1\205\317\3151!\205\317\316\3151!!)\203r,q\210'\206\343 \206\343eb\2107(Zy\210`D87Zy\210`E8(E')\2022\317=\204\3203!\210+\211 1\205&\3151!\205&\316\3151!!)\203[r+q\210%\2069
\2069eb\2109&Zy\210`F:9Zy\210`G:&G%)\202g2\317=\204g\3203!\210*\211 1\205|\3151!\205|\316\3151!!)\203\261r*q\210#\206\217\f\206\217eb\210B$Zy\210`HCBZy\210`IC$I#)\202\2752\317=\204\275\3203!\210)\211 1\205\322\3151!\205\322\316\3151!!)\203 )\211 1\205\353\3151!\205\353\316\3151!!)\203r)q\210;\"Zy\210`J<;Zy\210`K<\")\202 2\317=\204 \3203!\210!0\203<\337DEFGHI\307\211@\307\211& C\202V\337DEFGHIJK?>A& C\244!.)\202\232)\202o2\317=\204o\3203!\210!.\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer shift-C shift-B 1 nil words points ediff-overlayp overlay-start 2 get-buffer buffer-name ediff-quit error re-search-forward t beginning-of-line "3" ediff-get-diff3-group "1" "2" prefer-A prefer-B (default-A prefer-A) B A C default-B vector shift-A diff-list anc-prev c-prev-pt c-prev b-prev-pt b-prev a-prev-pt a-prev anc-buffer C-buffer B-buffer A-buffer word-mode bounds overl three-way-comp buf this-command ediff-KILLED-VITAL-BUFFER diff-buffer ediff-match-diff3-line agreement a-begin a-end b-begin b-end c-or-anc-begin c-or-anc-end ediff-default-variant state-of-merge state-of-diff-merge state-of-diff-comparison state-of-ancestor c-begin c-end a-begin-pt a-end-pt b-begin-pt b-end-pt c-begin-pt c-end-pt anc-begin-pt anc-end-pt] 16])
(defalias 'ediff-setup-diff-regions3 #[(file-A file-B file-C) "\306\307\"\203 \310\311!\210 \211\205 \312\n!\205 \313\312\n!!)\204' \314\315\316\317\"!\320\321!\210\322 \323\f
&\210\324 \"\210\325\326 $!\207" [ediff-diff-options ediff-diff-buffer buf ediff-diff3-program ediff-actual-diff3-options file-A string-match "^-i\\| -i\\|\\(^\\| \\)-[^- ]+i" error "Option `-i' is not allowed in `ediff-diff3-options'" get-buffer buffer-name get-buffer-create ediff-unique-buffer-name "*ediff-diff" "*" message "Computing differences ..." ediff-exec-process synchronize ediff-prepare-error-list ediff-convert-diffs-to-overlays ediff-extract-diffs3 file-B file-C ediff-diff3-ok-lines-regexp ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds] 9])
(defalias 'ediff-exec-process #[(program buffer synch options &rest files) "\306 \307\310\311!\"\203 \202 \n\312 \313\314 ! \"\315\316\317\312 \"\"\307\310\311!\"\204; !\"=\204; \315\320 \"\321\216#\312 $ %r!q\210\322 \210%#&\323>\204\\ '\203j \324\325(\312!\312 &\202\222 \326!!\211$\203y \327$!\210\324\330\331!( %$\332)\333$\334\"\210\335$\336\".\207" [ediff-job-name ediff-coding-system-for-write ediff-coding-system-for-read args coding-system-for-read data match-data string-match "buffer" symbol-name nil append split-string delete "" delq "--binary" #[nil "\301!\207" [data store-match-data] 2] erase-buffer (ms-dos windows-nt) apply call-process get-buffer-process kill-process start-process "Custom Diff" (":%s") set-process-sentinel ediff-process-sentinel set-process-filter ediff-process-filter options files buffer ediff-fine-diff-buffer default-directory proc directory system-type synch program mode-line-process] 8])
(defalias 'ediff-process-filter #[(proc string) "p\306 !\307\310\n! \311\f! \312\216\nq\210`dU\204 `db\210\313\f!.\207" [obuf proc buffer opoint window pos process-buffer nil get-buffer-window window-start #[nil "\304 \"\210\n\203\f \nb\210 q\207" [window pos opoint obuf set-window-start] 3] insert-before-markers string] 2])
(defalias 'ediff-process-sentinel #[(process _signal) "\302!\303>\205 \304\305!!\205 r\305!q\210\306)\307!\207" [process mode-line-process process-status (exit signal) buffer-name process-buffer nil delete-process] 3])
#@105 Function to call to move to the next word.
Used for splitting difference regions into individual words.
(defvar ediff-forward-word-function 'ediff-forward-word (#$ . 28802))
(make-variable-buffer-local 'ediff-forward-word-function)
#@112 Characters constituting white space.
These characters are ignored when differing regions are split into words.
(defvar ediff-whitespace " \n \f
\240" (#$ . 29041))
(make-variable-buffer-local 'ediff-whitespace)
#@158 Characters that constitute words of type 1.
More precisely, [ediff-word-1] is a regexp that matches type 1 words.
See `ediff-forward-word' for more details.
(defvar ediff-word-1 "-[:word:]_" (#$ . 29259))
(make-variable-buffer-local 'ediff-word-1)
#@158 Characters that constitute words of type 2.
More precisely, [ediff-word-2] is a regexp that matches type 2 words.
See `ediff-forward-word' for more details.
(defvar ediff-word-2 "0-9.," (#$ . 29514))
(make-variable-buffer-local 'ediff-word-2)
#@158 Characters that constitute words of type 3.
More precisely, [ediff-word-3] is a regexp that matches type 3 words.
See `ediff-forward-word' for more details.
(defvar ediff-word-3 "`'?!:;\"{}[]()" (#$ . 29764))
(make-variable-buffer-local 'ediff-word-3)
#@158 Characters that constitute words of type 4.
More precisely, [ediff-word-4] is a regexp that matches type 4 words.
See `ediff-forward-word' for more details.
(defvar ediff-word-4 (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) (#$ . 30023))
(make-variable-buffer-local 'ediff-word-4)
#@272 Move point one word forward.
There are four types of words, each of which consists entirely of
characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or
`ediff-word-4'. Words are recognized by passing these one after another as
arguments to `skip-chars-forward'.
(defalias 'ediff-forward-word #[nil "\304w\305\306!\\\307V\206! \304w\307V\206! \n\304w\307V\206! \304w\307V\207" [ediff-word-1 ediff-word-2 ediff-word-3 ediff-word-4 nil skip-syntax-forward "w" 0] 3 (#$ . 30334)])
(defalias 'ediff-wordify #[(beg end in-buffer out-buffer &optional control-buf) "\203. \211\205 \306 !\205 \307\306 !!)\203\" rq\210\n)\202/ \310=\206/ \311\f!\202/ \n\312\211\211 rq\210\203m \211\205S \306 !\205S \307\306 !!)\203a rq\210)\202o \310=\206o \311\f!\202o \313 \314\"q\210\315!\210\316 \210
c\210eb\210\312w\210e`|\210m?\205\257 \210`\312w\210`|\210\317c\210\202\223 -\207" [control-buf buf ediff-forward-word-function this-command ediff-KILLED-VITAL-BUFFER diff-string get-buffer buffer-name ediff-quit error nil syntax-table buffer-substring-no-properties set-syntax-table erase-buffer "\n" sv-point inbuf-syntax-tbl forward-word-function in-buffer ediff-syntax-table beg end out-buffer ediff-whitespace] 5])
(defalias 'ediff-copy-to-buffer #[(beg end in-buffer out-buffer) "rq\210\304 \210\305 \n #\210eb)\207" [out-buffer in-buffer beg end erase-buffer insert-buffer-substring] 4])
(defalias 'ediff-goto-word #[(n buf &optional flag) " \f\211 \205 \306\f!\205 \307\306\f!!)\203Z r\fq\210
\310w\210\311 p \312\216\313\n!\210\314V\203E \210
\310w\210S\211\2020 \203T \315V\203T \210+`)\202e \316=\206e \317!*\207" [ediff-forward-word-function ediff-syntax-table syntax-tbl fwd-word-fun buf ediff-whitespace get-buffer buffer-name nil syntax-table #[nil "rq\210\302 !)\207" [#1=#:buffer #2=#:table set-syntax-table] 2] set-syntax-table 1 0 ediff-quit error #1# #2# n flag this-command ediff-KILLED-VITAL-BUFFER] 4])
#@54 Return t if files F1 and F2 have identical contents.
(defalias 'ediff-same-file-contents #[(f1 f2) "\306!?\205\\ \306 !?\205\\ \307!\307 !\232\203C \310\311\n\312\211\211\313 \307\314\"\206* \315!\307 \314\"\2064 \315 !D\"&\211 \247\205A \f\316=)\207\317!\317 ! \320\216\321\206U
\206Z \"+\207" [f1 f2 ediff-cmp-program ediff-cmp-options res t2 file-directory-p file-remote-p apply process-file nil append localname expand-file-name 0 file-local-copy #[nil "\203 \302!\210 \205 \302 !\207" [t1 t2 delete-file] 2] ediff-same-file-contents t1] 13 (#$ . 32331)])
#@262 Return t if D1 and D2 have the same content.
D1 and D2 can either be both directories or both regular files.
Symlinks and the likes are not handled.
If FILTER-RE is non-nil, recursive checking in directories
affects only files whose names match the expression.
(defalias 'ediff-same-contents #[(d1 d2 &optional filter-re) "G\306V\204 \307\310\311 \n$\210\312 !\203T \312\n!\203T \204- \313\314!\203+ \315\202- \316 \315=\205d \317 \320# \317\n\320# \321\322\f\" \321\322
\" \323#,\207\324 !\205d \324\n!\205d \325 \n\"\207" [filter-re d1 d2 ediff-recurse-to-subdirectories all-entries-1 all-entries-2 0 nil message "Comparing `%s' and `%s' modulo `%s'" file-directory-p y-or-n-p "Compare subdirectories recursively? " yes no directory-files t ediff-delete-all-matches "^\\.\\.?$" ediff-same-file-contents-lists file-regular-p ediff-same-file-contents entries-1 entries-2] 5 (#$ . 32915)])
(defalias 'ediff-same-file-contents-lists #[(entries-1 entries-2 filter-re) "G GU\2059 \304\305\"\304\305 \"\232\2059 \306\2036 \n\2036 \307@ @ #\2031 A A\202 \310\202 )?\207" [entries-1 entries-2 continue filter-re mapcar file-name-nondirectory t ediff-same-contents nil] 4])
(defalias 'ediff-delete-all-matches #[(regex file-list-list) "\304\211\n\203 \n@\305 \306!\"\204 B\nA\211\204 \307 !*\207" [elt result file-list-list regex nil string-match file-name-nondirectory reverse] 5])
(defalias 'ediff-set-actual-diff-options #[nil "\203 \306\nQ\f\306
Q\202 \f\307\303 \"\210\307\310\"\207" [ediff-ignore-case ediff-diff-options ediff-ignore-case-option ediff-actual-diff-options ediff-diff3-options ediff-ignore-case-option3 " " set-default ediff-actual-diff3-options] 3])
(defalias 'ediff-toggle-ignore-case #[nil "\306\307!\204
\310\311 \"\210)\n?\312 \210\n\203 \313\314!\210\202# \313\315!\210 \203+ \313\316!\207\f\2039
\317\230\2039 \313\320!\207\204I \317\230\203I \313\321!\207\322\323!\210\324 \207" [meta-buf-p this-command ediff-ignore-case ediff-merge-job ediff-diff3-job ediff-ignore-case-option3 nil ediff-in-control-buffer-p error "%S: This command runs in Ediff Control Buffer only!" ediff-set-actual-diff-options message "Ignoring regions that differ only in case" "Ignoring case differences turned OFF" "Ignoring letter case is too dangerous in merge jobs" "" "Ignoring letter case is not supported by this diff3 program" "Ignoring letter case is not supported by this diff program" sit-for 1 ediff-update-diffs ediff-3way-job ediff-ignore-case-option] 3 nil nil])
Kontol Shell Bypass