;ELC ;;; Compiled ;;; in Emacs version 29.3 ;;; with all optimizations. (byte-code "\300\301!\210\300\302!\210\300\303!\210\304\305\306\307\310\311\312\313&\210\314\315\316\317\320DD\321\322\323\312\305\324\325\326\327\330\331C& \210\314\332\316\317\333DD\334\322\335\312\305\324\336& \210\314\337\316\317\340DD\341\322\342\312\305\324\343& \210\314\344\316\317\345DD\346\322\347\312\305\324\343& \207" [require magit ediff smerge-mode custom-declare-group magit-ediff nil "Ediff support for Magit." :link (info-link "(magit)Ediffing") :group magit-extensions custom-declare-variable magit-ediff-quit-hook funcall function #[0 "\300C\207" [magit-ediff-restore-previous-winconf] 1 #1=""] "Hooks to run after finishing Ediff, when that was invoked using Magit.\nThe hooks are run in the Ediff control buffer. This is similar\nto `ediff-quit-hook' but takes the needs of Magit into account.\nThe `ediff-quit-hook' is ignored by Ediff sessions which were\ninvoked using Magit." :package-version (magit . "4.6.0") :type hook :get magit-hook-custom-get :options magit-ediff-restore-previous-winconf magit-ediff-dwim-resolve-function #[0 "\300\207" [magit-ediff-resolve-rest] 1 #1#] "The function `magit-ediff-dwim' uses to resolve conflicts." (magit . "4.0.0") (choice (const magit-ediff-resolve-rest) (const magit-ediff-resolve-all) (const magit-git-mergetool)) magit-ediff-dwim-show-on-hunks #[0 "\300\207" [nil] 1 #1#] "Whether `magit-ediff-dwim' runs show variants on hunks.\nIf non-nil, `magit-ediff-show-staged' or\n`magit-ediff-show-unstaged' are called based on what section the\nhunk is in. Otherwise, `magit-ediff-dwim' runs\n`magit-ediff-stage' when point is on an uncommitted hunk." (magit . "2.2.0") boolean magit-ediff-show-stash-with-index #[0 "\300\207" [t] 1 #1#] "Whether `magit-ediff-show-stash' shows the state of the index.\n\nIf non-nil, use a third Ediff buffer to distinguish which changes\nin the stash were staged. In cases where the stash contains no\nstaged changes, fall back to a two-buffer Ediff.\n\nMore specifically, a stash is a merge commit, stash@{N}, with\npotentially three parents.\n\n* stash@{N}^1 represents the `HEAD' commit at the time the stash\n was created.\n\n* stash@{N}^2 records any changes that were staged when the stash\n was made.\n\n* stash@{N}^3, if it exists, contains files that were untracked\n when stashing.\n\nIf this option is non-nil, `magit-ediff-show-stash' will run\nEdiff on a file using three buffers: one for stash@{N}, another\nfor stash@{N}^1, and a third for stash@{N}^2.\n\nOtherwise, Ediff uses two buffers, comparing\nstash@{N}^1..stash@{N}. Along with any unstaged changes, changes\nin the index commit, stash@{N}^2, will be shown in this\ncomparison unless they conflicted with changes in the working\ntree at the time of stashing." (magit . "2.6.0")] 14)#@157 Whether to use indirect buffers. Ediff already does a lot of buffer and file shuffling and I recommend you do not further complicate that by enabling this. (defvar magit-ediff-use-indirect-buffers nil (#$ . 2848)) (defvar magit-ediff-previous-winconf nil) (defalias 'magit-ediff #[0 "\300\301!\207" [transient-setup magit-ediff] 2 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\210\313\301\314\315\316\317D\314\320\321\322\323\324\316\325\310\326\257\322\323\327\316\330\310\331\257D#\314\320\321\322\323\332\316\333\310\334\257\322\323\335\316\336\310\337\257\322\323\340\316\341\310\342\257E#\314\320\321\322\323\343\316\344\310\345\257\322\323\346\316\347\310\350\257\322\323\351\316\352\310\353\257E#\314\320\321\322\323\354\316\355\310\356\257\322\323\357\316\360\310\361\257\322\323\362\316\363\310\364\257E#F#C\"\207" [put magit-ediff interactive-only t function-documentation "Show differences using the Ediff package." transient--prefix transient-prefix :command :info-manual "(ediff)" transient--set-layout vector transient-columns :description "Ediff" transient-column nil transient-suffix :key "E" "Dwim" magit-ediff-dwim "s" "Stage" magit-ediff-stage "m" "Resolve rest" magit-ediff-resolve-rest "M" "Resolve all conflicts" magit-ediff-resolve-all "t" "Resolve using mergetool" magit-git-mergetool "u" "Show unstaged" magit-ediff-show-unstaged "i" "Show staged" magit-ediff-show-staged "w" "Show worktree" magit-ediff-show-working-tree "c" "Show commit" magit-ediff-show-commit "r" "Show range" magit-ediff-compare "z" "Show stash" magit-ediff-show-stash] 20)#@13 (fn FILE) (defalias 'magit-ediff-resolve-all #[257 "\301 \302 \303\304!\206\305\304!\306\307\310\"\311\"\303!\206\305!\305\312\"!\313#\313#\313#\206B\313#\314 !\211\203d\315!\203`\316\317\320\321!\322#!\204`\323\324!\210\325!\210\210\326P\327!\203x\330\331\332P!\"\210\330\n\"\266\333\307\334 \"\335\336\n\"\336 \"\205\234\336 \"&\266\212)\207" [default-directory magit--toplevel-safe magit-gitdir magit-name-branch "HEAD" magit-commit-oid cl-find-if make-closure #[257 "\301\302\300\"!\207" [V0 file-exists-p expand-file-name] 5 "\n\n(fn %)"] ("MERGE_HEAD" "CHERRY_PICK_HEAD" "REVERT_HEAD") magit-merge-base magit--rev-file-name find-buffer-visiting buffer-modified-p y-or-n-p format "Save buffer %s %s? " buffer-name "(cannot continue otherwise)" user-error "Abort" kill-buffer ".ORIG" file-exists-p rename-file make-temp-name "_" #[0 "\301\300!\210\302\211\207" [ediff-combination-pattern make-local-variable ("<<<<<<< HEAD" A (\, (format "||||||| %s" revC)) Ancestor "=======" B (\, (format ">>>>>>> %s" revB)))] 2] #[0 "\302 !\205r q\210\303 \210\212eb\210\304\305\306\307#?\205\310\300C!*\207" [V0 ediff-buffer-C buffer-live-p save-buffer re-search-forward "^<<<<<<< " nil t magit-stage-files] 4] magit-ediff-buffers magit-ediff--find-file] 18 (#$ . 4488) (byte-code "\300 C\207" [magit-read-unmerged-file] 1)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-resolve-all interactive-only t function-documentation "Resolve all conflicts in the FILE at point using Ediff.\n\nIf there is no file at point or if it doesn't have any unmerged\nchanges, then prompt for a file.\n\nSee info node `(magit) Ediffing' for more information about this\nand alternative commands." transient--suffix transient-suffix :command :inapt-if-not magit-anything-unmerged-p] 8)#@13 (fn FILE) (defalias 'magit-ediff-resolve-rest #[257 "\303 \304 r\305!q\210\306 \210\307\301!\210\310\307\302!\210\310\311\302\312\313\211$\210\311\302\314\313\211$\210\311\302\315\316\"\313\211$*\207" [default-directory ediff-quit-merge-hook ediff-quit-hook magit--toplevel-safe current-window-configuration find-file-noselect smerge-ediff make-local-variable nil add-hook #[0 " r\211q\210\303\304\305\n\"!\205\306 \210\307!\210\310 )\207" [ediff-buffer-C smerge-ediff-buf buffer-file-name yes-or-no-p format "Conflict resolution finished; save %s? " erase-buffer insert-buffer-substring save-buffer] 6] t #[0 "\300\301!\207" [magit-ediff--cleanup-buffers t] 2] make-closure #[0 "\300\302\303!)\207" [V0 magit-ediff-previous-winconf run-hooks magit-ediff-quit-hook] 2]] 7 (#$ . 6389) (byte-code "\300 C\207" [magit-read-unmerged-file] 1)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-resolve-rest interactive-only t function-documentation "Resolve outstanding conflicts in the FILE at point using Ediff.\n\nIf there is no file at point or if it doesn't have any unmerged\nchanges, then prompt for a file.\n\nSee info node `(magit) Ediffing' for more information about this\nand alternative commands." transient--suffix transient-suffix :command :inapt-if-not magit-anything-unmerged-p] 8)#@13 (fn FILE) (defalias 'magit-ediff-stage #[257 "\302 \303\304\"\305\306\"\303\307\"\303\310\"\305\311\"\305\312\"rq\210\312\313!)\210\314\315\316\317  $%)\266\205)\207" [default-directory coding-system-for-read magit--toplevel-safe magit-ediff--find-file "{worktree}" buffer-local-value buffer-file-coding-system "HEAD" "{index}" buffer-read-only magit-blob-mode -1 magit-ediff-buffers nil make-closure #[0 "\306 !\2034\301\203&r\302q\210\300\203\307\310!\210\202%\311\304!\210\312\311\305!\210\312)\313 !\2034r q\210\314 )\210\306!\205T\313!\205Trq\210\315\316\317\"!\205S\320 )\207" [V0 V1 V2 ediff-buffer-B buffer-read-only read-only-mode--state buffer-live-p magit-blob-mode 1 make-local-variable t buffer-modified-p magit-update-index y-or-n-p format "Save file %s? " save-buffer ediff-buffer-C buffer-file-name] 4]] 16 (#$ . 7762) (byte-code "\300 \301\302\303\304\303\211\305 \235@&C\207" [magit-tracked-files magit-completing-read "Selectively stage file" nil t magit-current-file] 10)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-stage interactive-only t function-documentation "Stage and unstage changes to FILE using Ediff.\nFILE has to be relative to the top directory of the repository." transient--suffix transient-suffix :command :inapt-if-not magit-anything-modified-p] 8)#@30 (fn REVA REVB FILEA FILEB) (defalias 'magit-ediff-compare #[1028 "\300\301\"\301\"\"\207" [magit-ediff-buffers magit-ediff--find-file] 9 (#$ . 9164) (byte-code "\301\302\"\211\242\243\211\242\243D\303\"\244\207" [current-prefix-arg magit-ediff-compare--read-revisions nil magit-ediff-read-files] 9)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\"#\207" [put magit-ediff-compare interactive-only t function-documentation "Compare REVA:FILEA with REVB:FILEB using Ediff.\n\nFILEA and FILEB have to be relative to the top directory of the\nrepository.\n\nIf the region is active, use the revisions on the first and last\nline of the region. With a prefix argument, instead of diffing\nthe revisions, choose a revision to view changes along, starting\nat the common ancestor of both revisions (i.e., use a \"...\"\nrange)." transient--suffix transient-suffix :command] 6)#@28 (fn &optional ARG MBASE) (defalias 'magit-ediff-compare--read-revisions #[512 "\206 \300\301\302#\302\303!\211\262\203\211@AD\207\304D\207" [magit-diff-read-range-or-commit "Compare range or commit" nil magit-split-range "{worktree}"] 6 (#$ . 10086)])#@174 Read file in REVB, return it and the corresponding file in REVA. When FILEB is non-nil, use this as REVB's file instead of prompting for it. (fn REVA REVB &optional FILEB) (defalias 'magit-ediff-read-files #[770 "\303\232\203 \304\262\303\232\203\304\262\211\203\211\305!\235\204`\211\203D\203D\306\307!\203D\310 \235\203D\311\312\313\211\n\314\"@\315\"\"\"A\206^\316\317\320\206M\321#\322\"\317\323\206\\\321##\262\211\305!\235@\206\216\311\312\"\"A\206\216\316\317\324\206\200\321$\322\"\317\325##D\207" [magit-buffer-log-files magit-buffer-log-args magit-root-section "{worktree}" nil magit-revision-files derived-mode-p magit-log-mode "--follow" assoc magit-renamed-files eieio-oref children value magit-read-file-choice format "File to compare between %s and %s" "the working tree" magit-changed-files "No changed files between %s and %s" "File in %s to compare with %s in %s" "No files have changed between %s and %s"] 11 (#$ . 10355)]) (defalias 'magit-ediff-dwim #[0 "\302 \211\203\303\304\"\203\212\305\211\306\"\307\"b\210\310 )\207\311 \312 \313C\313C\313C\314\315\316\317\204\242\320>\203F\321 \203? \202@\322\240\266\202:\203\200\242\211\323\267\202s \243 #\266\202 \243 #\266\202#\266\202;\203\225\211 $\266\202#\266\202\324\267\202\273\325\240\266\202\326\240\266\202:\203\365\242\211\327\267\202\350 \243 #\266\202 \243 #\266\202#\266\202;\203\n\211 $\266\202#\266\242\204`\330\331\332\333\334\335\336\257\337C\244\340\341!\342\343\344#\266\202\345\346!@\347\260\262\350\"\211\351\267\202W\352\202X\353\202X\322\202X\354\202X\355\202X\313\262\356\357!\210!\207\242\353=\203y\360\353\242\242\361\242\242\n#$\207\242\352=\203\205\352\242!\207\242\362=\203\221\362\242!\207\203\232\242!\207\330\242!\207" [magit-ediff-dwim-show-on-hunks magit-ediff-dwim-resolve-function magit-current-section magit-section-match-1 hunk eieio-oref parent start magit-ediff-dwim magit-diff--dwim magit-current-file nil #[771 "\300\240\210\240\207" [magit-ediff-show-commit] 5 "\n\n(fn COMMAND REVB VALUE)"] #[771 "\300\240\210\240\207" [magit-ediff-show-stash] 5 "\n\n(fn COMMAND REVB VALUE)"] #[771 "\302\303!\205P\304 \211\305=\203)\306!\211\242\243\211\242\243\240\210\240\266\204\262\202N \2043\307\240\202N\211\310\267\202K\311\240\202N\312\240\202N\313\240\202N\313\240\262\207" [magit-buffer-diff-range magit-ediff-dwim-show-on-hunks derived-mode-p magit-diff-mode magit-diff-type committed magit-ediff-compare--read-revisions magit-ediff-stage #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (unstaged 57 staged 63 undefined 69)) magit-ediff-show-unstaged magit-ediff-show-staged nil] 11 "\n\n(fn COMMAND REVA REVB)"] #[1028 "\300!\211\242\243\211\242\243\301\240\210\240\210\240\207" [magit-ediff-compare--read-revisions magit-ediff-compare] 11 "\n\n(fn RANGE COMMAND REVA REVB)"] (staged unstaged) magit-anything-unmerged-p magit-ediff-stage #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (commit 85 stash 100)) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (unstaged 169 staged 178)) magit-ediff-show-unstaged magit-ediff-show-staged #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (commit 202 stash 217)) call-interactively read-char-choice "[c]ommit" "[r]ange" "[s]tage" "[m] resolve remaining conflicts" "[M] resolve all conflicts" "[C-g] to abort" "Failed to read your mind; do you want to " butlast ", " mapconcat identity ", or " last " " (99 114 115 109 77) #s(hash-table size 5 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (99 323 114 327 115 331 109 335 77 339)) magit-ediff-show-commit magit-ediff-compare magit-ediff-resolve-rest magit-ediff-resolve-all message "" apply magit-ediff-read-files magit-ediff-show-stash] 16 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\"#\207" [put magit-ediff-dwim interactive-only t function-documentation "Compare, stage, or resolve using Ediff.\nThis command tries to guess what file, and what commit or range\nthe user wants to compare, stage, or resolve using Ediff. It\nmight only be able to guess either the file, or range or commit,\nin which case the user is asked about the other. It might not\nalways guess right, in which case the appropriate `magit-ediff-*'\ncommand has to be used explicitly. If it cannot read the user's\nmind at all, then it asks the user for a command to run." transient--suffix transient-suffix :command] 6)#@13 (fn FILE) (defalias 'magit-ediff-show-staged #[257 "\300\301\302\"\301\303\"\"\207" [magit-ediff-buffers magit-ediff--find-file "HEAD" "{index}"] 6 (#$ . 15139) (byte-code "\300\301\302 \303#C\207" [magit-read-file-choice "Show staged changes for file" magit-staged-files "No staged files"] 4)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-show-staged interactive-only t function-documentation "Show staged changes using Ediff.\n\nThis only allows looking at the changes; to stage, unstage,\nand discard changes using Ediff, use `magit-ediff-stage'.\n\nFILE must be relative to the top directory of the repository." transient--suffix transient-suffix :command :inapt-if-not magit-anything-staged-p] 8)#@13 (fn FILE) (defalias 'magit-ediff-show-unstaged #[257 "\300\301\302\"\301\303\"\"\207" [magit-ediff-buffers magit-ediff--find-file "{index}" "{worktree}"] 6 (#$ . 15917) (byte-code "\300\301\302 \303#C\207" [magit-read-file-choice "Show unstaged changes for file" magit-unstaged-files "No unstaged files"] 4)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-show-unstaged interactive-only t function-documentation "Show unstaged changes using Ediff.\n\nThis only allows looking at the changes; to stage, unstage,\nand discard changes using Ediff, use `magit-ediff-stage'.\n\nFILE must be relative to the top directory of the repository." transient--suffix transient-suffix :command :inapt-if-not magit-anything-unstaged-p] 8)#@13 (fn FILE) (defalias 'magit-ediff-show-working-tree #[257 "\300\301\302\"\301\303\"\"\207" [magit-ediff-buffers magit-ediff--find-file "HEAD" "{worktree}"] 6 (#$ . 16715) (byte-code "\300\301\302 \303#C\207" [magit-read-file-choice "Show changes in file" magit-modified-files "No changed files"] 4)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-show-working-tree interactive-only t function-documentation "Show changes between `HEAD' and working tree using Ediff.\nFILE must be relative to the top directory of the repository." transient--suffix transient-suffix :command :inapt-if-not magit-anything-modified-p] 8)#@15 (fn COMMIT) (defalias 'magit-ediff-show-commit #[257 "\211\300P\301\302\303\304 #$\207" ["^" apply magit-ediff-compare magit-ediff-read-files magit-current-file] 10 (#$ . 17406) (byte-code "\300\301!C\207" [magit-read-branch-or-commit "Revision"] 2)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\"#\207" [put magit-ediff-show-commit interactive-only t function-documentation "Show changes introduced by COMMIT using Ediff." transient--suffix transient-suffix :command] 6)#@14 (fn STASH) (defalias 'magit-ediff-show-stash #[257 "\211\301P\302P\303\"\211\242\243\211\242\243\2035\304 \"\235\2035\305\306\"\306\"\306 \"#\207\307 $\207" [magit-ediff-show-stash-with-index "^1" "^2" magit-ediff-read-files magit-changed-files magit-ediff-buffers magit-ediff--find-file magit-ediff-compare] 14 (#$ . 17925) (byte-code "\300\301!C\207" [magit-read-stash "Stash"] 2)]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\207" [put magit-ediff-show-stash interactive-only t function-documentation "Show changes introduced by STASH using Ediff.\n`magit-ediff-show-stash-with-index' controls whether a three-buffer\nEdiff is used in order to distinguish changes in the stash that were\nstaged." transient--suffix transient-suffix :command :inapt-if-not magit-list-stashes] 8)#@522 Run Ediff on two or three buffers A, B and C. If optional FILE is non-nil, then perform a merge. The merge result is put in FILE. Neutralize the hooks `ediff-quit-hook' and `ediff-quit-merge-hook' because they usually feature functions that do not work for Magit. Instead run optional QUIT (if non-nil), `magit-ediff--cleanup-buffers' and `magit-ediff-quit-hook', with no arguments. Optional SETUP, if non-nil, is called with no arguments after Ediff is done setting up buffers. (fn A B &optional C SETUP QUIT FILE) (defalias 'magit-ediff-buffers #[1538 "\301 \302\303 \304\305  $C\262\205\306\205#\306D\211\307\267\202:\310\202;\311\202;\312\202;\313\202;\314\262&)\207" [default-directory magit--toplevel-safe ediff-buffers-internal current-window-configuration make-closure #[0 "\302\203\302 \210\305\303!\210\306\305\304!\210\306\301\203\307\304\301\306\310$\210\307\304\311\310\211$\210\307\304\312\313\300\"\310\211$\207" [V0 V1 V2 ediff-quit-merge-hook ediff-quit-hook make-local-variable nil add-hook t magit-ediff--cleanup-buffers make-closure #[0 "\300\302\303!)\207" [V0 magit-ediff-previous-winconf run-hooks magit-ediff-quit-hook] 2]] 5] t #s(hash-table size 4 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ((nil nil) 42 (nil t) 46 (t nil) 50 (t t) 54)) ediff-buffers ediff-merge-buffers ediff-buffers3 ediff-merge-buffers-with-ancestor nil] 16 (#$ . 18787)])#@17 (fn REV FILE) (defalias 'magit-ediff--find-file #[514 "\301\302\303$\203\304\305\306!!\302#\262\207" [magit-ediff-use-indirect-buffers magit-find-file-noselect t ediff make-indirect-buffer generate-new-buffer-name buffer-name] 8 (#$ . 20225)])#@25 (fn &optional SMERGE) (defalias 'magit-ediff--cleanup-buffers #[256 "\211\203/\306!\203\307!\210\306 !\203\307 !\210\306\n!\203\"\307\n!\210\306 !\203?\307 !\210\202?\310!\210\310 !\210\310\n!\210\310 !\210\f\311! \312!\203R\313!\202]\312!\205]\313!\211\211\205o\314!\205o\315\314!!\262\205y\307\314!!\266\211\211\205\215\314!\205\215\315\314!!\262\205\227\307\314!!\266\211\211\205\253\314!\205\253\315\314!!\262\205\265\307\314!!\266\211\211\205\311\314!\205\311\315\314!!\262\205\323\307\314!!\266\211\211\205\347\314!\205\347\315\314!!\262\205\361\307\314!!\266\211\211\205\314!\205\315\314!!\262\205\307\314!!\266\211\211\205#\314!\205#\315\314!!\262\205-\307\314!!\266\316\317!\203S\211\211\205G\314!\205G\315\314!!\262\205Q\307\314!!\266\320 \203e\321!\203e\322!\210\202o\312!\203o\323!\210\211\211\205\200\314!\205\200\315\314!!\262\205\212\307\314!!\266\321!\205\225\324!\207" [ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-ancestor-buffer ediff-control-buffer ediff-control-frame buffer-live-p kill-buffer magit-ediff--bury-buffer ediff-get-visible-buffer-window window-live-p window-frame get-buffer buffer-name boundp ediff-patch-diagnostics display-graphic-p frame-live-p delete-frame delete-window select-frame ediff-window-A ediff-window-B ediff-diff-buffer ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-tmp-buffer ediff-error-buffer ediff-msg-buffer ediff-debug-buffer] 10 (#$ . 20484)])#@15 (fn BUFFER) (defalias 'magit-ediff--bury-buffer #[257 "\211\211\205\300!\205\301\300!!\262\205#\302\303\"\304=\205#\305\300!!\207" [get-buffer buffer-name buffer-local-value magit-buffer--volatile ediff kill-buffer] 5 (#$ . 22035)]) (defalias 'magit-ediff-restore-previous-winconf #[0 "\301!\207" [magit-ediff-previous-winconf set-window-configuration] 2]) (provide 'magit-ediff)