Current File : //kunden/usr/share/emacs/27.2/lisp/vc/ediff-ptch.elc

;ELC
;;; Compiled
;;; in Emacs version 27.2
;;; 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\304\305\306\307\310\311\312\313&	\210\300\314!\210\300\315!\210\300\313!\210\316\317\320\321\322DD\323\324\325%\210\316\326\320\321\327DD\330\324\325%\207" [require diff-mode custom-declare-group ediff-ptch nil "Ediff patch support." :tag "Patch" :prefix "ediff-" :group ediff ediff-init ediff-util custom-declare-variable ediff-patch-program funcall function #[0 "\300\207" [#1="patch"] 1 #1#] "Name of the program that applies patches.\nIt is recommended to use GNU-compatible versions." :type string ediff-patch-options #[0 "\300\207" [#2="-f"] 1 #2#] "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 (#$ . 1336))
(defconst ediff-default-backup-extension (byte-code "\301=\203\302\207\303\207" [system-type ms-dos "_orig" ".orig"] 2))
(byte-code "\300\301\302\303\304DD\305\306\307%\207" [custom-declare-variable ediff-backup-extension funcall function #[0 "\207" [ediff-default-backup-extension] 1] "Backup extension used by the patch program.\nSee also `ediff-backup-specs'." :type string] 6)
(defalias 'ediff-test-patch-utility #[0 "\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\304DD\305\306\307%\210\300\310\302\303\311DD\312\306\313%\210\300\314\302\303\315DD\316\306\317%\207" [custom-declare-variable ediff-backup-specs funcall function #[0 "\302 \211\303\267\202\304\305\"\202	\306\202\304\307\"\207" [ediff-backup-extension ediff-default-backup-extension ediff-test-patch-utility #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (gnu 8 posix 15)) format "-z%s -b" "-b" "-b %s"] 4] "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 ediff-patch-default-directory #[0 "\300\207" [nil] 1] "Default directory to look for patches." (choice (const nil) string) ediff-context-diff-label-regexp #[0 "\300\301
\302\303\304\305\260	\207" ["\\([^ 	\n]+\\)" "\\(^\\*\\*\\* +" "[^*]+[	 ]*\n--- +" "\\|^--- +" ".*\n\\+\\+\\+ +" "\\)"] 10] "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] 6)
#@2 
(defvar ediff-patchbufer nil (#$ . 4188))
(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 (#$ . 4355))
(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 (#$ . 4536))
(byte-code "\300\301!\210\302\301\303\304#\207" [make-variable-buffer-local ediff-patch-map put permanent-local t] 4)
#@24 

(fn FILENAME PREFIX)
(defalias 'ediff-file-name-sans-prefix #[514 "\211\2033\300 \301\302\303\304\305!\306\"\307$\216\310\311;\203\312!\202 \313P\"\203.\314\302\225\"\2021\315P)\207
\207" [match-data make-byte-code 0 "\301\300\302\"\207" vconcat vector [set-match-data evaporate] 3 string-match "^" regexp-quote "" substring "/null/"] 9 (#$ . 4702)])
(put 'ediff-file-name-sans-prefix 'byte-optimizer 'byte-compile-inline-expand)
#@19 

(fn REGEXP BUF)
(defalias 'ediff-count-matches #[514 "\211\211\205\302
!\205\303\302!!\262
\203Gr\211q\210\304\305\212eb\210m\204A`\262
\306\305\307#\203A\211`U\203:\310u\210\202
T\262\202)
\266\202)\207\311=\206P\312	!\207" [this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name 0 nil re-search-forward t 1 ediff-quit error] 8 (#$ . 5152)])
#@12 

(fn BUF)
(defalias 'ediff-map-patch-buffer #[257 "\211\211\205\305
!\205\306\305!!\262
\203\363r\211q\210\307\310 e\311\312\211\211\211\211\211\211\211\211\212eb\210`\262
m\204\331\313\312\314#\203\331\211`U\203F\315u\210\202\316\316 \307\224\312\223\262\307\225\262	\317\224\206Y\320\224\262\317\225\206b\320\225\262\321\224\206k\322\224\262\321\225\206t\322\225\262\203\204\203\204{\202\205\323\203\223\203\223{\202\224\323B\262\n\324\325	\326Q\f\314#\203\255\307\224\312\223\210\202\227b\210\203\302\327
\n#B\262\262\f\262	\262`\262
\fT\262
\202.)\330 \262\327\n
\n#B\262
\237\f\266\215)\207\331=\206\374\332\f!\207" [ediff-context-diff-label-regexp diff-file-junk-re ediff-patch-map this-command ediff-KILLED-VITAL-BUFFER 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] 18 (#$ . 5527)])
#@17 

(fn FILENAME)
(defalias 'ediff-fixup-patch-map #[257 "\211C\211\301\242!\240\210\302
\242!\203\303
\242!\202\304
\242!A\305C\306\307\310\311\312\313	!\314\"\315\316%\"\210\302\242!\204Q\242\317\230\204Q@\320
8\262
\321\242!\321\242!B\240\210\306\307\310\322\312\313!\323\"\324\316%\"\210\325\307\310\326\312\313#\327\"\330\316%\"\266\203\207" [ediff-patch-map expand-file-name file-directory-p file-name-as-directory file-name-directory nil mapc make-byte-code 257 "\211\302
8@\262
\303
@!\206\304\303A!\206\304\303\300\242!\305!\204\213\305
!\204\213\306!\203=\306
!\203=\304\262\304\262
\202\213\307 \310\311\312\313\314!\315\"\316$\216\317\320\"\205^\321\311\211\225#\321\311\225\"B\317\320\"\205q\321\311\211\225#\321\311\225\"B\306A!\203\207\306
A!\203\207
@\262\211@\262\266)\210)@\322\230\204\323\211@\211\203\316\307 \310\311\312\313\314!\323\"\316$\216\317\324;\203\266\325!\202\267\304P\"\203\305\321\311\225\"\202\310\326P)\266\203\202\321
\266\202\240\210A\322\230\206
\211A\211\203
\307 \310\311\312\313\314!\323\"\316$\216\317\324;\203\375\325!\202\376\304P\"\203\f
\321\311\225\"\202
\326P)\266\203\202

\266\202\241\207" vconcat vector [default-directory 2 file-name-directory #1="" file-name-absolute-p file-exists-p match-data make-byte-code 0 "\301\300\302\"\207" vconcat vector [set-match-data evaporate] 3 string-match "^[^/]+/" substring "/dev/null" [set-match-data evaporate] "^" regexp-quote "/null/"] 14 "\n\n(fn SESSION-INFO)" "/dev/null" 2 file-name-nondirectory "\211\306
8@\262
\307
@\310\311\312#)\266\203\203\317\307
A\310\311\312#)\266\203\203\317\nr\313!q\210p\314 \210
\310\211\311\211#\311$%\315 \210\316\317!\210+\211&\211\211\205^\320
!\205^\321\320!!\262
\203or&q\210\322 \210)\202{'\323=\204{\324(!\210\325\326\327\330@\331\"\330A\331\"#!\210\332
!\210)\266\311\310
\203\300\333\334\300\211\311$\262
\335
!\204\256\310\262\202\226\311\262\336 \210\337\340\"\210\341\306!\210\202\226\306
8\262

\211B\240\266\202\202\340\211\342\300@P!\240\210\211\342\300AP!\241\207" [inhibit-changing-match-data default-directory ediff-msg-buffer buffer-read-only buffer-file-name 2 "^/null/" nil t string-match get-buffer-create kill-all-local-variables 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" substring 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-undo-list inhibit-modification-hooks inhibit-read-only standard-output this-command ediff-KILLED-VITAL-BUFFER] 12 mapcar "\211\306
8@\262
@
\306
8@\262
A\306
8\262
\307!\307!
\204*\211\203*\240\202\336
\211\2048
\2038\240\202\336

\203L\211\203L\230\203L\240\202\336

\203a\211\203a\302\242\310=\203a\240\202\336

\203v\211\203v\302\242\306=\203v\240\202\336

\203
\211\203
r\311\f!q\210p\312 \210
\313\211+\314\211,\314-.\315 \210\316\317!\210+\211/\211\211\205\264\320
!\205\264\321\320!!\262
\203\305r/q\210\322 \210)\202\3210\323=\204\321\3241!\210\325\326\327		%!\210\330
!\210)\266\331\332\333\"!\203\371\302\310\240\210\202\376\302\306\240\210\240\202\336
\211\203\f
\240\202\336

\203
\240\202\336
r\311\f!q\210p\312 \210
\313\211+\314\211,\314-.\315 \210\316\317!\210+\211/\211\211\205L
\320
!\205L
\321\320!!\262
\203]
r/q\210\322 \210)\202i
0\323=\204i
\3241!\210\325\334!\210\230\203\222
\325\332\335	\301\203\202
\336\202\203
\337\301\203\213
\340\202\214
\341$!\210\202\245
\325\332\342		\301\203\241
\340\202\242
\341$!\210\325\343!\210\330
!\210)\266\314\313
\203\331
\344\345\300\211\314$\262
\346
!\204\312
\313\262\202\262
\347 \210\350\351\"\210\352\306!\210\202\262

\240\266\202\207" [default-directory ediff-msg-buffer buffer-read-only 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-" #1# "\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 buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only standard-output this-command ediff-KILLED-VITAL-BUFFER] 16] 14 (#$ . 6577)])
(defalias 'ediff-show-patch-diagnostics #[0 "\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 #[0 "\203	\202
\n\206
\f\306
\307\310\311\203/\312!\313!\232\203/\314\315!\316Q\2020\317\"\320$\262
\321
!\203E\322\323\"\202H\324
!)\207" [ediff-use-last-dir ediff-last-dir-patch ediff-patch-default-directory default-directory ediff-coding-system-for-read coding-system-for-read 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 buffer-file-name] 9])
(defalias 'ediff-prompt-for-patch-buffer #[0 "\301\302\303\212eb\210\304\305\306#)\203p\202a\307 \310\311\312\313\314!\315\"\316$\216\317\320!\210\212eb\210\304\305\306#\2053p*\262
\206a\307 \310\311\312\313\314!\321\"\316$\216\317\322!\210\212eb\210\304\305\306#\205Xp*\262
\206a\323p!\324#!\207" [ediff-context-diff-label-regexp get-buffer read-buffer "Buffer that holds the patch: " re-search-forward nil t current-window-configuration make-byte-code 0 "\301\300!\207" vconcat vector [set-window-configuration] 2 other-window 1 [set-window-configuration] -1 ediff-other-buffer must-match] 10])
#@200 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.

(fn &optional ARG PATCH-BUF)
(defalias 'ediff-get-patch-buffer #[512 "\304\305\211\211\205\306
!\205\307\306!!\262
\204R
\250\203.\310\311\"\312=\203.\313 \262
\202R
\250\203C\310\311\"\314=\203C\315 \262
\202R\316\317!\203N\313 \202P\315 \262
\211\211\205b\306
!\205b\307\306!!\262
\203\202r\211q\210eb\210\320
!\204~\321
\322\"\210\323\324 !\210)\202\214\n\325=\204\214\326!\210\327
!\210*\207" [last-command-event last-nonmenu-event this-command ediff-KILLED-VITAL-BUFFER 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] 6 (#$ . 13307)])
#@51 

(fn PATCH-BUF FILENAME &optional STARTUP-HOOKS)
(defalias 'ediff-dispatch-file-patching-job #[770 "\211\205\304
!\205\305\304!!\262
\203frq\210\306!\210G\307W\203`\310\203Z\311@\307
8@\262
\312\313\314#)\266\203\204Z@\307
8@\262
G\315V\203Z@\307
8@\262
\202[#\202d\316\")\207\n\317=\206o\320!\207" [ediff-patch-map inhibit-changing-match-data this-command ediff-KILLED-VITAL-BUFFER get-buffer buffer-name ediff-fixup-patch-map 2 ediff-patch-file-internal "^/dev/null" nil t string-match 1 ediff-multi-patch-internal ediff-quit error] 12 (#$ . 14274)])
#@60 

(fn PATCH-BUF BUF-TO-PATCH-NAME &optional STARTUP-HOOKS)
(defalias 'ediff-patch-buffer-internal #[770 "\306!\211\205\n\307
!\310!\211\205\306
!\205\311\306!!\262
\203+rq\210)\2024	\312=\2064\313\n!G\314V\315\211\211\203B\313\316!\210\211\205S\306
!\205S\311\306!!\262
\203\202rq\210\262\317!\262\320!\210\204p\315\321	!\210\322\315!\210\323 \210)\202\214	\312=\204\214\313\n!\210\324\n\n#\262
\211\211\205\245\306
!\205\245\311\306!!\262
\203;
r\211q\210\325\307
!!\210\325\307!!\210
\211\205\313\306
!\205\313\311\306!!\262
\203\354r
q\210\203\332\320!\210\321	!\210\322!\210)\202\366	\312=\204\366\313\n!\210\211\205
\306
!\205
\311\306!!\262
\203.
rq\210\315\203
\320\315!\210\321\326\n\327P\330\"!\210\322\331!)\2027
	\312=\2067
\313\n!)\202D
	\312=\206D
\313\n!\207" [ediff-patch-map this-command ediff-KILLED-VITAL-BUFFER default-directory buffer-auto-save-file-name ediff-buffer-A 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-buffer-B] 14 (#$ . 14865)])
#@13 

(fn CODE)
(defalias 'ediff-patch-return-code-ok #[257 "\211\300=\207" [0] 3 (#$ . 16200)])
(autoload 'ediff-find-file "ediff")
#@58 

(fn PATCH-BUF SOURCE-FILENAME &optional STARTUP-HOOKS)
(defalias 'ediff-patch-file-internal #[770 "\306!\262\307\310!\211\311\302!\205\n\312\211\211\211\211\211\211\313
\312\314@\315#)\266\203\2032\316\317!\210\320	\321\"\262\f\262rq\210A)\262\322!\210	\211\205[\323
!\205[\324\323!!\262
\203\232r	q\210\325
!\210\326\327!\210\330\331!\262\332\331\312\"\210\333ed	\314\211\312B\334\335C
D\336!%&\262\332\331\"\210)\202\246E\337=\204\246\316F!\210\326\340!\210\326\341!\210\342\n!\210\343\344!\210\345!\203\311\346\336!GP!\204T
Hr\307I!q\210p\347 \210
H\312\211JK\314\211L\314MN\350 \210\351\352!\210+\211O\211\211\205
\323
!\205
\324\323!!\262
\203
rOq\210\353 \210)\202 
E\337=\204 
\316F!\210\354\355\356C\211
GD&!\210\357
!\210)\266\360\361!\210\362I!\211\262\203K
\363
!\210db\210\364\n!\210\365\366!\210\204\220
\211\205h
\323
!\205h
\324\323!!\262
\203\201
rq\210\367\fGP!\210\370\312!\210)\202\264
E\337=\204\264
\316F!\210\202\264
\371\372
!!\203\235
\202\237
\373P\262\374	\314#\210\374GP\314#\210\375B\262\376!\262\377\312\201R%\262\211\205\336
\323
!\205\336
\324\323!!\262
\203\363
rq\210\fP	Q)\202\377
E\337=\204\377
\316F!\210\201S\n!\210\326\201T!\210+\207" [ediff-shell shell-file-name buffer-file-coding-system coding-system-for-write ediff--startup-hook ediff-patch-options expand-file-name get-buffer-create "*ediff patch diagnostics*" boundp nil "V" t string-match error "Ediff doesn't take the -V option in `ediff-patch-options'--sorry" ediff-find-file ediff-last-dir-patch ediff-maybe-checkout get-buffer buffer-name insert-buffer-substring message "Applying patch ... " getenv "VERSION_CONTROL" setenv call-process-region format "%s %s %s %s" ediff--buffer-file-name 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 file-truename "_patched" rename-file ediff-set-read-only-in-buf-A find-file-noselect ediff-buffers-internal inhibit-changing-match-data ediff--magic-file-name shell-command-switch ediff-patch-program ediff-backup-specs this-command ediff-KILLED-VITAL-BUFFER ediff-backup-extension default-directory ediff-msg-buffer buffer-read-only buffer-file-name buffer-undo-list inhibit-modification-hooks inhibit-read-only standard-output ediff-patchbufer ediff-patch-diagnostics epatch bury-buffer "Type `P', if you need to see patch diagnostics"] 29 (#$ . 16335)])
#@42 

(fn PATCH-BUF &optional STARTUP-HOOKS)
(defalias 'ediff-multi-patch-internal #[513 "\303\304\305\306\307\310!\311\"\312$B\262\313\314\211\205#\315
!\205#\316\315!!\262
\203?rq\210\317\303\320\321\"\303\211\211\211&)B\202H	\322=\206H\323\n!\324\325\326&\262
\327
!\207" [ediff-patch-map this-command ediff-KILLED-VITAL-BUFFER nil make-byte-code 0 "\303\300\211\207" vconcat vector [ediff-session-action-function ediff-meta-patchbufer ediff-patch-file-form-meta] 2 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] 12 (#$ . 19968)])
(provide 'ediff-ptch)