;ELC
;;; Compiled
;;; in Emacs version 26.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\304\303\305\306\307\310\311\312\313\314& \210\300\315!\210\300\316!\210\317\320\321\322\323\324\313\303&\210\317\325\326\327\323\324\313\303&\207" [require diff-mode provide ediff-ptch custom-declare-group nil "Ediff patch support." :tag "Patch" :prefix "ediff-" :group ediff ediff-init ediff-util custom-declare-variable ediff-patch-program "patch" "Name of the program that applies patches.\nIt is recommended to use GNU-compatible versions." :type string ediff-patch-options "-f" "Options to pass to ediff-patch-program.\n\nNote: the `-b' option should be specified in `ediff-backup-specs'.\n\nIt is recommended to pass the `-f' option to the patch program, so it won't ask\nquestions. However, some implementations don't accept this option, in which\ncase the default value for this variable should be changed."] 10)
#@60 Last directory used by an Ediff command for file to patch.
(defvar ediff-last-dir-patch nil (#$ . 1271))
(defconst ediff-default-backup-extension (byte-code "\301=\203 \302\207\303\207" [system-type ms-dos "_orig" ".orig"] 2))
#@76 Backup extension used by the patch program.
See also `ediff-backup-specs'.
(custom-declare-variable 'ediff-backup-extension 'ediff-default-backup-extension '(#$ . 1506) :type 'string :group 'ediff-ptch)
(defalias 'ediff-test-patch-utility #[nil "\3011) \302\303\211\211\304\305&\306=\203 \307\202' \302\303\211\211\305%\306=\203& \310\202' \3110\207\210\303\207" [ediff-patch-program (file-error) call-process nil "-z." "-b" 0 gnu posix traditional] 7])
(byte-code "\300\301\302\303\304\305\306\307&\210\300\310\311\312\304\313\306\307&\210\300\314\315\316\304\317\306\307&\207" [custom-declare-variable ediff-backup-specs (let ((type (ediff-test-patch-utility))) (cond ((eq type 'gnu) (format "-z%s -b" ediff-backup-extension)) ((eq type 'posix) (setq ediff-backup-extension ediff-default-backup-extension) "-b") (t (format "-b %s" ediff-backup-extension)))) "Backup directives to pass to the patch program.\nEdiff requires that the old version of the file (before applying the patch)\nbe saved in a file named `the-patch-file.extension'. Usually `extension' is\n`.orig', but this can be changed by the user and may depend on the system.\nTherefore, Ediff needs to know the backup extension used by the patch program.\n\nSome versions of the patch program let you specify `-b backup-extension'.\nOther versions only permit `-b', which assumes the extension `.orig'\n(in which case ediff-backup-extension MUST be also `.orig'). The latest\nversions of GNU patch require `-b -z backup-extension'.\n\nNote that both `ediff-backup-extension' and `ediff-backup-specs'\nmust be set properly. If your patch program takes the option `-b',\nbut not `-b extension', the variable `ediff-backup-extension' must\nstill be set so Ediff will know which extension to use.\n\nEdiff tries to guess the appropriate value for this variables. It is believed\nto be working for `traditional' patch, all versions of GNU patch, and for POSIX\npatch. So, don't change these variables, unless the default doesn't work." :type string :group ediff-ptch ediff-patch-default-directory nil "Default directory to look for patches." (choice (const nil) string) ediff-context-diff-label-regexp (let ((stuff "\\([^ \n]+\\)")) (concat "\\(" "^\\*\\*\\* +" stuff "[^*]+[ ]*\n--- +" stuff "\\|" "^--- +" stuff ".*\n\\+\\+\\+ +" stuff "\\)")) "Regexp matching filename 2-liners at the start of each context diff.\nYou probably don't want to change that, unless you are using an obscure patch\nprogram." regexp] 8)
#@2
(defvar ediff-patchbufer nil (#$ . 4001))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-patchbufer put permanent-local t] 4)
#@2
(defvar ediff-patch-diagnostics nil (#$ . 4168))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-patch-diagnostics put permanent-local t] 4)
#@2
(defvar ediff-patch-map nil (#$ . 4349))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-patch-map put permanent-local t] 4)
(defalias 'ediff-file-name-sans-prefix #[(filename prefix) "\203* \303 \304\216\305\306;\203 \307!\202 \310P\n\"\203% \n\311\225\312O\202( \313\nP*\207\n\207" [prefix save-match-data-internal filename match-data #[nil "\301\302\"\207" [save-match-data-internal set-match-data evaporate] 3] string-match "^" regexp-quote "" 0 nil "/null/"] 4])
(put 'ediff-file-name-sans-prefix 'byte-optimizer 'byte-compile-inline-expand)
(defalias 'ediff-count-matches #[(regexp buf) "\211\205 \306!\205 \307\306!!)\203E rq\210\310\311\212eb\210m\204A `\312 \311\313#\203A `U\203; \314u\210\202! \nT\202! )\n+\207\f\315=\206N \316
!\207" [buf opoint count regexp this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name 0 nil re-search-forward t 1 ediff-quit error] 5])
(defalias 'ediff-map-patch-buffer #[(buf) "\211\205 \306!\205 \307\306!!)\203rq\210\310\311 e\312\313\211\211\211\211\211\211\211\211 ! \" #\212eb\210`m\204\354 \314$\313\315#\203\354 `U\203[ \316u\210\202\342 \317 \310\224\313\223 \310\225 \320\224\206n \321\224 \320\225\206w \321\225\322\224\206 \323\224\322\225\206\207 \323\225 \203\230 \f\203\230 \f{\202\231 \324
\203\247 \203\247
{\202\250 \324B \325\326%\327Q!\315#\203\302 \310\224\313\223\210\202\253 b\210 \203\326 \330 \" #\nB \" ! `#T#\202B )\331 \330 \" #\nB\211\237&#.\207'\332=\206\333(!\207" [buf opoint patch-map end2 end1 beg2 get-buffer buffer-name 0 point-min-marker ("/dev/null" . "/dev/null") nil re-search-forward t 1 make-marker 2 4 3 5 "/dev/null" re-search-backward "^\\(?:" "\\)" ediff-make-new-meta-list-element point-max-marker ediff-quit error beg1 filenames mark2 mark2-end possible-file-names mark1-end mark1 count ediff-context-diff-label-regexp diff-file-junk-re ediff-patch-map this-command ediff-KILLED-VITAL-BUFFER] 14])
(defalias 'ediff-fixup-patch-map #[(filename) "\306!\307!\203 \310!\202 \311! A\312 \313\314 \"\210\307!\204: \315\230\204: @ \316
8)\317!\317!B\240\210\313\320 \"\210\321\322 \"+\207" [filename ediff-patch-map chosen-alternative multi-patch-p actual-dir elt expand-file-name file-directory-p file-name-as-directory file-name-directory nil mapc #[(session-info) "\306 8@)\307\n@!\206 \310\307\nA!\206 \310 \307
! \311 !\204; \311\f!\204; \312 !\203; \312\f!\203; \310\211)\n@\313\230\204~ \n\211@ \203z \314 \315\216\316\317;\203d \320!\202e \310P
\"\203s
\321\225\322O\202v \323
P*\202{
*\240\210\nA\313\230\206\277 \n\211A\f \203\274 \314 \315\216\316\317;\203\246 \320!\202\247 \310P
\"\203\265
\321\225\322O\202\270 \323
P*\202\275
*\241+\207" [session-info elt proposed-file-names base-dir1 base-dir2 filename 2 file-name-directory #3="" file-name-absolute-p file-exists-p "/dev/null" match-data #[nil "\301\302\"\207" [save-match-data-internal set-match-data evaporate] 3] string-match "^" regexp-quote 0 nil "/null/" default-directory prefix save-match-data-internal] 6] "/dev/null" 2 file-name-nondirectory #[(session-info) "\306 8@)\307\310\n@\"\203\314 \307\310\nA\"\203\314 r\311
!q\210p\312 \210\f\313\211\"#\314\211$\314 % &\315 \210\316\317!\210+\211 '\211 (\211 )\205V \320)!\205V \321\320)!!)\203f r(q\210\322 \210)\202r *\323=\204r \324+!\210\325\326\327\n@\330\313O\nA\330\313O#!\210\331'!\210+\314\313 , --\203\275 \332\333.\211\314$,\334,!\204\252 \313\211-\202\220 \314-\335 \210\336\337,\"\210\340\306!\210\202\216 \306 8),\211B\240*\202\337 \n\341.\n@P!\240\210\n\341.\nAP!\241)\207" [session-info elt proposed-file-names default-directory #1=#:old-dir ediff-msg-buffer 2 string-match "^/null/" get-buffer-create kill-all-local-variables nil t erase-buffer run-hooks temp-buffer-setup-hook get-buffer buffer-name fundamental-mode ediff-quit error princ format-message "\nThe patch file contains a context diff for\n %s\n %s\nHowever, Ediff cannot infer the name of the actual file\nto be patched on your system. If you know the correct file name,\nplease enter it now.\n\nIf you don't know and still would like to apply patches to\nother files, enter `/dev/null'.\n" 6 internal-temp-output-buffer-show read-file-name "Please enter file name: " file-directory-p beep message "%s is a directory" sit-for expand-file-name buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output buf this-command ediff-KILLED-VITAL-BUFFER user-file directory actual-dir] 8] mapcar #[(session-info) "\306 8@)@\306 8@)A\306 8) \307\n! \307 ! +
\2041 +\2031 \f \240\202+\204@
\203@ \f\n\240\202
\203U +\203U \n \230\203U \f\n\240\202
\203k +\203k ,\310=\203k \f\n\240\202
\203\201 +\203\201 ,\306=\203\201 \f \240\202
\203+\203- .r\311/!q\210p\312 \210.-\313\21101\314\2112\314 3 4\315 \210\316\317!\210+\211 5\211 6\211 7\205\315 \3207!\205\315 \321\3207!!)\203\335 r6q\210\322 \210)\202\351 8\323=\204\351 \3249!\210\325\326\327\n \n %!\210\3305!\210+\f\331\332\333\n\"!\203\n\310,\n\202\306, \240\202+\203 \f \240\202
\203'\f\n\240\202- :r\311/!q\210p\312 \210:-\313\21101\314\2112\314 3 4\315 \210\316\317!\210+\211 ;\211 6\211 7\205j\3207!\205j\321\3207!!)\203zr6q\210\322 \210)\202\2068\323=\204\206\3249!\210\325\334!\210\n \230\203\256\325\332\335\n<\203\235\336\202\236\337<\203\247\340\202\250\341$!\210\202\300\325\332\342\n <\203\274\340\202\275\341$!\210\325\343!\210\330;!\210+\314\313 = >>\203\374\344\345?\211\314$=\346=!\204\354\313\211>\202\322\347 \210\350\351=\"\210\352\306!\210\202\320\f=\240*-\207" [session-info elt file1 file2 session-file-object f1-exists 2 file-exists-p 1 get-buffer-create kill-all-local-variables nil t erase-buffer run-hooks temp-buffer-setup-hook get-buffer buffer-name fundamental-mode ediff-quit error princ format-message "\nEdiff has inferred that\n %s\n %s\nare two possible targets for applying the patch.\nBoth files seem to be plausible alternatives.\n\nPlease advise:\n Type `y' to use %s as the target;\n Type `n' to use %s as the target.\n" internal-temp-output-buffer-show y-or-n-p format "Use %s ? " "\nEdiff has inferred that" "\n %s\nis assumed to be %s target for this %spatch. However, this file does not exist." "one" "the" "multi-" #3# "\n %s\n %s\nare two possible targets for this %spatch. However, these files do not exist." "\n\nPlease enter an alternative patch target ...\n" read-file-name "Please enter a patch target: " file-directory-p beep message "%s is a directory" sit-for f2-exists chosen-alternative default-directory #4=#:old-dir ediff-msg-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #5=#:buf standard-output buf this-command ediff-KILLED-VITAL-BUFFER #6=#:old-dir #7=#:buf multi-patch-p target directory actual-dir] 8]] 4])
(defalias 'ediff-show-patch-diagnostics #[nil "\303!\203 \304 \"\207\303\n!\203 \304\n \"\207\305 \306\"\207" [ediff-window-A ediff-patch-diagnostics ediff-window-B window-live-p set-window-buffer display-buffer not-this-window] 3 nil nil])
(defalias 'ediff-prompt-for-patch-file #[nil "\203 \202
\n\206
\f\306 \307\310\311\2032 \312!\313!\232\2032 \314\315!\316Q\2023 \317\"\320$\321
!\203H \322\323
\"\202K \324
!+\207" [ediff-use-last-dir ediff-last-dir-patch ediff-patch-default-directory default-directory ediff-coding-system-for-read patch-file-name nil read-file-name format "Patch is in file%s: " expand-file-name file-name-directory " (default " file-name-nondirectory ")" "" must-match file-directory-p error "Patch file cannot be a directory: %s" find-file-noselect coding-system-for-read dir buffer-file-name] 6])
(defalias 'ediff-prompt-for-patch-buffer #[nil "\303\304\305\212eb\210\306\307\310#)\203 p\202K \311 \312\216\313\314!\210\212eb\210\306\307\310#\205* p+\206K \311 \315\216\313\316!\210\212eb\210\306\307\310#\205D p+\206K \317p!\320#!\207" [ediff-context-diff-label-regexp #1=#:wconfig #2=#:wconfig get-buffer read-buffer "Buffer that holds the patch: " re-search-forward nil t current-window-configuration #[nil "\301!\207" [#1# set-window-configuration] 2] other-window 1 #[nil "\301!\207" [#2# set-window-configuration] 2] -1 ediff-other-buffer must-match] 7])
#@170 Obtain patch buffer. If patch is already in a buffer---use it.
Else, read patch file into a new buffer. If patch buffer is passed as an
optional argument, then use it.
(defalias 'ediff-get-patch-buffer #[(&optional arg patch-buf) "\306\307\n\211\205 \310 !\205 \311\310 !!)\204O \f\250\203- \312\f\313\"\314=\203- \315 \202O \f\250\203A \312\f\313\"\316=\203A \317 \202O \320\321!\203L \315 \202N \317 \n\211\205` \310 !\205` \311\310 !!)\203 r\nq\210eb\210\322\n!\204{ \323\n\324\"\210\325\326 !\210)\202\212
\327=\204\212 \330!\210\331\n!\210\n*\207" [last-command-event last-nonmenu-event patch-buf buf arg this-command t nil get-buffer buffer-name mod 2 0 ediff-prompt-for-patch-buffer 1 ediff-prompt-for-patch-file y-or-n-p "Is the patch already in a buffer? " ediff-get-visible-buffer-window pop-to-buffer other-window select-window previous-window ediff-quit error ediff-map-patch-buffer ediff-KILLED-VITAL-BUFFER] 4 (#$ . 12818)])
(defalias 'ediff-dispatch-file-patching-job #[(patch-buf filename &optional startup-hooks) "\211\205 \306 !\205 \307\306 !!)\203] rq\210\310\n!\210 G\311W\203W \312 \203Q \313\314 @ \311\f8@)\"\204Q @ \311\f8@)G\315V\203Q @ \311\f8@)\202R \n
#\202[ \316
\")\207\317=\206h \320!\207" [patch-buf buf filename ediff-patch-map elt startup-hooks get-buffer buffer-name ediff-fixup-patch-map 2 ediff-patch-file-internal string-match "^/dev/null" 1 ediff-multi-patch-internal ediff-quit error this-command ediff-KILLED-VITAL-BUFFER] 7])
(defalias 'ediff-patch-buffer-internal #[(patch-buf buf-to-patch-name &optional startup-hooks) "\306!\211\205 \307 !\310 !\f\211 \205! \306
!\205! \311\306
!!)\203/ r\fq\210)\202: \312=\206: \313 !G\314V \315\211 \315 \203Q \313\316!\210 \211 \205b \306
!\205b \311\306
!!)\203\222 r q\210! \317 ! \320 !\210\n\204 \315\"\321!\210\322\315!\210\323 \210 !)\202\236 \312=\204\236 \313 !\210\324\f ##\211 \211 \205\270 \306
!\205\270 \311\306
!!)\203Yr q\210\325\307$!!\210\325\307%!!\210$\211 \205\341 \306
!\205\341 \311\306
!!)\203r$q\210 \203\363 !\320\n!\210\321!\210\322 !\210)\202\312=\204\313 !\210%\211 \205!\306
!\205!\311\306
!!)\203Jr%q\210\315\" \2036 !\320\315!\210\321\326\327P\330\"!\210\322\331!)\202U\312=\206U\313 !)\202d\312=\206d\313 !.\207" [buf-to-patch-name buf-to-patch visited-file buf-mod-status patch-buf buf get-buffer buffer-file-name buffer-modified-p buffer-name ediff-quit error 1 nil "To apply multi-file patches, please use `ediff-patch-file'" ediff-make-temp-file set-visited-file-name rename-buffer set-buffer-modified-p set-visited-file-modtime ediff-dispatch-file-patching-job delete-file ediff-unique-buffer-name "_patched" "" t ediff-patch-map this-command ediff-KILLED-VITAL-BUFFER multifile-patch-p default-dir file-name ctl-buf default-directory buffer-auto-save-file-name startup-hooks ediff-buffer-A ediff-buffer-B] 5])
(defalias 'ediff-patch-return-code-ok #[(code) "\301=\207" [code 0] 2])
(autoload 'ediff-find-file "ediff")
(defalias 'ediff-patch-file-internal #[(patch-buf source-filename &optional startup-hooks) "\306! \307\310! \311\312!\205 \n @\313\211 A \313\211 B C\313\211 D E\313 F\314\315G\"\2039 \316\317!\210\320\304\321\322\323$\210\324\f!\324!\232?B\325!\210 \211 H\205c \326H!\205c \327\326H!!)\203\241 r q\210\330I!\210\331\332!\210\333\334!E\335\334\313\"\210\336ed\n\337\211\313J\340\341KGL\306\f!%&C\335\334E\"\210)\202\255 M\342=\204\255 \316N!\210\331\343!\210\331\344!\210\345 !\210\346\347!\210\350C!\203\315 \351\fOP!\204`P Qr\307R!q\210p\352 \210QP\313\211ST\337\211U\337 V W\353 \210\354\355!\210+\211 X\211 Y\211 H\205\326H!\205\327\326H!!)\203 rYq\210\356 \210)\202,M\342=\204,\316N!\210\357\360\361K\211GOL&!\210\362X!\210+\363\364!\210\365R!\211F\203X\366F!\210db\210\367 !\210\370\371!\210B\204\241\211 H\205z\326H!\205z\327\326H!!)\203\222rq\210\372OP!\210\373\313!\210)\202\300M\342=\204\300\316N!\210\202\300\374\324!!\203\255\f\202\256\375P\376\f
\337#\210\376\fOP\f\337#\210\377B\201\\
!A\201] A\313\201^ %\211D\211 H\205\361\326H!\205\361\327\326H!!)\203rDq\210IZ [)\202M\342=\204\316N!\210\201_ !\210\331\201` !\210D.\f\207" [source-filename ediff-shell shell-file-name patch-diagnostics true-source-filename target-filename expand-file-name get-buffer-create "*ediff patch diagnostics*" boundp buffer-file-coding-system nil string-match "V" error "Ediff doesn't take the -V option in `ediff-patch-options'--sorry" ediff-find-file buf-to-patch ediff-last-dir-patch startup-hooks file-truename ediff-maybe-checkout get-buffer buffer-name insert-buffer-substring message "Applying patch ... " getenv "VERSION_CONTROL" setenv call-process-region t format "%s %s %s %s" ediff-quit "Applying patch ... done" "" switch-to-buffer sit-for 0 ediff-patch-return-code-ok file-exists-p kill-all-local-variables erase-buffer run-hooks temp-buffer-setup-hook fundamental-mode princ format-message "Patch program has failed due to a bad patch file,\nit couldn't apply all hunks, OR\nit couldn't create the backup for the file being patched.\n\nThe former could be caused by a corrupt patch file or because the %S\nprogram doesn't understand the format of the patch file in use.\n\nThe second problem might be due to an incompatibility among these settings:\n ediff-patch-program = %S ediff-patch-options = %S\n ediff-backup-extension = %S ediff-backup-specs = %S\n\nSee Ediff manual for more details on these variables.\nIn particular, check the documentation for `ediff-backup-specs'.\n\nIn any of the above cases, Ediff doesn't compare files automatically.\nHowever, if the patch was applied partially and the backup file was created,\nyou can still examine the changes via M-x ediff-files" internal-temp-output-buffer-show beep 1 get-buffer-window select-window switch-to-buffer-other-window user-error "Patch appears to have failed" set-visited-file-name set-buffer-modified-p ediff-file-remote-p "_patched" rename-file ediff-set-read-only-in-buf-A coding-system-for-write target-buf file-name-magic-p patch-return-code ctl-buf backup-style aux-wind ediff-patch-options buf patch-buf shell-command-switch ediff-patch-program ediff-backup-specs this-command ediff-KILLED-VITAL-BUFFER ediff-backup-extension default-directory #1=#:old-dir ediff-msg-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only #2=#:buf standard-output ediff-patchbufer ediff-patch-diagnostics find-file-noselect ediff-buffers-internal epatch bury-buffer "Type `P', if you need to see patch diagnostics"] 16])
(defalias 'ediff-multi-patch-internal #[(patch-buf &optional startup-hooks) "\306\307 B\310\311\n\211\205 \312 !\205 \313\312 !!)\2033 r\nq\210\314\306\315\316\n\"\306\211\211\211&\f)B\202=
\317=\206= \320!\321\322\323 &\324!)\207" [meta-buf startup-hooks patch-buf buf ediff-patch-map this-command nil (lambda nil (setq ediff-session-action-function 'ediff-patch-file-form-meta ediff-meta-patchbufer patch-buf)) ediff-prepare-meta-buffer ediff-filegroup-action get-buffer buffer-name ediff-make-new-meta-list-header format "%S" ediff-quit error "*Ediff Session Group Panel" ediff-redraw-directory-group-buffer ediff-multifile-patch ediff-show-meta-buffer ediff-KILLED-VITAL-BUFFER] 10])
|