commit | author | age
|
5cb5f7
|
1 |
;ELC |
C |
2 |
;;; Compiled |
|
3 |
;;; in Emacs version 26.1 |
|
4 |
;;; with all optimizations. |
|
5 |
|
|
6 |
;;; This file uses dynamic docstrings, first added in Emacs 19.29. |
|
7 |
|
|
8 |
;;; This file does not contain utf-8 non-ASCII characters, |
|
9 |
;;; and so can be loaded in Emacs versions earlier than 23. |
|
10 |
|
|
11 |
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
|
12 |
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
|
13 |
|
|
14 |
|
|
15 |
(byte-code "\300\301!\210\300\302!\210\300\303!\210\304\305\306\307\310DD\311\312\313\314\315\316\317& \210\304\320\306\307\321DD\322\312\323\314\324\316\317& \210\304\325\306\307\326DD\327\312\330\314\324\316\317& \210\304\331\306\307\332DD\333\312\334\314\324\316\335& \207" [require magit-core magit-diff magit-wip custom-declare-variable magit-delete-by-moving-to-trash funcall function #[0 "\300\207" [t] 1] "Whether Magit uses the system's trash can.\n\nYou should absolutely not disable this and also remove `discard'\nfrom `magit-no-confirm'. You shouldn't do that even if you have\nall of the Magit-Wip modes enabled, because those modes do not\ntrack any files that are not tracked in the proper branch." :package-version (magit . "2.1.0") :group magit-essentials :type boolean magit-unstage-committed #[0 "\300\207" [t] 1] "Whether unstaging a committed change reverts it instead.\n\nA committed change cannot be unstaged, because staging and\nunstaging are actions that are concerned with the differences\nbetween the index and the working tree, not with committed\nchanges.\n\nIf this option is non-nil (the default), then typing \"u\"\n(`magit-unstage') on a committed change, causes it to be\nreversed in the index but not the working tree. For more\ninformation see command `magit-reverse-in-index'." (magit . "2.4.1") magit-commands magit-reverse-atomically #[0 "\300\207" [nil] 1] "Whether to reverse changes atomically.\n\nIf some changes can be reversed while others cannot, then nothing\nis reversed if the value of this option is non-nil. But when it\nis nil, then the changes that can be reversed are reversed and\nfor the other changes diff files are created that contain the\nrejected reversals." (magit . "2.7.0") magit-post-stage-hook #[0 "\300\207" [nil] 1] "Hook run after staging changes.\nThis hook is run by `magit-refresh' if `this-command'\nis a member of `magit-post-stage-hook-commands'." (magit . "2.90.0") hook] 10) |
|
16 |
(defvar magit-post-stage-hook-commands '(magit-stage magit-stage-file magit-stage-modified)) |
|
17 |
(byte-code "\300\301\302\303\304DD\305\306\307\310\311\312\313& \207" [custom-declare-variable magit-post-unstage-hook funcall function #[0 "\300\207" [nil] 1] "Hook run after unstaging changes.\nThis hook is run by `magit-refresh' if `this-command'\nis a member of `magit-post-unstage-hook-commands'." :package-version (magit . "2.90.0") :group magit-commands :type hook] 10) |
|
18 |
(defvar magit-post-unstage-hook-commands '(magit-unstage magit-unstage-file magit-unstage-all)) |
|
19 |
#@179 Apply the change at point to the working tree. |
|
20 |
With a prefix argument fallback to a 3-way merge. Doing |
|
21 |
so causes the change to be applied to the index as well. |
|
22 |
|
|
23 |
(fn &rest ARGS) |
|
24 |
(defalias 'magit-apply #[128 "\300 \211\205\215\301 \302 D\211:\205\213\211@\211\303>\2030 A\211:\205+ \211A\211?\205) \304\305!\262\262\202\211\211\306=\203\323 A\211:\205\316 \211@\211\307>\203S A\211?\205N \310 \262\202\314 \211\311=\203k A\211?\205f \312\"\262\202\314 \211\313=\203\203 A\211?\205~ \314\"\262\202\314 \211\315=\203\233 A\211?\205\226 \316\"\262\202\314 \211\317=\203\263 A\211?\205\256 \320\"\262\202\314 \211\321=\203\313 A\211?\205\306 \322\"\262\202\314 \323\262\262\202\211A\211:\205\207\211@\211\311=\203\364 A\211?\205\357 \312\"\262\202\205\211\313=\203\fA\211?\205\314\"\262\202\205\211\315=\203$A\211?\205\316\"\262\202\205\324=\203T\211\325\267\202PA\211?\2059\326 \262\202\205A\211?\205K\322\"\262\202\205\323\202\205\211\317=\203lA\211?\205g\320\"\262\202\205\211\321=\203\204A\211?\205\322\"\262\202\205\323\262\262\262\262\207" [magit-apply--get-selection magit-diff-type magit-diff-scope (staged unstaged) user-error "Change is already in the working tree" untracked (files file) magit-am-popup region magit-apply-region hunk magit-apply-hunk hunks magit-apply-hunks file magit-apply-diff files magit-apply-diffs nil rebase-sequence #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (file 304 files 318)) magit-patch-apply-popup] 10 (#$ . 2932) (byte-code "\205 \301C\207" [current-prefix-arg "--3way"] 1)]) |
|
25 |
#@16 |
|
26 |
|
|
27 |
(fn SECTION) |
|
28 |
(defalias 'magit-apply--section-content #[257 "\300\301!\203 \302\303\"\202 \302\304\"\302\305\"\"\207" [buffer-substring-no-properties magit-hunk-section-p eieio-oref start content end] 6 (#$ . 4607)]) |
|
29 |
#@28 |
|
30 |
|
|
31 |
(fn SECTIONS &rest ARGS) |
|
32 |
(defalias 'magit-apply-diffs #[385 "\300!\262\301\302\303\304##\207" [magit-apply--get-diffs magit-apply-patch mapconcat #[257 "\300!\301!P\207" [magit-diff-file-header magit-apply--section-content] 4 "\n\n(fn S)"] ""] 9 (#$ . 4837)]) |
|
33 |
#@27 |
|
34 |
|
|
35 |
(fn SECTION &rest ARGS) |
|
36 |
(defalias 'magit-apply-diff #[385 "\300C!@\262\301\302!\303!P#\207" [magit-apply--get-diffs magit-apply-patch magit-diff-file-header magit-apply--section-content] 8 (#$ . 5113)]) |
|
37 |
#@28 |
|
38 |
|
|
39 |
(fn SECTIONS &rest ARGS) |
|
40 |
(defalias 'magit-apply-hunks #[385 "\300@\301\"\302\303\300\304\"\"\203 \305\306!\210\307\300\310\"\311\312\313#P#\207" [eieio-oref parent string-match "^diff --cc" value user-error "Cannot un-/stage resolution hunks. Stage the whole file" magit-apply-patch header mapconcat magit-apply--section-content ""] 11 (#$ . 5331)]) |
|
41 |
#@27 |
|
42 |
|
|
43 |
(fn SECTION &rest ARGS) |
|
44 |
(defalias 'magit-apply-hunk #[385 "\300\301\302!\"\203
\303\304!\210\305\306\307\"\310!\311!P#\207" [string-match "^diff --cc" magit-section-parent-value user-error "Cannot un-/stage resolution hunks. Stage the whole file" magit-apply-patch eieio-oref parent magit-diff-file-header magit-apply--section-content] 8 (#$ . 5698)]) |
|
45 |
#@27 |
|
46 |
|
|
47 |
(fn SECTION &rest ARGS) |
|
48 |
(defalias 'magit-apply-region #[385 "\300 \204 |