;ELC ;;; Compiled ;;; in Emacs version 28.0.50 ;;; with all optimizations. (byte-code "\302\303!\210\302\304!\210\302\305!\210\302\306!\210\307\310\311\312\313\314\315\316\315\317& \210\320\321\322\323\324DD\325\315\310\326\327&\210\320\330\322\323\331DD\332\333\334\315\310\326\327& \210\320\335\322\323\336DD\337\333\340\315\310\326\341& \210\320\342\322\323\343DD\344\333\345\315\310\326\346& \210\320\347\322\323\350DD\351\333\352\353\354\315\310\326\327\355\356& \210\320\357\322\323\360DD\361\333\362\315\310\326\346& \210\320\363\322\323\364DD\365\315\310\366\367\326\370& \210\320\371\322\323\372DD\373\333\374\353\375\315\310\366\376\326\346& \210\377\363\201@\201A#\210\320\201B\322\323\201CDD\201D\333\201E\315\310\326\201F& \210\320\201G\322\323\201HDD\201I\315\310\366\201J\326\201K& \210\320\201L\322\323\201MDD\201N\333\201O\315\310\366\201P\326\201Q& \210\320\201R\322\323\201SDD\201T\315\310\366\376\326\346& \210\320\201U\322\323\201VDD\201W\315\310\326\201X\201Y\201Z\201[\201\\\201]\201^\201_\201`\257\201aBBBED&\210\320\201b\322\323\201cDD\201d\333\201e\315\310\326\346& \210\320\201f\322\323\201gDD\201h\333\201i\315\310\326\346& \210\320\201j\322\323\201kDD\201l\333\201m\315\310\326\201n& \210\320\201o\322\323\201pDD\201q\333\201r\315\316\315\310\326\346& \210\307\201s\311\201t\313\201u\315\317&\210\320\201v\322\323\201wDD\201x\315\201s\326\327\355\201y& \210\320\201z\322\323\201{DD\201|\333\201}\315\201s\326\327& \210\320\201~\322\323\201DD\201\200\333\201\201\315\201s\326\201\202& \210\320\201\203\322\323\201\204DD\201\205\333\201\206\315\201s\326\201\207& \210\320\201\210\322\323\201\211DD\201\212\333\201\213\315\201s\326\201\214& \210\320\201\215\322\323\201\216DD\201\217\333\201\220\315\201s\326\201\221& \210\320\201\222\322\323\201\223DD\201\224\333\201\225\315\201s\326\346& \210\320\201\226\322\323\201\227DD\201\230\333\201\231\315\201s\326\201\232& \210\320\201\233\322\323\201\234DD\201\235\333\201\236\315\201s\326\346& \210\320\201\237\322\323\201\240DD\201\241\333\201\242\315\310\326\346& \210\320\201\243\322\323\201\244DD\201\245\333\201\246\315\310\326\346& \210\201\247\201\250\201A\201\251 \201\252Y\205\201\253\201\254\"BC\201\255\315\201\256%\210\201\247\201\257\201A\201\251 \201\252Y\205@\201\260\201\261\"BC\201\262\315\201\256%\210\201\247\201\263\201\264\201\251 \201\252Y\205f\201\265\201\266\"B\201\267\201\251 \201\252Y\205|\201\270\201\271\"BD\201\272\315\201\256%\210\201\247\201\273\201\274\201\251 \201\252Y\205\242\201\275\201\276\"B\201\277\201\251 \201\252Y\205\270\201\300\201\301\"BD\201\302\315\201\256%\210\201\247\201\303\201\304\201\251 \201\252Y\205\336\201\305\201\306\"B\201\307\201\251 \201\252Y\205\364\201\310\201\311\"BD\201\312\315\201\256%\210\201\247\201\313\201\314\201\251 \201\252Y\205\201\315\201\316\"B\201\317\201\251 \201\252Y\2050\201\320\201\321\"BD\201\322\315\201\256%\210\201\247\201\323\201A\201\324\201\325 \201\252Y\205p\201\326\201\3271m\201\330\201\331\201\326\"0\202o\210\311DBBBC\201\332\315\201\256%\210\201\247\201\333\201\334\201\335\315\201\256%\210\201\247\201\336\201\337\201\340\315\201\256%\210\201\247\201\341\201\342\201\251 \201\252Y\205\270\201\343\201\344\"B\201\345\201\251 \201\252Y\205\316\201\346\201\347\"BD\201\350\315\201\256%\210\201\247\201\351\201A\201\251 \201\252Y\205\364\201\352\201\353\"BC\201\354\315\201\256%\210\201\247\201\355\201\356\201\357\315\201\256%\210\201\247\201\360\201\361\201\251 \201\252Y\205,\201\362\201\363\"B\201\364\201\251 \201\252Y\205B\201\365\201\366\"BD\201\367\315\201\256%\210\201\247\201\370\201\371\201\251 \201\252Y\205h\201\372\201\373\"B\201\374\201\251 \201\252Y\205~\201\375\201\376\"BD\201\377\315\201\256%\210\201\247\201\201\201\315\201\256%\210\201\247\201\201\201\251 \201\252Y\205\266\201\201\"B\201\201\251 \201\252Y\205\314\201\201 \"BD\201\n\315\201\256%\210\201\247\201 \201\f\201 \315\201\256%\210\201\247\201\201\201\251 \201\252Y\205\201\201\"B\201\201\251 \201\252Y\205\201\201\"BD\201\315\201\256%\210\201\247\201\201\201\251 \201\252Y\205@\201\201\"B\201\201\251 \201\252Y\205V\201\201\"BD\201\367\315\201\256%\210\201\247\201\201\201\251 \201\252Y\205|\201\201 \"B\201!\201\251 \201\252Y\205\222\201\"\201#\"BD\201\377\315\201\256%\210\201\247\201$\201%\201\315\201\256%\210\201\247\201&\201'\201\251 \201\252Y\205\312\201(\201)\"B\201*\201\251 \201\252Y\205\340\201+\201,\"BD\201\n\315\201\256%\210\201\247\201-\201.\201 \315\201\256%\210\201\247\201/\2010\201\251 \201\252Y\205\2011\2012\"B\2013\201\251 \201\252Y\205.\2014\2015\"BD\2016\315\201\256%\210\201\247\2017\2018\2019\315\201\256%\210\201\247\201:\201;\201<\315\201\256%\210\201\247\201=\201>\201?\315\201\256%\210\201@\201A\201B\201C!\"\210\201@\201D\201E\201C!\"\210\201@\201F\201D\"\210\201G\201F\201H\201I#\210\201J\201C\201K\201D#\201L\201C\201M\201N\311$\207" [tab-width emacs-major-version require magit-core git-commit diff-mode smerge-mode custom-declare-group magit-diff nil "Inspect and manipulate Git diffs." :link (info-link "(magit)Diffing") :group magit-commands magit-modes custom-declare-variable magit-diff-mode-hook funcall function #[0 "\300\207" [nil] 1] "Hook run after entering Magit-Diff mode." :type hook magit-diff-sections-hook #[0 "\300\207" [(magit-insert-diff magit-insert-xref-buttons)] 1] "Hook run to insert sections into a `magit-diff-mode' buffer." :package-version (magit . "2.3.0") magit-diff-expansion-threshold #[0 "\300\207" [60] 1] "After how many seconds not to expand anymore diffs.\n\nExcept in status buffers, diffs are usually start out fully\nexpanded. Because that can take a long time, all diffs that\nhaven't been fontified during a refresh before the threshold\ndefined here are instead displayed with their bodies collapsed.\n\nNote that this can cause sections that were previously expanded\nto be collapsed. So you should not pick a very low value here.\n\nThe hook function `magit-diff-expansion-threshold' has to be a\nmember of `magit-section-set-visibility-hook' for this option\nto have any effect." (magit . "2.9.0") float magit-diff-highlight-hunk-body #[0 "\300\207" [t] 1] "Whether to highlight bodies of selected hunk sections.\nThis only has an effect if `magit-diff-highlight' is a\nmember of `magit-section-highlight-hook', which see." (magit . "2.1.0") boolean magit-diff-highlight-hunk-region-functions #[0 "\300\207" [(magit-diff-highlight-hunk-region-dim-outside magit-diff-highlight-hunk-region-using-overlays)] 1] "The functions used to highlight the hunk-internal region.\n\n`magit-diff-highlight-hunk-region-dim-outside' overlays the outside\nof the hunk internal selection with a face that causes the added and\nremoved lines to have the same background color as context lines.\nThis function should not be removed from the value of this option.\n\n`magit-diff-highlight-hunk-region-using-overlays' and\n`magit-diff-highlight-hunk-region-using-underline' emphasize the\nregion by placing delimiting horizontal lines before and after it.\nThe underline variant was implemented because Eli said that is\nhow we should do it. However the overlay variant actually works\nbetter. Also see https://github.com/magit/magit/issues/2758.\n\nInstead of, or in addition to, using delimiting horizontal lines,\nto emphasize the boundaries, you may which to emphasize the text\nitself, using `magit-diff-highlight-hunk-region-using-face'.\n\nIn terminal frames it's not possible to draw lines as the overlay\nand underline variants normally do, so there they fall back to\ncalling the face function instead." (magit . "2.9.0") :set-after (magit-diff-show-lines-boundaries) :options (magit-diff-highlight-hunk-region-dim-outside magit-diff-highlight-hunk-region-using-underline magit-diff-highlight-hunk-region-using-overlays magit-diff-highlight-hunk-region-using-face) magit-diff-unmarked-lines-keep-foreground #[0 "\300\207" [t] 1] "Whether `magit-diff-highlight-hunk-region-dim-outside' preserves foreground.\nWhen this is set to nil, then that function only adjusts the\nforeground color but added and removed lines outside the region\nkeep their distinct foreground colors." (magit . "2.9.0") magit-diff-refine-hunk #[0 "\300\207" [nil] 1] "Whether to show word-granularity differences within diff hunks.\n\nnil Never show fine differences.\nt Show fine differences for the current diff hunk only.\n`all' Show fine differences for all displayed diff hunks." :safe #[257 "\211\300>\207" [(nil t all)] 3 "\n\n(fn VAL)"] (choice (const :tag "Never" nil) (const :tag "Current" t) (const :tag "All" all)) magit-diff-refine-ignore-whitespace #[0 "\207" [smerge-refine-ignore-whitespace] 1] "Whether to ignore whitespace changes in word-granularity differences." (magit . "3.0.0") (smerge-refine-ignore-whitespace) booleanp put permanent-local t magit-diff-adjust-tab-width #[0 "\300\207" [nil] 1] "Whether to adjust the width of tabs in diffs.\n\nDetermining the correct width can be expensive if it requires\nopening large and/or many files, so the widths are cached in\nthe variable `magit-diff--tab-width-cache'. Set that to nil\nto invalidate the cache.\n\nnil Never adjust tab width. Use `tab-width's value from\n the Magit buffer itself instead.\n\nt If the corresponding file-visiting buffer exits, then\n use `tab-width's value from that buffer. Doing this is\n cheap, so this value is used even if a corresponding\n cache entry exists.\n\n`always' If there is no such buffer, then temporarily visit the\n file to determine the value.\n\nNUMBER Like `always', but don't visit files larger than NUMBER\n bytes." (magit . "2.12.0") (choice (const :tag "Never" nil) (const :tag "If file-visiting buffer exists" t) (integer :tag "If file isn't larger than N bytes") (const :tag "Always" always)) magit-diff-paint-whitespace #[0 "\300\207" [t] 1] "Specify where to highlight whitespace errors.\n\nnil Never highlight whitespace errors.\nt Highlight whitespace errors everywhere.\n`uncommitted' Only highlight whitespace errors in diffs\n showing uncommitted changes.\n\nFor backward compatibility `status' is treated as a synonym\nfor `uncommitted'.\n\nThe option `magit-diff-paint-whitespace-lines' controls for\nwhat lines (added/remove/context) errors are highlighted.\n\nThe options `magit-diff-highlight-trailing' and\n`magit-diff-highlight-indentation' control what kind of\nwhitespace errors are highlighted." #[257 "\211\300>\207" [(t nil uncommitted status)] 3 "\n\n(fn VAL)"] (choice (const :tag "In all diffs" t) (const :tag "Only in uncommitted changes" uncommitted) (const :tag "Never" nil)) magit-diff-paint-whitespace-lines #[0 "\300\207" [t] 1] "Specify in what kind of lines to highlight whitespace errors.\n\nt Highlight only in added lines.\n`both' Highlight in added and removed lines.\n`all' Highlight in added, removed and context lines." (magit . "3.0.0") #[257 "\211\300>\207" [(t both all)] 3 "\n\n(fn VAL)"] (choice (const :tag "in added lines" t) (const :tag "in added and removed lines" both) (const :tag "in added, removed and context lines" all)) magit-diff-highlight-trailing #[0 "\300\207" [t] 1] "Whether to highlight whitespace at the end of a line in diffs.\nUsed only when `magit-diff-paint-whitespace' is non-nil." magit-diff-highlight-indentation #[0 "\300\207" [nil] 1] "Highlight the \"wrong\" indentation style.\nUsed only when `magit-diff-paint-whitespace' is non-nil.\n\nThe value is an alist of the form ((REGEXP . INDENT)...). The\npath to the current repository is matched against each element\nin reverse order. Therefore if a REGEXP matches, then earlier\nelements are not tried.\n\nIf the used INDENT is `tabs', highlight indentation with tabs.\nIf INDENT is an integer, highlight indentation with at least\nthat many spaces. Otherwise, highlight neither." repeat cons (string :tag "Directory regexp") choice (const :tag "Tabs" tabs) integer :tag "Spaces" :value ((const :tag "Neither" nil)) magit-diff-hide-trailing-cr-characters #[0 "\301>\205\302\207" [system-type (ms-dos windows-nt) t] 2] "Whether to hide ^M characters at the end of a line in diffs." (magit . "2.6.0") magit-diff-highlight-keywords #[0 "\300\207" [t] 1] "Whether to highlight bracketed keywords in commit messages." (magit . "2.12.0") magit-diff-extra-stat-arguments #[0 "\300\207" [nil] 1] "Additional arguments to be used alongside `--stat'.\n\nA list of zero or more arguments or a function that takes no\nargument and returns such a list. These arguments are allowed\nhere: `--stat-width', `--stat-name-width', `--stat-graph-width'\nand `--compact-summary'. See the git-diff(1) manpage." (magit . "3.0.0") (radio (function-item magit-diff-use-window-width-as-stat-width) function (list string) (const :tag "None" nil)) magit-diff-buffer-file-locked #[0 "\300\207" [t] 1] "Whether `magit-diff-buffer-file' uses a dedicated buffer." (magit . "2.7.0") magit-revision "Inspect and manipulate Git commits." (info-link "(magit)Revision Buffer") magit-revision-mode-hook #[0 "\300\207" [(bug-reference-mode goto-address-mode)] 1] "Hook run after entering Magit-Revision mode." (bug-reference-mode goto-address-mode) magit-revision-sections-hook #[0 "\300\207" [(magit-insert-revision-tag magit-insert-revision-headers magit-insert-revision-message magit-insert-revision-notes magit-insert-revision-diff magit-insert-xref-buttons)] 1] "Hook run to insert sections into a `magit-revision-mode' buffer." (magit . "2.3.0") magit-revision-headers-format #[0 "\300\207" [#1="Author: %aN <%aE>\nAuthorDate: %ad\nCommit: %cN <%cE>\nCommitDate: %cd\n"] 1 #1#] "Format string used to insert headers in revision buffers.\n\nAll headers in revision buffers are inserted by the section\ninserter `magit-insert-revision-headers'. Some of the headers\nare created by calling `git show --format=FORMAT' where FORMAT\nis the format specified here. Other headers are hard coded or\nsubject to option `magit-revision-insert-related-refs'." (magit . "2.3.0") string magit-revision-insert-related-refs #[0 "\300\207" [t] 1] "Whether to show related branches in revision buffers\n\n`nil' Don't show any related branches.\n`t' Show related local branches.\n`all' Show related local and remote branches.\n`mixed' Show all containing branches and local merged branches." (magit . "2.1.0") (choice (const :tag "don't" nil) (const :tag "local only" t) (const :tag "all related" all) (const :tag "all containing, local merged" mixed)) magit-revision-use-hash-sections #[0 "\300\207" [quicker] 1] "Whether to turn hashes inside the commit message into sections.\n\nIf non-nil, then hashes inside the commit message are turned into\n`commit' sections. There is a trade off to be made between\nperformance and reliability:\n\n- `slow' calls git for every word to be absolutely sure.\n- `quick' skips words less than seven characters long.\n- `quicker' additionally skips words that don't contain a number.\n- `quickest' uses all words that are at least seven characters\n long and which contain at least one number as well as at least\n one letter.\n\nIf nil, then no hashes are turned into sections, but you can\nstill visit the commit at point using \"RET\"." (magit . "2.12.0") (choice (const :tag "Use sections, quickest" quickest) (const :tag "Use sections, quicker" quicker) (const :tag "Use sections, quick" quick) (const :tag "Use sections, slow" slow) (const :tag "Don't use sections" nil)) magit-revision-show-gravatars #[0 "\300\207" [nil] 1] "Whether to show gravatar images in revision buffers.\n\nIf nil, then don't insert any gravatar images. If t, then insert\nboth images. If `author' or `committer', then insert only the\nrespective image.\n\nIf you have customized the option `magit-revision-header-format'\nand want to insert the images then you might also have to specify\nwhere to do so. In that case the value has to be a cons-cell of\ntwo regular expressions. The car specifies where to insert the\nauthor's image. The top half of the image is inserted right\nafter the matched text, the bottom half on the next line in the\nsame column. The cdr specifies where to insert the committer's\nimage, accordingly. Either the car or the cdr may be nil." (magit . "2.3.0") (choice (const :tag "Don't show gravatars" nil) (const :tag "Show gravatars" t) (const :tag "Show author gravatar" author) (const :tag "Show committer gravatar" committer) (cons :tag "Show gravatars using custom pattern." (regexp :tag "Author regexp" "^Author: ") (regexp :tag "Committer regexp" "^Commit: "))) magit-revision-use-gravatar-kludge #[0 "\300\207" [nil] 1] "Whether to work around a bug which affects display of gravatars.\n\nGravatar images are spliced into two halves which are then\ndisplayed on separate lines. On OS X the splicing has a bug in\nsome Emacs builds, which causes the top and bottom halves to be\ninterchanged. Enabling this option works around this issue by\ninterchanging the halves once more, which cancels out the effect\nof the bug.\n\nSee https://github.com/magit/magit/issues/2265\nand https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7847.\n\nStarting with Emacs 26.1 this kludge should not be required for\nany build." (magit . "2.3.0") magit-revision-fill-summary-line #[0 "\300\207" [nil] 1] "Whether to fill excessively long summary lines.\n\nIf this is an integer, then the summary line is filled if it is\nlonger than either the limit specified here or `window-width'.\n\nYou may want to only set this locally in \".dir-locals-2.el\" for\nrepositories known to contain bad commit messages.\n\nThe body of the message is left alone because (a) most people who\nwrite excessively long summary lines usually don't add a body and\n(b) even people who have the decency to wrap their lines may have\na good reason to include a long line in the body sometimes." (magit . "2.90.0") (choice (const :tag "Don't fill" nil) (integer :tag "Fill if longer than")) magit-revision-filter-files-on-follow #[0 "\300\207" [nil] 1] "Whether to honor file filter if log arguments include --follow.\n\nWhen a commit is displayed from a log buffer, the resulting\nrevision buffer usually shares the log's file arguments,\nrestricting the diff to those files. However, there's a\ncomplication when the log arguments include --follow: if the log\nfollows a file across a rename event, keeping the file\nrestriction would mean showing an empty diff in revision buffers\nfor commits before the rename event.\n\nWhen this option is nil, the revision buffer ignores the log's\nfilter if the log arguments include --follow. If non-nil, the\nlog's file filter is always honored." (magit . "3.0.0") magit-diff-visit-previous-blob #[0 "\300\207" [t] 1] "Whether `magit-diff-visit-file' may visit the previous blob.\n\nWhen this is t and point is on a removed line in a diff for a\ncommitted change, then `magit-diff-visit-file' visits the blob\nfrom the last revision which still had that line.\n\nCurrently this is only supported for committed changes, for\nstaged and unstaged changes `magit-diff-visit-file' always\nvisits the file in the working tree." (magit . "2.9.0") magit-diff-visit-avoid-head-blob #[0 "\300\207" [nil] 1] "Whether `magit-diff-visit-file' avoids visiting a blob from `HEAD'.\n\nBy default `magit-diff-visit-file' always visits the blob that\nadded the current line, while `magit-diff-visit-worktree-file'\nvisits the respective file in the working tree. For the `HEAD'\ncommit, the former command used to visit the worktree file too,\nbut that made it impossible to visit a blob from `HEAD'.\n\nWhen point is on a removed line and that change has not been\ncommitted yet, then `magit-diff-visit-file' now visits the last\nblob that still had that line, which is a blob from `HEAD'.\nPreviously this function used to visit the worktree file not\nonly for added lines but also for such removed lines.\n\nIf you prefer the old behaviors, then set this to t." (magit . "3.0.0") custom-declare-face magit-diff-file-heading append 27 (:extend t) (:weight bold) "Face for diff file headings." magit-faces magit-diff-file-heading-highlight (:extend t) (:inherit magit-section-highlight) "Face for current diff file headings." magit-diff-file-heading-selection ((class color) (background light)) (:extend t) (:inherit magit-diff-file-heading-highlight :foreground "salmon4") ((class color) (background dark)) (:extend t) (:inherit magit-diff-file-heading-highlight :foreground "LightSalmon3") "Face for selected diff file headings." magit-diff-hunk-heading ((class color) (background light)) (:extend t) (:background "grey80" :foreground "grey30") ((class color) (background dark)) (:extend t) (:background "grey25" :foreground "grey70") "Face for diff hunk headings." magit-diff-hunk-heading-highlight ((class color) (background light)) (:extend t) (:background "grey75" :foreground "grey30") ((class color) (background dark)) (:extend t) (:background "grey35" :foreground "grey70") "Face for current diff hunk headings." magit-diff-hunk-heading-selection ((class color) (background light)) (:extend t) (:inherit magit-diff-hunk-heading-highlight :foreground "salmon4") ((class color) (background dark)) (:extend t) (:inherit magit-diff-hunk-heading-highlight :foreground "LightSalmon3") "Face for selected diff hunk headings." magit-diff-hunk-region :inherit bold :extend (error) face-attribute region "Face used by `magit-diff-highlight-hunk-region-using-face'.\n\nThis face is overlaid over text that uses other hunk faces,\nand those normally set the foreground and background colors.\nThe `:foreground' and especially the `:background' properties\nshould be avoided here. Setting the latter would cause the\nloss of information. Good properties to set here are `:weight'\nand `:slant'." magit-diff-revision-summary ((t :inherit magit-diff-hunk-heading)) "Face for commit message summaries." magit-diff-revision-summary-highlight ((t :inherit magit-diff-hunk-heading-highlight)) "Face for highlighted commit message summaries." magit-diff-lines-heading ((class color) (background light)) (:extend t) (:inherit magit-diff-hunk-heading-highlight :background "LightSalmon3") ((class color) (background dark)) (:extend t) (:inherit magit-diff-hunk-heading-highlight :foreground "grey80" :background "salmon4") "Face for diff hunk heading when lines are marked." magit-diff-lines-boundary (:extend t) (:inherit magit-diff-lines-heading) "Face for boundary of marked lines in diff hunk." magit-diff-conflict-heading ((t :inherit magit-diff-hunk-heading)) "Face for conflict markers." magit-diff-added ((class color) (background light)) (:extend t) (:background "#ddffdd" :foreground "#22aa22") ((class color) (background dark)) (:extend t) (:background "#335533" :foreground "#ddffdd") "Face for lines in a diff that have been added." magit-diff-removed ((class color) (background light)) (:extend t) (:background "#ffdddd" :foreground "#aa2222") ((class color) (background dark)) (:extend t) (:background "#553333" :foreground "#ffdddd") "Face for lines in a diff that have been removed." magit-diff-our ((t :inherit magit-diff-removed)) "Face for lines in a diff for our side in a conflict." magit-diff-base ((class color) (background light)) (:extend t) (:background "#ffffcc" :foreground "#aaaa11") ((class color) (background dark)) (:extend t) (:background "#555522" :foreground "#ffffcc") "Face for lines in a diff for the base side in a conflict." magit-diff-their ((t :inherit magit-diff-added)) "Face for lines in a diff for their side in a conflict." magit-diff-context ((class color) (background light)) (:extend t) (:foreground "grey50") ((class color) (background dark)) (:extend t) (:foreground "grey70") "Face for lines in a diff that are unchanged." magit-diff-added-highlight ((class color) (background light)) (:extend t) (:background "#cceecc" :foreground "#22aa22") ((class color) (background dark)) (:extend t) (:background "#336633" :foreground "#cceecc") magit-diff-removed-highlight ((class color) (background light)) (:extend t) (:background "#eecccc" :foreground "#aa2222") ((class color) (background dark)) (:extend t) (:background "#663333" :foreground "#eecccc") magit-diff-our-highlight ((t :inherit magit-diff-removed-highlight)) magit-diff-base-highlight ((class color) (background light)) (:extend t) (:background "#eeeebb" :foreground "#aaaa11") ((class color) (background dark)) (:extend t) (:background "#666622" :foreground "#eeeebb") magit-diff-their-highlight ((t :inherit magit-diff-added-highlight)) magit-diff-context-highlight ((class color) (background light)) (:extend t) (:background "grey95" :foreground "grey50") ((class color) (background dark)) (:extend t) (:background "grey20" :foreground "grey70") "Face for lines in the current context in a diff." magit-diff-whitespace-warning ((t :inherit trailing-whitespace)) "Face for highlighting whitespace errors added lines." magit-diffstat-added ((((class color) (background light)) :foreground "#22aa22") (((class color) (background dark)) :foreground "#448844")) "Face for plus sign in diffstat." magit-diffstat-removed ((((class color) (background light)) :foreground "#aa2222") (((class color) (background dark)) :foreground "#aa4444")) "Face for minus sign in diffstat." defalias magit-diff-prefix-p eieio-make-class-predicate magit-diff-prefix magit-diff-prefix--eieio-childp eieio-make-child-predicate magit-diff-prefix-child-p make-obsolete "use (cl-typep ... \\='magit-diff-prefix) instead" "25.1" define-symbol-prop cl-deftype-satisfies eieio-defclass-internal (transient-prefix) ((history-key :initform 'magit-diff) (major-mode :initform 'magit-diff-mode))] 17) #@74 Create a new object of class type `magit-diff-prefix'. (fn &rest SLOTS) (defalias 'magit-diff-prefix #[128 "\300\301\302#\207" [apply make-instance magit-diff-prefix] 5 (#$ . 26171)]) (byte-code "\300\301\302\303#\300\207" [function-put magit-diff-prefix compiler-macro magit-diff-prefix--anon-cmacro] 4) #@26 (fn WHOLE &rest SLOTS) (defalias 'magit-diff-prefix--anon-cmacro #[385 "\211@;\204\207\300\301\302@@#@\303@DABB\"\207" [macroexp-warn-and-return format "Obsolete name arg %S to constructor %S" identity] 7 (#$ . 26484)]) (byte-code "\300\301\302\303!\"\210\300\304\305\303!\"\210\300\306\304\"\210\307\306\310\311#\210\312\303\313\304#\314\303\315\316\317$\207" [defalias magit-diff-refresh-prefix-p eieio-make-class-predicate magit-diff-refresh-prefix magit-diff-refresh-prefix--eieio-childp eieio-make-child-predicate magit-diff-refresh-prefix-child-p make-obsolete "use (cl-typep ... \\='magit-diff-refresh-prefix) instead" "25.1" define-symbol-prop cl-deftype-satisfies eieio-defclass-internal (magit-diff-prefix) ((history-key :initform 'magit-diff) (major-mode :initform nil)) nil] 6) #@82 Create a new object of class type `magit-diff-refresh-prefix'. (fn &rest SLOTS) (defalias 'magit-diff-refresh-prefix #[128 "\300\301\302#\207" [apply make-instance magit-diff-refresh-prefix] 5 (#$ . 27290)]) (byte-code "\300\301\302\303#\300\207" [function-put magit-diff-refresh-prefix compiler-macro magit-diff-refresh-prefix--anon-cmacro] 4) #@26 (fn WHOLE &rest SLOTS) (defalias 'magit-diff-refresh-prefix--anon-cmacro #[385 "\211@;\204\207\300\301\302@@#@\303@DABB\"\207" [macroexp-warn-and-return format "Obsolete name arg %S to constructor %S" identity] 7 (#$ . 27643)]) (byte-code "\300\301\302\303\302\304%\210\300\301\302\305\302\306%\210\300\307\302\310\302\311%\210\300\312\302\313\302\314%\207" [cl-generic-define-method transient-init-value nil ((obj magit-diff-prefix)) #[257 "\302\303\"\211\242\243\211\242\243 \304=\204\305 \211\203\211C\262\210\306\307\203/\310BD\2020#\207" [magit-prefix-use-buffer-arguments transient-current-command magit-diff--get-value magit-diff-mode magit-dispatch magit-file-relative-name eieio-oset value "--"] 13 "\n\n(fn OBJ)"] ((obj magit-diff-refresh-prefix)) #[257 "\302\303\203\304B D\202 #\207" [magit-buffer-diff-files magit-buffer-diff-args eieio-oset value "--"] 6 "\n\n(fn OBJ)"] transient-set-value ((obj magit-diff-prefix)) #[257 "\300!\207" [magit-diff--set-value] 3 "\n\n(fn OBJ)"] transient-save-value ((obj magit-diff-prefix)) #[257 "\300\301\"\207" [magit-diff--set-value save] 4 "\n\n(fn OBJ)"]] 6) #@57 Return the current diff arguments. (fn &optional MODE) (defalias 'magit-diff-arguments #[256 "\301>\203\302\303\304 \"\211\242\243\211\242\243\305\306\"AD\207\307\206#\310!\207" [transient-current-command (magit-diff magit-diff-refresh) -separate atom transient-get-value assoc "--" magit-diff--get-value magit-diff-mode] 12 (#$ . 28798)]) #@39 (fn MODE &optional USE-BUFFER-ARGS) (defalias 'magit-diff--get-value #[513 "\211\204\262\305\211\306>\203 =\203\n\262 \262\202n\307>\203A\310\305\311=#\211\205<\312\302\"\262\312\303\"\262\313\262\204n\314\315!\316\"\203R\316N\262\202n\317\320\321\"!\f\236\211\205d\211A\262\313\262\204n\322N\262D\207" [magit-direct-use-buffer-arguments major-mode magit-buffer-diff-args magit-buffer-diff-files transient-values nil (always selected current) (always selected) magit-get-mode-buffer selected buffer-local-value t plist-member symbol-plist magit-diff-current-arguments intern format "magit-diff:%s" magit-diff-default-arguments] 9 (#$ . 29156)]) #@27 (fn OBJ &optional SAVE) (defalias 'magit-diff--set-value #[513 "\304\305\"\304\300\"\206\f\306\307\310\"!\311\312\313 \"\211\242\243\211\242\243\314\315\"A\316\n\317#\210 \203R \236\203C\241\266\202O\nB\211\262 B\266\320 \210\321 !\210\211\322 \207" [major-mode transient-values magit-buffer-diff-args magit-buffer-diff-files eieio-oref prototype intern format "magit-diff:%s" -separate atom transient-get-value assoc "--" put magit-diff-current-arguments transient-save-values transient--history-push magit-refresh] 17 (#$ . 29848)]) (byte-code "\300\301\302\303!\"\210\300\304\305\303!\"\210\300\306\304\"\210\307\306\310\311#\210\312\303\313\304#\314\303\315\316\317$\207" [defalias magit-file-section-p eieio-make-class-predicate magit-file-section magit-file-section--eieio-childp eieio-make-child-predicate magit-file-section-child-p make-obsolete "use (cl-typep ... \\='magit-file-section) instead" "25.1" define-symbol-prop cl-deftype-satisfies eieio-defclass-internal (magit-section) ((keymap :initform 'magit-file-section-map) (source :initform nil) (header :initform nil)) nil] 6) #@75 Create a new object of class type `magit-file-section'. (fn &rest SLOTS) (defalias 'magit-file-section #[128 "\300\301\302#\207" [apply make-instance magit-file-section] 5 (#$ . 30980)]) (byte-code "\300\301\302\303#\300\207" [function-put magit-file-section compiler-macro magit-file-section--anon-cmacro] 4) #@26 (fn WHOLE &rest SLOTS) (defalias 'magit-file-section--anon-cmacro #[385 "\211@;\204\207\300\301\302@@#@\303@DABB\"\207" [macroexp-warn-and-return format "Obsolete name arg %S to constructor %S" identity] 7 (#$ . 31298)]) (byte-code "\300\301\302\303!\"\210\300\304\305\303!\"\210\300\306\304\"\210\307\306\310\311#\210\312\303\313\304#\314\303\315\316\317$\207" [defalias magit-module-section-p eieio-make-class-predicate magit-module-section magit-module-section--eieio-childp eieio-make-child-predicate magit-module-section-child-p make-obsolete "use (cl-typep ... \\='magit-module-section) instead" "25.1" define-symbol-prop cl-deftype-satisfies eieio-defclass-internal (magit-file-section) ((keymap :initform 'magit-hunk-section-map)) nil] 6) #@77 Create a new object of class type `magit-module-section'. (fn &rest SLOTS) (defalias 'magit-module-section #[128 "\300\301\302#\207" [apply make-instance magit-module-section] 5 (#$ . 32061)]) (byte-code "\300\301\302\303#\300\207" [function-put magit-module-section compiler-macro magit-module-section--anon-cmacro] 4) #@26 (fn WHOLE &rest SLOTS) (defalias 'magit-module-section--anon-cmacro #[385 "\211@;\204\207\300\301\302@@#@\303@DABB\"\207" [macroexp-warn-and-return format "Obsolete name arg %S to constructor %S" identity] 7 (#$ . 32389)]) (byte-code "\300\301\302\303!\"\210\300\304\305\303!\"\210\300\306\304\"\210\307\306\310\311#\210\312\303\313\304#\314\303\315\316\317$\207" [defalias magit-hunk-section-p eieio-make-class-predicate magit-hunk-section magit-hunk-section--eieio-childp eieio-make-child-predicate magit-hunk-section-child-p make-obsolete "use (cl-typep ... \\='magit-hunk-section) instead" "25.1" define-symbol-prop cl-deftype-satisfies eieio-defclass-internal (magit-section) ((keymap :initform 'magit-hunk-section-map) (refined :initform nil) (combined :initform nil) (from-range :initform nil) (from-ranges :initform nil) (to-range :initform nil) (about :initform nil)) nil] 6) #@75 Create a new object of class type `magit-hunk-section'. (fn &rest SLOTS) (defalias 'magit-hunk-section #[128 "\300\301\302#\207" [apply make-instance magit-hunk-section] 5 (#$ . 33290)]) (byte-code "\300\301\302\303#\300\207" [function-put magit-hunk-section compiler-macro magit-hunk-section--anon-cmacro] 4) #@26 (fn WHOLE &rest SLOTS) (defalias 'magit-hunk-section--anon-cmacro #[385 "\211@;\204\207\300\301\302@@#@\303@DABB\"\207" [macroexp-warn-and-return format "Obsolete name arg %S to constructor %S" identity] 7 (#$ . 33608)]) (byte-code "\301\236\211\203\211\302\241\266\202\301\302B\211\262B\210\303\236\211\203(\211\304\241\266\2022\303\304B\211\262B\210\305\236\211\203>\211\306\241\210\207\305\306B\211\262B\207" [magit--section-type-alist hunk magit-hunk-section module magit-module-section file magit-file-section] 3) (defalias 'magit-diff #[0 "\300\301!\207" [transient-setup magit-diff] 2 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\210\300\301\313\314#\207" [put magit-diff interactive-only t function-documentation "Show changes between different versions." transient--prefix magit-diff-prefix :command :man-page "git-diff" transient--layout ([1 transient-column (:description "Limit arguments") ((1 transient-suffix (:command magit:--)) (1 transient-suffix (:command magit-diff:--ignore-submodules)) (1 transient-switch (:key "-b" :description "Ignore whitespace changes" :shortarg "-b" :argument "--ignore-space-change" :command transient:magit-diff:--ignore-space-change)) (1 transient-switch (:key "-w" :description "Ignore all whitespace" :shortarg "-w" :argument "--ignore-all-space" :command transient:magit-diff:--ignore-all-space)) (5 transient-switch (:key "-D" :description "Omit preimage for deletes" :shortarg "-D" :argument "--irreversible-delete" :command transient:magit-diff:--irreversible-delete)))] [1 transient-column (:description "Context arguments") ((1 transient-suffix (:command magit-diff:-U)) (1 transient-switch (:key "-W" :description "Show surrounding functions" :shortarg "-W" :argument "--function-context" :command transient:magit-diff:--function-context)))] [1 transient-column (:description "Tune arguments") ((1 transient-suffix (:command magit-diff:--diff-algorithm)) (1 transient-suffix (:command magit-diff:-M)) (1 transient-suffix (:command magit-diff:-C)) (1 transient-switch (:key "-x" :description "Disallow external diff drivers" :argument "--no-ext-diff" :command transient:magit-diff:--no-ext-diff)) (1 transient-switch (:key "-s" :description "Show stats" :argument "--stat" :command transient:magit-diff:--stat)) (1 transient-switch (:key "=g" :description "Show signature" :argument "--show-signature" :command transient:magit-diff:--show-signature)) (5 transient-switch (:key "-R" :description "Reverse sides" :shortarg "-R" :argument "-R" :command transient:magit-diff:-R)) (5 transient-suffix (:command magit-diff:--color-moved)) (5 transient-suffix (:command magit-diff:--color-moved-ws)))] [1 transient-columns (:description "Actions") ([1 transient-column nil ((1 transient-suffix (:key "d" :description "Dwim" :command magit-diff-dwim)) (1 transient-suffix (:key "r" :description "Diff range" :command magit-diff-range)) (1 transient-suffix (:key "p" :description "Diff paths" :command magit-diff-paths)))] [1 transient-column nil ((1 transient-suffix (:key "u" :description "Diff unstaged" :command magit-diff-unstaged)) (1 transient-suffix (:key "s" :description "Diff staged" :command magit-diff-staged)) (1 transient-suffix (:key "w" :description "Diff worktree" :command magit-diff-working-tree)))] [1 transient-column nil ((1 transient-suffix (:key "c" :description "Show commit" :command magit-show-commit)) (1 transient-suffix (:key "t" :description "Show stash" :command magit-stash-show)))])])] 8) (defalias 'magit-diff-refresh #[0 "\303=\204\n\304\303!\207\305 \211\242\243\211\242\243\266\306 \207" [transient-current-command magit-buffer-diff-args magit-buffer-diff-files magit-diff-refresh transient-setup magit-diff-arguments magit-refresh] 8 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312$#\210\300\301\313\314#\207" [put magit-diff-refresh interactive-only t function-documentation "Change the arguments used for the diff(s) in the current buffer." transient--prefix magit-diff-refresh-prefix :command :man-page "git-diff" transient--layout ([1 transient-column (:description "Limit arguments") ((1 transient-suffix (:command magit:--)) (1 transient-suffix (:command magit-diff:--ignore-submodules)) (1 transient-switch (:key "-b" :description "Ignore whitespace changes" :shortarg "-b" :argument "--ignore-space-change" :command transient:magit-diff-refresh:--ignore-space-change)) (1 transient-switch (:key "-w" :description "Ignore all whitespace" :shortarg "-w" :argument "--ignore-all-space" :command transient:magit-diff-refresh:--ignore-all-space)) (5 transient-switch (:key "-D" :description "Omit preimage for deletes" :shortarg "-D" :argument "--irreversible-delete" :command transient:magit-diff-refresh:--irreversible-delete)))] [1 transient-column (:description "Context arguments") ((1 transient-suffix (:command magit-diff:-U)) (1 transient-switch (:key "-W" :description "Show surrounding functions" :shortarg "-W" :argument "--function-context" :command transient:magit-diff-refresh:--function-context)))] [1 transient-column (:description "Tune arguments") ((1 transient-suffix (:command magit-diff:--diff-algorithm)) (1 transient-suffix (:command magit-diff:-M)) (1 transient-suffix (:command magit-diff:-C)) (1 transient-switch (:key "-x" :description "Disallow external diff drivers" :argument "--no-ext-diff" :command transient:magit-diff-refresh:--no-ext-diff)) (1 transient-switch (:key "-s" :description "Show stats" :argument "--stat" :command transient:magit-diff-refresh:--stat :if-derived magit-diff-mode)) (1 transient-switch (:key "=g" :description "Show signature" :argument "--show-signature" :command transient:magit-diff-refresh:--show-signature :if-derived magit-diff-mode)) (5 transient-switch (:key "-R" :description "Reverse sides" :shortarg "-R" :argument "-R" :command transient:magit-diff-refresh:-R :if-derived magit-diff-mode)) (5 transient-suffix (:command magit-diff:--color-moved)) (5 transient-suffix (:command magit-diff:--color-moved-ws)))] [1 transient-columns nil ([1 transient-column (:description "Refresh") ((1 transient-suffix (:key "g" :description "buffer" :command magit-diff-refresh)) (1 transient-suffix (:key "s" :description "buffer and set defaults" :command transient-set :transient nil)) (1 transient-suffix (:key "w" :description "buffer and save defaults" :command transient-save :transient nil)))] [1 transient-column (:description "Toggle") ((1 transient-suffix (:key "t" :description "hunk refinement" :command magit-diff-toggle-refine-hunk)) (1 transient-suffix (:key "F" :description "file filter" :command magit-diff-toggle-file-filter)) (1 transient-suffix (:key "b" :description "buffer lock" :command magit-toggle-buffer-lock :if-mode (magit-diff-mode magit-revision-mode magit-stash-mode))))] [1 transient-column (:if-mode magit-diff-mode :description "Do") ((1 transient-suffix (:key "r" :description "switch range type" :command magit-diff-switch-range-type)) (1 transient-suffix (:key "f" :description "flip revisions" :command magit-diff-flip-revs)))])])] 8) (defalias 'magit:-- #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\314\316\317\320\321\322\303&#\207" [put magit:-- interactive-only t function-documentation nil transient--suffix transient-files :command :description "Limit to files" :key "--" :argument :prompt "Limit to file(s): " :reader magit-read-files :multi-value] 18) #@37 (fn PROMPT INITIAL-INPUT HISTORY) (defalias 'magit-read-files #[771 "\300\301 \302\211\206 \303 &\207" [magit-completing-read-multiple* magit-list-files nil magit-file-at-point] 10 (#$ . 41293)]) (defalias 'magit-diff:-U #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316&#\207" [put magit-diff:-U interactive-only t function-documentation nil transient--suffix transient-option :command :description "Context lines" :argument "-U" :reader transient-read-number-N0] 12) (defalias 'magit-diff:-M #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316&#\207" [put magit-diff:-M interactive-only t function-documentation nil transient--suffix transient-option :command :description "Detect renames" :argument "-M" :reader transient-read-number-N+] 12) (defalias 'magit-diff:-C #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316&#\207" [put magit-diff:-C interactive-only t function-documentation nil transient--suffix transient-option :command :description "Detect copies" :argument "-C" :reader transient-read-number-N+] 12) (defalias 'magit-diff:--diff-algorithm #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316\317\320&\n#\207" [put magit-diff:--diff-algorithm interactive-only t function-documentation nil transient--suffix transient-option :command :description "Diff algorithm" :key "-A" :argument "--diff-algorithm=" :reader magit-diff-select-algorithm] 14) #@21 (fn &rest IGNORE) (defalias 'magit-diff-select-algorithm #[128 "\300\301\302\303\304\305\306F\307#\310P\311\"\211\312\267\202$\313\202%\314\202%\315\202%\316\202%\317\262\320\321!\210\207" [read-char-choice mapconcat identity "[d]efault" "[m]inimal" "[p]atience" "[h]istogram" ", " ", or [C-g] to abort " (100 109 112 104) #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (100 20 109 24 112 28 104 32)) "default" "minimal" "patience" "histogram" nil message ""] 8 (#$ . 43415)]) (defalias 'magit-diff:--ignore-submodules #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316\317\320&\n#\207" [put magit-diff:--ignore-submodules interactive-only t function-documentation nil transient--suffix transient-option :command :description "Ignore submodules" :key "-i" :argument "--ignore-submodules=" :reader magit-diff-select-ignore-submodules] 14) #@22 (fn &rest IGNORED) (defalias 'magit-diff-select-ignore-submodules #[128 "\300\301\302\303\304\305\306E\307#\310Q\311\"\211\312\267\202 \313\202!\314\202!\315\202!\316\262\317\320!\210\207" [read-char-choice "Ignore submodules " mapconcat identity "[u]ntracked" "[d]irty" "[a]ll" ", " ", or [C-g] to abort " (117 100 97) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (117 20 100 24 97 28)) "untracked" "dirty" "all" nil message ""] 8 (#$ . 44491)]) (defalias 'magit-diff:--color-moved #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316\317\320&\n#\207" [put magit-diff:--color-moved interactive-only t function-documentation nil transient--suffix transient-option :command :description "Color moved lines" :key "-m" :argument "--color-moved=" :reader magit-diff-select-color-moved-mode] 14) #@21 (fn &rest IGNORE) (defalias 'magit-diff-select-color-moved-mode #[128 "\300\301\302\303\304\305\306\307\310\257\311#\312Q\313\"\211\314\267\202+\315\202,\316\202,\317\202,\320\202,\321\202,\322\262\323\324!\210\207" [read-char-choice "Color moved " mapconcat identity "[d]efault" "[p]lain" "[b]locks" "[z]ebra" "[Z] dimmed-zebra" ", " ", or [C-g] to abort " (100 112 98 122 90) #s(hash-table size 5 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (100 23 112 27 98 31 122 35 90 39)) "default" "plain" "blocks" "zebra" "dimmed-zebra" nil message ""] 10 (#$ . 45519)]) (defalias 'magit-diff:--color-moved-ws #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil]) (byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316\317\320&\n#\207" [put magit-diff:--color-moved-ws interactive-only t function-documentation nil transient--suffix transient-option :command :description "Whitespace treatment for --color-moved" :key "=w" :argument "--color-moved-ws=" :reader magit-diff-select-color-moved-ws-mode] 14) #@21 (fn &rest IGNORE) (defalias 'magit-diff-select-color-moved-ws-mode #[128 "\300\301\302\303\304\305\306\307\310\257\311#\312Q\313\"\211\314\267\202+\315\202,\316\202,\317\202,\320\202,\321\202,\322\262\323\324!\210\207" [read-char-choice "Ignore whitespace " mapconcat identity "[i]ndentation" "[e]nd of line" "[s]pace change" "[a]ll space" "[n]o" ", " ", or [C-g] to abort " (105 101 115 97 110) #s(hash-table size 5 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (105 23 101 27 115 31 97 35 110 39)) "allow-indentation-change" "ignore-space-at-eol" "ignore-space-change" "ignore-all-space" "no" nil message ""] 10 (#$ . 46679)]) #@65 Show changes for the thing at point. (fn &optional ARGS FILES) (defalias 'magit-diff-dwim #[512 "\300\301 \211\302\267\2022\303\"\207\304\"\207\305 \211\203*\306!@AA\307\232\203*\303C\"\207\310\311#\207\211:\203Z\211\242\211\312\267\202W\243\211\313\314\315\211##\207\243\211\316\"\207 \207\211;\203h\211\313#\207 \207" [#[0 "\300\301!\207" [call-interactively magit-diff-range] 2] magit-diff--dwim #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (unmerged 9 unstaged 14 staged 19)) magit-diff-unmerged magit-diff-unstaged magit-file-at-point magit-file-status (68 85) magit-diff-staged nil #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (commit 63 stash 78)) magit-diff-range format "%s^..%s" magit-stash-show] 12 (#$ . 47342) (magit-diff-arguments)]) #@568 Return information for performing DWIM diff. The information can be in three forms: 1. TYPE A symbol describing a type of diff where no additional information is needed to generate the diff. Currently, this includes `staged', `unstaged' and `unmerged'. 2. (TYPE . VALUE) Like #1 but the diff requires additional information, which is given by VALUE. Currently, this includes `commit' and `stash', where VALUE is the given commit or stash, respectively. 3. RANGE A string indicating a diff range. If no DWIM context is found, nil is returned. (defalias 'magit-diff--dwim #[0 "\303\304\305\"\211\205\306 \210\307!@\310@Q\262\206P\203 \311B\207\312\313!\203i\311\314 \211\203;\315\311\"\203;\316\317\"\202e\211\203P\315\320\"\203P\316\211\321\"\317\"\202e\211\205e\315\322\"\205e\316\211\211\321\"\321\"\317\"\262B\207\312\323!\203s\311 B\207\312\324!\203{\n\207\314 \211\203\214\315\325\"\203\214\326\202N\211\203\233\315\327\"\203\233\330\202N\211\203\252\315\331\"\203\252\331\202N\211\203\274\315\332\"\203\274\316\317\"\202N\211\203\316\315\333\"\203\316\316\317\"\202N\211\203\315\334\"\203\335 \316\317\"\211\232\203\336 \211\203\363\337\340#\202\377\341 \203\374\202\377\311B\262\266\202\202N\337\340\206 \342#\266\202\202N\211\203(\315\311\"\203(\311\316\317\"B\202N\211\203<\315\343\"\203<\343\316\317\"B\202N\211\205N\315\344\"\205N\345\316\317\"\305\"\262\207" [magit-buffer-refname magit-buffer-revision magit-buffer-range magit-region-values (commit branch) t deactivate-mark last ".." commit derived-mode-p magit-stash-mode magit-current-section magit-section-match-1 eieio-oref value file parent hunk magit-revision-mode magit-diff-mode [* unstaged] unstaged [* staged] staged unmerged unpushed unpulled branch magit-get-current-branch magit-get-upstream-branch format "%s...%s" magit-anything-modified-p "HEAD" stash pullreq forge--pullreq-range] 8 (#$ . 48212)]) #@243 Read range or revision with special diff range treatment. If MBASE is non-nil, prompt for which rev to place at the end of a "revA...revB" range. Otherwise, always construct "revA..revB" range. (fn PROMPT &optional SECONDARY-DEFAULT MBASE) (defalias 'magit-diff-read-range-or-commit #[769 "\300\301\302\"\211\203Y\303!@@\304 \210\203S\305\306#\307!\230\203(\310\311#\207\307!\230\2036\310\311#\207\312\313D\314\302\314\211&\310\315\230\203O\202P#\207\310\311#\207\316\317 \211:\203{\211\242\211\320=\205v\243\211\310\321\211#\262\262\262\202\204\211;\205\204\211\211\262\262\206\217\206\217\322 \"\207" [magit-region-values (commit branch) t last deactivate-mark magit-git-string "merge-base" magit-rev-parse format "%s..%s" magit-completing-read "View changes along" nil "%s...%s" magit-read-range magit-diff--dwim commit "%s^..%s" magit-get-current-branch] 15 (#$ . 50209)]) #@595 Show differences between two commits. REV-OR-RANGE should be a range or a single revision. If it is a revision, then show changes in the working tree relative to that revision. If it is a range, but one side is omitted, then show changes relative to `HEAD'. If the region is active, use the revisions on the first and last line of the region as the two sides of the range. With a prefix argument, instead of diffing the revisions, choose a revision to view changes along, starting at the common ancestor of both revisions (i.e., use a "..." range). (fn REV-OR-RANGE &optional ARGS FILES) (defalias 'magit-diff-range #[769 "\300\301$\207" [magit-diff-setup-buffer nil] 8 (#$ . 51141) (byte-code "\301\302\303#\304 B\207" [current-prefix-arg magit-diff-read-range-or-commit "Diff for range" nil magit-diff-arguments] 4)]) #@201 Show changes between the current working tree and the `HEAD' commit. With a prefix argument show changes between the working tree and a commit read from the minibuffer. (fn &optional REV ARGS FILES) (defalias 'magit-diff-working-tree #[768 "\300\206\301\302$\207" [magit-diff-setup-buffer "HEAD" nil] 8 (#$ . 51978) (byte-code "\205\301\302!\303 B\207" [current-prefix-arg magit-read-branch-or-commit "Diff working tree and commit" magit-diff-arguments] 2)]) #@179 Show changes between the index and the `HEAD' commit. With a prefix argument show changes between the index and a commit read from the minibuffer. (fn &optional REV ARGS FILES) (defalias 'magit-diff-staged #[768 "\300\301$\207" [magit-diff-setup-buffer "--cached"] 8 (#$ . 52453) (byte-code "\205\301\302!\303 B\207" [current-prefix-arg magit-read-branch-or-commit "Diff index and commit" magit-diff-arguments] 2)]) #@81 Show changes between the working tree and the index. (fn &optional ARGS FILES) (defalias 'magit-diff-unstaged #[512 "\300\301\211$\207" [magit-diff-setup-buffer nil] 7 (#$ . 52882) (magit-diff-arguments)]) #@64 Show changes that are being merged. (fn &optional ARGS FILES) (defalias 'magit-diff-unmerged #[512 "\300 \204 \301\302!\210\303\304 \305$\207" [magit-merge-in-progress-p user-error "No merge is in progress" magit-diff-setup-buffer magit--merge-range nil] 7 (#$ . 53097) (magit-diff-arguments)]) #@220 While committing, show the changes that are about to be committed. While amending, invoking the command again toggles between showing just the new changes or all the changes that will be committed. (fn &optional ARGS) (defalias 'magit-diff-while-committing #[256 "\303 \204 \304\305!\210\306\307\310\311\"\211\203Or\211q\210 \312\232\203*\n\313\232\203*\314\315\"\202K \315=\203<\n\313\232\203<\316!\202K\317 \203H\314\315\"\202K\316!)\202^\317 \203[\314\315\"\202^\316!\262)\207" [magit-display-buffer-noselect magit-buffer-range magit-buffer-typearg magit-commit-message-buffer user-error "No commit in progress" t magit-get-mode-buffer magit-diff-mode selected "HEAD^" "--cached" magit-diff-staged nil magit-diff-while-amending magit-anything-staged-p] 5 (#$ . 53403) (byte-code "\300 @C\207" [magit-diff-arguments] 1)]) (define-key git-commit-mode-map "" 'magit-diff-while-committing) #@23 (fn &optional ARGS) (defalias 'magit-diff-while-amending #[256 "\300\301\302\303$\207" [magit-diff-setup-buffer "HEAD^" "--cached" nil] 6 (#$ . 54322)]) #@273 Show diff for the blob or file visited in the current buffer. When the buffer visits a blob, then show the respective commit. When the buffer visits a file, then show the differenced between `HEAD' and the working tree. In both cases limit the diff to the file or blob. (defalias 'magit-diff-buffer-file #[0 "\302\303!\210\304 \211\2037\203\305\306 @C#\207\307 \210\310 ir\311\312 \206%\313\314\315 @C %q\210\316#)\207\317\320!\207" [magit-buffer-refname magit-diff-buffer-file-locked require magit magit-file-relative-name magit-show-commit magit-show-commit--arguments save-buffer line-number-at-pos magit-diff-setup-buffer magit-get-current-branch "HEAD" nil magit-diff-arguments magit-diff--goto-position user-error "Buffer isn't visiting a file"] 9 (#$ . 54485) nil]) #@55 Show changes between any two files on disk. (fn A B) (defalias 'magit-diff-paths #[514 "\300\301\302\301\303\304!!\303\304!!D$\207" [magit-diff-setup-buffer nil "--no-index" magit-convert-filename-for-git expand-file-name] 10 (#$ . 55278) (byte-code "\300\301\302\211\303$\300\304\302\211\303$D\207" [read-file-name "First file: " nil t "Second file: "] 6)]) (defalias 'magit-show-commit--arguments #[0 "\303\304!\211\242\243\211\242\243\305\306!\203#\204\307 \235?\205$\n\202$D\207" [magit-revision-filter-files-on-follow magit-buffer-log-args magit-buffer-log-files magit-diff-arguments magit-revision-mode derived-mode-p magit-log-mode "--follow"] 10]) #@168 Visit the revision at point in another buffer. If there is no revision at point or with a prefix argument prompt for a revision. (fn REV &optional ARGS FILES MODULE) (defalias 'magit-show-commit #[1025 "\301\302!\210\303 \304 \211\203N\211\203\305\306!!\307!\204%\310\311\"\210\312#\205J\313 \210\314\315 D\316 #irq\210\317#)\266\202\262)\207\320 \207" [default-directory require magit magit-file-relative-name magit-toplevel expand-file-name file-name-as-directory magit-commit-p user-error "%s is not a commit" magit-revision-setup-buffer save-buffer magit-diff-visit--offset "-R" line-number-at-pos magit-diff--goto-position magit--not-inside-repository-error] 13 (#$ . 55958) (byte-code "\302\303!\304\300!\203\203\305\306 \307\"\206\"\211\206\"\310\311\312\"\206\"\313 \314 \211\242\243\211\242\243 \2047\206<\315\316 \" \205G\317\320 !F\207" [magit-blame-mode current-prefix-arg magit-section-value-if module-commit boundp eieio-oref magit-current-blame-chunk orig-rev thing-at-point git-revision t magit-branch-or-commit-at-point magit-show-commit--arguments magit-read-branch-or-commit "Show commit" magit-section-parent-value magit-current-section] 14)]) #@35 (fn FILE LINE &optional PARENT) (defalias 'magit-diff--locate-hunk #[770 "\301\302\303\"\304\206 \305\"\"\211\205z\306\304\305\"\3072x\211A\262\242\211\262\205w\304\310\"\211\242\243\211\242\243\\ V\203K\311\307\f\306D\"\266 \202 X\203e\fX\203e\311\307 \312D\"\266 \202\204r\311\307 \306D\"\210\266\2020\266\202\207" [magit-root-section cl-find-if make-closure #[257 "\301!\205\f\302\303\"\300\232\207" [V0 magit-file-section--eieio-childp eieio-oref value] 4 "\n\n(fn SECTION)"] eieio-oref children nil --cl-block-nil-- to-range throw t] 18 (#$ . 57177)]) #@42 (fn FILE LINE COLUMN &optional PARENT) (defalias 'magit-diff--goto-position #[1027 "\300#\211\205\203\211\242\243\211\242\243\301!\203\"\302\303\"b\210\202e\211\203Y\302\304\"b\210\302\305\"@\211 W\204?\306f\307U\203P\306f\307U\204J\211T\262\306y\210\2021\210Tu\210\202e\302\303\"b\210\302\310\"\262\203}\302\311\"\203t\312!\210\302\310\"\262\202e\266\313 \210\314\207" [magit-diff--locate-hunk magit-file-section--eieio-childp eieio-oref start content to-range nil 45 parent hidden magit-section-show magit-section-update-highlight t] 14 (#$ . 57785)]) #@79 Convert diff range type. Change "revA..revB" to "revA...revB", or vice versa. (defalias 'magit-diff-switch-range-type #[0 "\203)\302\303!\203)\304 \"\203)\305\306\307\"\310\230\203\311\202 \310\312\211\307%\202-\313\314!\210\315 \207" [magit-buffer-range magit-range-re derived-mode-p magit-diff-mode string-match replace-match match-string 2 ".." "..." t user-error "No range to change" magit-refresh] 6 (#$ . 58383) nil]) #@68 Swap revisions in diff range. Change "revA..revB" to "revB..revA". (defalias 'magit-diff-flip-revs #[0 "\203\"\302\303!\203\"\304 \"\203\"\305\306\"\305\307\"\305\310\"Q\311 \207\312\313!\207" [magit-buffer-range magit-range-re derived-mode-p magit-diff-mode string-match match-string 3 2 1 magit-refresh user-error "No range to swap"] 5 (#$ . 58825) nil]) #@196 Toggle the file restriction of the current buffer's diffs. If the current buffer's mode is derived from `magit-log-mode', toggle the file restriction in the repository's revision buffer instead. (defalias 'magit-diff-toggle-file-filter #[0 "\300\301\302\303\304#\203\305\306!\211\203r\211q\210 )\207\307\310!\207\311\312!\203%\211 \207\313\314!\207" [#[0 "\204 \203 \202\302\303!\304 \207" [magit-buffer-diff-files magit-buffer-diff-files-suspended transient-infix-read magit:-- magit-refresh] 2] derived-mode-p magit-log-mode magit-cherry-mode magit-reflog-mode magit-get-mode-buffer magit-revision-mode message "No revision buffer" local-variable-p magit-buffer-diff-files user-error "Cannot toggle file filter in this buffer"] 5 (#$ . 59198) nil]) #@75 Decrease the context for diff hunks by COUNT lines. (fn &optional COUNT) (defalias 'magit-diff-less-context #[256 "\300\301\302\"!\207" [magit-diff-set-context make-closure #[257 "\301\206\301\300Z]\207" [V0 0] 4 "\n\n(fn CUR)"]] 5 (#$ . 59972) "p"]) #@75 Increase the context for diff hunks by COUNT lines. (fn &optional COUNT) (defalias 'magit-diff-more-context #[256 "\300\301\302\"!\207" [magit-diff-set-context make-closure #[257 "\211\206\301\300\\\207" [V0 0] 3 "\n\n(fn CUR)"]] 5 (#$ . 60234) "p"]) #@53 Reset context for diff hunks to the default height. (defalias 'magit-diff-default-context #[0 "\300\301!\207" [magit-diff-set-context ignore] 2 (#$ . 60495) nil]) #@11 (fn FN) (defalias 'magit-diff-set-context #[257 "\301\302!\211\203 \303!\202\304\262\305\306\305\211\211\203H\211A\262\242\262\262\211\262\203H\307\310\"\203;\305\262\203H\262\262T\262\202\266\211\262\211\205U\311\312\"\211\203_\303!\202`\262\313\"!\211\205y\211U?\205y\314\315\"\211\203\203\211B\202\204\266\316 \207" [magit-buffer-diff-args magit-get "diff.context" string-to-number 3 nil 0 string-match "^-U\\([0-9]+\\)?$" match-string 1 delete format "-U%i" magit-refresh] 12 (#$ . 60664)]) (defalias 'magit-diff-context-p #[0 "\301\302\301\211\211\2037\211A\262\242\262\262\211\262\2037\303\304\"\203*\301\262\2037\262\262T\262\202\266\211\262\211\203E\211\305\232?\207\306\207" [magit-buffer-diff-args nil 0 string-match "^-U\\([0-9]+\\)$" "-U0" t] 9]) (defalias 'magit-diff-ignore-any-space-p #[0 "\301\302\303\301\211\211\2032\211A\262\242\262\262\211\262\2032\235\211\262\2042\262\262T\262\202\266\211\262\205;\304\207" [magit-buffer-diff-args nil ("--ignore-cr-at-eol" "--ignore-space-at-eol" "--ignore-space-change" "-b" "--ignore-all-space" "-w" "--ignore-blank-space") 0 t] 8]) #@595 Turn diff-hunk refining on or off. If hunk refining is currently on, then hunk refining is turned off. If hunk refining is off, then hunk refining is turned on, in `selected' mode (only the currently selected hunk is refined). With a prefix argument, the "third choice" is used instead: If hunk refining is currently on, then refining is kept on, but the refining mode (`selected' or `all') is switched. If hunk refining is off, then hunk refining is turned on, in `all' mode (all hunks refined). Customize variable `magit-diff-refine-hunk' to change the default mode. (fn &optional STYLE) (defalias 'magit-diff-toggle-refine-hunk #[256 "\301\300!\210\211\203\302=\203\303\202\302\202?\304 \207" [magit-diff-refine-hunk make-local-variable all t magit-diff-update-hunk-refinement] 3 (#$ . 61870) "P"]) #@1286 From a diff visit the appropriate version of FILE. Display the buffer in the selected window. With a prefix argument OTHER-WINDOW display the buffer in another window instead. Visit the worktree version of the appropriate file. The location of point inside the diff determines which file is being visited. The visited version depends on what changes the diff is about. 1. If the diff shows uncommitted changes (i.e. stage or unstaged changes), then visit the file in the working tree (i.e. the same "real" file that `find-file' would visit. In all other cases visit a "blob" (i.e. the version of a file as stored in some commit). 2. If point is on a removed line, then visit the blob for the first parent of the commit that removed that line, i.e. the last commit where that line still exists. 3. If point is on an added or context line, then visit the blob that adds that line, or if the diff shows from more than a single commit, then visit the blob from the last of these commits. In the file-visiting buffer also go to the line that corresponds to the line that point is on in the diff. Note that this command only works if point is inside a diff. In other cases `magit-find-file' (which see) had to be used. (fn FILE &optional OTHER-WINDOW) (defalias 'magit-diff-visit-file #[513 "\300\301\203 \302\202\f\303#\207" [magit-diff-visit-file--internal nil switch-to-buffer-other-window pop-to-buffer-same-window] 6 (#$ . 62695) (byte-code "\301\302\211\"D\207" [current-prefix-arg magit-file-at-point t] 3)]) #@151 From a diff visit the appropriate version of FILE in another window. Like `magit-diff-visit-file' but use `switch-to-buffer-other-window'. (fn FILE) (defalias 'magit-diff-visit-file-other-window #[257 "\300\301\302#\207" [magit-diff-visit-file--internal nil switch-to-buffer-other-window] 5 (#$ . 64256) (byte-code "\300\301\211\"C\207" [magit-file-at-point t] 3)]) #@149 From a diff visit the appropriate version of FILE in another frame. Like `magit-diff-visit-file' but use `switch-to-buffer-other-frame'. (fn FILE) (defalias 'magit-diff-visit-file-other-frame #[257 "\300\301\302#\207" [magit-diff-visit-file--internal nil switch-to-buffer-other-frame] 5 (#$ . 64631) (byte-code "\300\301\211\"C\207" [magit-file-at-point t] 3)]) #@699 From a diff visit the worktree version of FILE. Display the buffer in the selected window. With a prefix argument OTHER-WINDOW display the buffer in another window instead. Visit the worktree version of the appropriate file. The location of point inside the diff determines which file is being visited. Unlike `magit-diff-visit-file' always visits the "real" file in the working tree, i.e the "current version" of the file. In the file-visiting buffer also go to the line that corresponds to the line that point is on in the diff. Lines that were added or removed in the working tree, the index and other commits in between are automatically accounted for. (fn FILE &optional OTHER-WINDOW) (defalias 'magit-diff-visit-worktree-file #[513 "\300\301\203 \302\202\f\303#\207" [magit-diff-visit-file--internal t switch-to-buffer-other-window pop-to-buffer-same-window] 6 (#$ . 65002) (byte-code "\301\302\211\"D\207" [current-prefix-arg magit-file-at-point t] 3)]) #@157 From a diff visit the worktree version of FILE in another window. Like `magit-diff-visit-worktree-file' but use `switch-to-buffer-other-window'. (fn FILE) (defalias 'magit-diff-visit-worktree-file-other-window #[257 "\300\301\302#\207" [magit-diff-visit-file--internal t switch-to-buffer-other-window] 5 (#$ . 65983) (byte-code "\300\301\211\"C\207" [magit-file-at-point t] 3)]) #@155 From a diff visit the worktree version of FILE in another frame. Like `magit-diff-visit-worktree-file' but use `switch-to-buffer-other-frame'. (fn FILE) (defalias 'magit-diff-visit-worktree-file-other-frame #[257 "\300\301\302#\207" [magit-diff-visit-file--internal t switch-to-buffer-other-frame] 5 (#$ . 66371) (byte-code "\300\301\211\"C\207" [magit-file-at-point t] 3)]) #@248 From a diff visit the appropriate version of FILE. If FORCE-WORKTREE is non-nil, then visit the worktree version of the file, even if the diff is about a committed change. Use FN to display the buffer in some window. (fn FILE FORCE-WORKTREE FN) (defalias 'magit-diff-visit-file--internal #[771 "\300!\203 \301\"\207\302\"\211\242\243\211\242\243!\210\303\"\210\207" [magit-file-accessible-directory-p magit-diff-visit-directory magit-diff-visit-file--noselect magit-diff-visit-file--setup] 13 (#$ . 66755)]) #@368 Visit DIRECTORY in some window. Display the buffer in the selected window unless OTHER-WINDOW is non-nil. If DIRECTORY is the top-level directory of the current repository, then visit the containing directory using Dired and in the Dired buffer put point on DIRECTORY. Otherwise display the Magit-Status buffer for DIRECTORY. (fn DIRECTORY &optional OTHER-WINDOW) (defalias 'magit-diff-visit-directory #[513 "\301!\301 \232\203\302\303P\"\207\211\203\304\202\305\306!)\207" [display-buffer-overriding-action magit-toplevel dired-jump "/." (nil (inhibit-same-window t)) (display-buffer-same-window) magit-status-setup-buffer] 6 (#$ . 67288)]) #@16 (fn BUF POS) (defalias 'magit-diff-visit-file--setup #[514 "\301\302\"\211\203:\303!r\304\305\"\216\306@\307\"\210\203(\310ed#\204%~\210b\210\2035\311!\2035\312 \210\313\314!*\207\315\316!\207" [buffer-file-name get-buffer-window visible internal--before-with-selected-window make-closure #[0 "\301\300!\207" [V0 internal--after-with-selected-window] 2] select-window norecord <= magit-anything-unmerged-p smerge-start-session run-hooks magit-diff-visit-file-hook error "File buffer is not visible"] 8 (#$ . 67950)]) #@37 (fn &optional FILE GOTO-WORKTREE) (defalias 'magit-diff-visit-file--noselect #[512 "\204\n\301\302\211\"\262\303 \211\205\304\"\205\305\"\205$\306\"\307 \2030\310!\2023\311!\204E\211;\204S\204E\204S\312!\206a\313!\202a\314;\203]\202^\315 \"\203\241r\211q\210\316=\203{\317 \320#\262\202\216\203\216;\203\216\317 #\262\211\214~\210eb\210Sy\210\321!\210`*D\207\211\320D\207" [magit-diff-visit-avoid-head-blob magit-file-at-point t magit-diff-visit--hunk magit-diff-visit--goto-from-p magit-diff-hunk-line magit-diff-hunk-column magit-diff--dwim magit-diff-visit--range-from magit-diff-visit--range-to get-file-buffer find-file-noselect magit-find-file-noselect "HEAD" staged magit-diff-visit--offset nil move-to-column] 13 (#$ . 68489)]) (defalias 'magit-diff-visit--hunk #[0 "\300 \211\2058\301 \302\267\202*\303\304\"@\262\202*\303\304\"@\262\211\203*\303\304\"@\262\211\2056\303\305\"\2056\211\262\207" [magit-diff-scope magit-current-section #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (file 14 files 14 list 24)) eieio-oref children value] 5]) #@28 (fn SECTION IN-WORKTREE) (defalias 'magit-diff-visit--goto-from-p #[514 "\205 \211?\205 \301\302\"?\205 `\301\303\"W?\205 \304 f\305U\207" [magit-diff-visit-previous-blob eieio-oref combined content line-beginning-position 45] 6 (#$ . 69661)]) #@26 (fn SECTION GOTO-FROM) (defalias 'magit-diff-hunk-line #[514 "\212\301 b\210`\302\303\"W\203\302\303\"b\210\304\305!\210\203$\302\306\"\202(\302\307\"@\302\310\"\2038\302\311\"G\2029\312`\313\302\303\"b\210`W\203m\203O\314\202P\315``\\{\316\317\320#)\266\203\204g\211T\262\316y\210\202A\266\202\\\262)\207" [inhibit-changing-match-data line-beginning-position slot-value content re-search-forward "^[-+]" from-range to-range combined from-ranges 1 0 "\\+" "-" nil t string-match] 14 (#$ . 69920)]) #@26 (fn SECTION GOTO-FROM) (defalias 'magit-diff-hunk-column #[514 "`\300\301\"W\204\211\204\302 f\303U\203\304\207\304i\305\\\300\306\"GZ]\207" [eieio-oref content line-beginning-position 45 0 2 value] 7 (#$ . 70455)]) #@13 (fn SPEC) (defalias 'magit-diff-visit--range-from #[257 "\211:\203\n\211A\300P\207\211;\203\301!@\207\207" ["^" magit-split-range] 3 (#$ . 70687)]) #@13 (fn SPEC) (defalias 'magit-diff-visit--range-to #[257 "\2119\203\207\211:\203\211A\202\301!A\203 \302!\203 \303\207\207" [magit-diff-visit-avoid-head-blob magit-split-range magit-rev-head-p unstaged] 4 (#$ . 70847)]) #@22 (fn FILE REV LINE) (defalias 'magit-diff-visit--offset #[771 "\301\302\303\304\"r\211q\210\305\306\"\216\212\307 \211\203%\211\310\311\312 $\210)\210\202)\313 \266)\3142\245\315\316\317\304#\205\244\320\321\322!!\320\321\323!!\320\321\324!!X\203\233\\W\203aZ\\\262\266\202.Z\211\301V\203\226\317f\211\325\267\210\202\220S\266\202\202\220S\262S\266\202\202\220T\262\210\202\220\210\317y\210\202d\266\202.\326\314\317\"\266\202.0\210*\210\\\207" [default-directory 0 generate-new-buffer " *temp*" t make-closure #[0 "\301\300!\205 \302\300!\207" [V0 buffer-name kill-buffer] 2] magit-toplevel magit-git-insert "diff" "--" magit--not-inside-repository-error found re-search-forward "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\n" nil string-to-number match-string 1 2 4 #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (32 115 45 122 43 134)) throw] 12 (#$ . 71083)]) #@349 Update the commit or diff buffer for the thing at point. Either show the commit or stash at point in the appropriate buffer, or if that buffer is already being displayed in the current frame and contains information about that commit or stash, then instead scroll the buffer up. If there is no commit or stash at point, then prompt for a commit. (defalias 'magit-diff-show-or-scroll-up #[0 "\300\301!\207" [magit-diff-show-or-scroll scroll-up] 2 (#$ . 72062) nil]) #@351 Update the commit or diff buffer for the thing at point. Either show the commit or stash at point in the appropriate buffer, or if that buffer is already being displayed in the current frame and contains information about that commit or stash, then instead scroll the buffer down. If there is no commit or stash at point, then prompt for a commit. (defalias 'magit-diff-show-or-scroll-down #[0 "\300\301!\207" [magit-diff-show-or-scroll scroll-down] 2 (#$ . 72536) nil]) #@11 (fn FN) (defalias 'magit-diff-show-or-scroll #[257 "\304\211\211\211\203\305\306 \307\"\262\310\262\311\312!\262\202\235\313\314!\203E\315 \316\317\"\320=\2043\321\322!\266\202\235\316\323\"\262\310\262\311\312!\262\210\202\235\324 \211\203f\325\326\"\203f\327\305\330\"!\262\310\262\311\312!\262\210\202\235\211\203\203\325\320\"\203\203\305\330\"\262\310\262\311\312!\262\210\202\235\211\203\234\325\331\"\203\234\305\330\"\262\332\262\311\333!\262\210\203\203\355\334!\211\262\203\355rq\210 \232\205\275\335!\n\232)\203\355\336!r\337\340\"\216\341@\342\"\210\3431\332 0\202\353\210\344\267\202\351e\202\352d\202\352\304b*\207\345\310=\203\376\346\310\347 #\202!)\207\350\310!\207" [magit-blame-mode magit-buffer-revision magit-buffer-revision-hash magit-display-buffer-noselect nil eieio-oref magit-current-blame-chunk orig-rev magit-show-commit magit-get-mode-buffer magit-revision-mode derived-mode-p git-rebase-mode git-rebase-current-line slot-value action-type commit user-error "No commit on this line" target magit-current-section magit-section-match-1 branch magit-ref-maybe-qualify value stash magit-stash-show magit-stash-mode get-buffer-window magit-rev-parse internal--before-with-selected-window make-closure #[0 "\301\300!\207" [V0 internal--after-with-selected-window] 2] select-window norecord (error) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (scroll-up 225 scroll-down 229)) t apply magit-show-commit--arguments call-interactively] 10 (#$ . 73015)]) #@66 Cycle visibility of diff-related sections in the current buffer. (defalias 'magit-section-cycle-diffs #[0 "\301\302!\203\303\304\305\306\307\310!\307\311!D\"\"\202#\301\312!\205#\313\314\315\316\"\"\211\205\317\320\317\211\211\203Z\211A\262\242\262\262\211\262\203Z\315\321\"\211\262\204Z\262\262T\262\202-\266\211\262\203y\211\211\205x\211@\322!\210\323!\210A\266\202\202c\207\303\304\305\324\"\"\317\320\317\211\211\203\263\211A\262\242\262\262\211\262\203\263\315\321\"\211\262\204\263\262\262T\262\202\206\266\211\262\203\375\317\320\317\211\211\203\356\211A\262\242\262\262\211\262\203\356\315\316\"\211\262\204\356\262\262T\262\202\301\266\211\262\203\375\325\326\"\202\327\330\"\203 \325\331\"\202\325\332\"\262\207" [magit-root-section derived-mode-p magit-status-mode apply append mapcar #[257 "\211\205\300\301\"\203\302!\210\300\303\"\207" [eieio-oref hidden magit-section-show children] 4 "\n\n(fn IT)"] magit-get-section ((staged) (status)) ((unstaged) (status)) magit-diff-mode -filter magit-file-section-p eieio-oref children nil 0 hidden magit-section-show magit-section-hide-children #[257 "\300\301\"\207" [eieio-oref children] 4 "\n\n(fn IT)"] mapc magit-section-show-headings seq-some magit-section-hidden-body magit-section-show-children magit-section-hide] 11 (#$ . 74608) nil]) #@31 Keymap for `magit-diff-mode'. (defvar magit-diff-mode-map (byte-code "\301 \302\"\210\303\304\305#\210\303\306\307#\210\303\310\311#\210\303\312\313#\210\303\314\315#\210\303\316\317#\210\303\320\321#\210\207" [magit-mode-map make-sparse-keymap set-keymap-parent define-key "" magit-diff-while-committing "" magit-go-backward "" magit-go-forward " " scroll-up "" scroll-down "j" magit-jump-to-diffstat-or-diff [remap write-file] magit-patch-save] 5) (#$ . 76018)) (defvar magit-diff-mode-hook nil) (byte-code "\300\301N\204\f\302\300\301\303#\210\304\305!\204\302\305\306\307#\210\300\207" [magit-diff-mode-hook variable-documentation put "Hook run after entering Magit Diff mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp magit-diff-mode-map definition-name magit-diff-mode] 4) (defvar magit-diff-mode-map (make-sparse-keymap)) (byte-code "\301\302N\204\303\301\302\304\305!#\210\306\307!\204\303\307\310\311#\210\312\313 !\210\307\302N\204-\303\307\302\304\314!#\210\306\300!\204B\303\300\310\311#\210\315\316\300\317\"\210!\210\300\302N\204P\303\300\302\304\320!#\210\303\311\321\322#\210\303\311\323\324#\207" [magit-diff-mode-abbrev-table magit-diff-mode-map variable-documentation put purecopy "Keymap for `magit-diff-mode'." boundp magit-diff-mode-syntax-table definition-name magit-diff-mode (lambda (def-tmp-var) (defvar magit-diff-mode-syntax-table def-tmp-var)) make-syntax-table "Syntax table for `magit-diff-mode'." (lambda (def-tmp-var) (defvar magit-diff-mode-abbrev-table def-tmp-var)) define-abbrev-table nil "Abbrev table for `magit-diff-mode'." derived-mode-parent magit-mode custom-mode-group magit-diff] 5) #@809 Mode for looking at a Git diff. This mode is documented in info node `(magit)Diff Buffer'. \Type \[magit-refresh] to refresh the current buffer. Type \[magit-section-toggle] to expand or hide the section at point. Type \[magit-visit-thing] to visit the hunk or file at point. Staging and applying changes is documented in info node `(magit)Staging and Unstaging' and info node `(magit)Applying'. \Type \[magit-apply] to apply the change at point, \[magit-stage] to stage, \[magit-unstage] to unstage, \[magit-discard] to discard, or \[magit-reverse] to reverse it. \{magit-diff-mode-map} In addition to any hooks its parent mode `magit-mode' might have run, this mode runs the hook `magit-diff-mode-hook', as the final or penultimate step during initialization. (defalias 'magit-diff-mode #[0 "\306\300!\210\307\310 \210\311\312\310\313N\203\314\311\313\310\313N#\210\315 !\204'\316 \317 \"\210\320\f!\211\2035\211\321 =\203;\322\f\323 \"\210\210\324 \325\"\204R =\204R\326 \325C#\210\327 !\210\330\f!\210 \331 \210\332\333 )\334\335!\207" [delay-mode-hooks major-mode mode-name magit-diff-mode-map magit-diff-mode-syntax-table magit-diff-mode-abbrev-table make-local-variable t magit-mode magit-diff-mode "Magit Diff" mode-class put keymap-parent set-keymap-parent current-local-map char-table-parent standard-syntax-table set-char-table-parent syntax-table abbrev-table-get :parents abbrev-table-put use-local-map set-syntax-table hack-dir-local-variables-non-file-buffer magit-imenu--diff-prev-index-position-function magit-imenu--diff-extract-index-name-function run-mode-hooks magit-diff-mode-hook local-abbrev-table imenu-prev-index-position-function imenu-extract-index-name-function] 5 (#$ . 77773) nil]) (put 'magit-diff-mode 'magit-diff-default-arguments '("--stat" "--no-ext-diff")) #@50 (fn RANGE TYPEARG ARGS FILES &optional LOCKED) (defalias 'magit-diff-setup-buffer #[1284 "\300\301!\210\302\303\304D\305D\306D\307D\310\311D\257#\207" [require magit magit-setup-buffer-internal magit-diff-mode magit-buffer-range magit-buffer-typearg magit-buffer-diff-args magit-buffer-diff-files magit-buffer-diff-files-suspended nil] 14 (#$ . 79638)]) #@47 Refresh the current `magit-diff-mode' buffer. (defalias 'magit-diff-refresh-buffer #[0 "\306\307\232\203\310\311\312 #\202f\n\203>\313\n\314\315\316#)\266\203\203*\311\317\n\"\202I\320\f\235\2037\311\321\n\"\202I\311\322\n\"\202I\323\232\203H\324\202I\325 G\211\326\267\202\\\314\202c\327 @P\202c\330\331\332 \333#P\262P!\210\n\205o\334\n!\335\336!\203z\336\202\203\336@\236A\206\203\337\340\335\336!\203\223\341\336@\"@\206\224\336\342\314\343\344 \345A&\346\347\350\351\"\211\203\257\211\352=\202\344B\205\274\353\354!B\"\211\203\307\355\347\"\202\342\356C\"\211\205\340\357!\203\335\211!\262\211\352=\262\262\262#\210\211B\206\372A?\205\372DDBAE\3602\301\361\362!\210\363\364!\210\365!\210\366\355\367\"\315\"\210\346\370\344 #\371\372\"\373\311\374\355\375\"\"!\373\311\376\355\375\"\"!\203?J\206R\377!\203JJ\206R\377!\205R\211J\212\355\367\"b\210`W\203\221\201G`\337\"\206j\201H`\337\"\204\212\201I`\337\n$\210\203\212\201I`\372$\210\211b\266\202Z)\266\211D=\203\247\314F\201J!)\202\300\346\355\201K\"\201L\355\211\201K\"\201L\"C\244#0\210+\207" [magit-buffer-typearg magit-buffer-diff-files magit-buffer-range inhibit-changing-match-data magit-buffer-diff-args magit-buffer-range-hashed magit-set-header-line-format "--no-index" apply format "Differences between %s and %s" "\\(\\.\\.\\|\\^-\\)" nil t string-match "Changes in %s" "-R" "Changes from working tree to %s" "Changes from %s to working tree" "--cached" "Staged changes" "Unstaged changes" #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (0 81 1 85)) " in file " " in files " mapconcat identity ", " magit-hash-range class-p diffbuf magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-run-section-hook magit-diff-sections-hook run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-section-cache-visibility next-single-property-change get-text-property put-text-property magit-section-show parent children] 12 (#$ . 80010)]) (cl-generic-define-method 'magit-buffer-value nil '(&context (major-mode magit-diff-mode)) nil #[0 "\203 \303\304 D\"\202 \305\232\203\306C\202\307 D\n\205\"\310\nB\244\207" [magit-buffer-range magit-buffer-typearg magit-buffer-diff-files delq nil "--cached" staged unstaged "--"] 4]) #@44 Parent of `magit-{hunk,file}-section-map'. (defvar magit-diff-section-base-map (byte-code "\300 \301\302\303#\210\301\304\303#\210\301\305\306#\210\301\307\310#\210\301\311\312#\210\301\313\314#\210\301\315\316#\210\301\317\320#\210\301\321\322#\210\301\323\324#\210\301\325\326#\210\301\327\330#\210\301\331\332#\210\301\333\334#\210\301\335\336#\210\301\337\340#\210\207" [make-sparse-keymap define-key "\n" magit-diff-visit-worktree-file [C-return] [24 52 return] magit-diff-visit-file-other-window [24 53 return] magit-diff-visit-file-other-frame [remap magit-visit-thing] magit-diff-visit-file [remap magit-delete-thing] magit-discard [remap magit-revert-no-commit] magit-reverse "a" magit-apply "s" magit-stage "u" magit-unstage "&" magit-do-async-shell-command "C" magit-commit-add-log "a" magit-add-change-log-entry "4a" magit-add-change-log-entry-other-window "" magit-diff-trace-definition "" magit-diff-edit-hunk-commit] 5) (#$ . 82876)) #@29 Keymap for `file' sections. (defvar magit-file-section-map (byte-code "\301 \302\"\210\207" [magit-diff-section-base-map make-sparse-keymap set-keymap-parent] 4) (#$ . 83853)) #@29 Keymap for `hunk' sections. (defvar magit-hunk-section-map (byte-code "\301 \302\"\210\207" [magit-diff-section-base-map make-sparse-keymap set-keymap-parent] 4) (#$ . 84037)) (defconst magit-diff-conflict-headline-re "^\\(?:added in \\(?:both\\|local\\|remote\\)\\|changed in both\\|merged\\|removed in \\(?:both\\|local\\|remote\\)\\)") (defconst magit-diff-headline-re (byte-code "\301\302\303O\304Q\207" [magit-diff-conflict-headline-re "^\\(@@@?\\|diff\\|Submodule\\|\\* Unmerged path\\|" 1 nil "\\)"] 4)) (defconst magit-diff-statline-re "^ ?\\(.*\\)\\( +| +\\)\\([0-9]+\\|Bin\\(?: +[0-9]+ -> [0-9]+ bytes\\)?$\\) ?\\(\\+*\\)\\(-*\\)$") (defvar magit-diff--reset-non-color-moved (list #1="-c" "color.diff.context=normal" #1# "color.diff.plain=normal" #1# "color.diff.meta=normal" #1# "color.diff.frag=normal" #1# "color.diff.func=normal" #1# "color.diff.old=normal" #1# "color.diff.new=normal" #1# "color.diff.commit=normal" #1# "color.diff.whitespace=normal")) #@53 Insert the diff into this `magit-diff-mode' buffer. (defalias 'magit-insert-diff #[0 "\304\305\306\307\310 \235\205\f\311\n \312 & \207" [magit-buffer-range magit-buffer-diff-args magit-buffer-typearg magit-buffer-diff-files magit--insert-diff "diff" "-p" "--no-prefix" "--stat" "--numstat" "--"] 10 (#$ . 85014)]) #@19 (fn &rest ARGS) (defalias 'magit--insert-diff #[128 "\302!\303\304\"\211\242\243\305\232\204<\306\307\310\"\211\310=\203.\311\312\313 \"\314\307\"\210\211\262\2022\211\211\262\262\203<\315B\262\316!\262\317\320\"\203R\321B\262\322 \"\323\324#\266\204)\207" [magit-git-global-arguments magit-diff--reset-non-color-moved -flatten remove "--literal-pathspecs" "merge-tree" magit-repository-local-get diff-ita-kludge-p unset version<= "2.19.0" magit-git-version magit-repository-local-set "--ita-visible-in-index" magit-diff--maybe-add-stat-arguments cl-member-if #[257 "\300\301\"\207" [string-prefix-p "--color-moved"] 4 "\n\n(fn ARG)"] "--color=always" append magit-git-wash magit-diff-wash-diffs] 11 (#$ . 85337)]) (byte-code "\300\301\302\303#\300\207" [function-put magit--insert-diff lisp-indent-function 0] 4) #@13 (fn ARGS) (defalias 'magit-diff--maybe-add-stat-arguments #[257 "\301\235\203\302\303!\203 \202\"\207\207" [magit-diff-extra-stat-arguments "--stat" append functionp] 4 (#$ . 86187)]) #@56 Use the `window-width' as the value of `--stat-width'. (defalias 'magit-diff-use-window-width-as-stat-width #[0 "\300p\301\"\211\205\302\303\304!\"C\207" [get-buffer-window visible format "--stat-width=%d" window-width] 5 (#$ . 86390)]) #@29 (fn ARGS &optional LIMIT) (defalias 'magit-diff-wash-diffs #[513 "\301\302!\210\303\235\203 \304 \210\305\235\203\306 \210\307\310#\205+\311 b\210\312\313\314\"!\210\315c\207" [magit-diff-headline-re run-hooks magit-diff-wash-diffs-hook "--show-signature" magit-diff-wash-signature "--stat" magit-diff-wash-diffstat re-search-forward t line-beginning-position magit-wash-sequence apply-partially magit-diff-wash-diff 10] 6 (#$ . 86636)]) #@185 Jump to the diffstat or diff. When point is on a file inside the diffstat section, then jump to the respective diff section, otherwise jump to the diffstat section or a child thereof. (defalias 'magit-jump-to-diffstat-or-diff #[0 "\301\302\303 \211\203\304\305\"\203\306\307\310\"BC\2020\211\203/\304\306\"\203/\306\307\310\"B\311B\2020\312\262\313!\"!\211\203?\314!\207\315\316!\207" [magit-root-section magit-get-section append magit-current-section magit-section-match-1 [file diffstat] file eieio-oref value ((diffstat)) ((diffstat)) magit-section-ident magit-section-goto user-error "No diffstat in this buffer"] 7 (#$ . 87092) nil]) (defalias 'magit-diff-wash-signature #[0 "\306\307!\205G\310\311!\203\311\202\311\236A\206\312\313\310\311!\203'\314\311\"@\206(\311\315\316\317\320 \321 &\322\323\324\325\"\211\203B\211\326=\202t\n\205M\327\330!\n\"\211\203X\331\323\"\202r\332 \"\211\205p\333!\203m\211!\262\211\326=\262\262\262#\210\211\n\206\206 ?\205\206\f\3342B\306\307!\203\231\316y\210\202\215\335c\210\336\337!\210\340!\210\341\331\342\"\343\"\210\322\344\320 #\345\346\"\347\350\351\331\352\"\"!\347\350\353\331\352\"\"!\203\323J\206\346\354!\203\336J\206\346\354!\205\346\211J\212\331\342\"b\210`W\203\355`\312\"\206\374\356`\312\"\204\357`\312\n$\210\203\357`\346$\210\211b\266\202\356)\266\211\f=\2030\3163\360!)\202A\322\331\361\"\362\331\211\361\"\362\"C\244#0\210+\211\262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current looking-at "^gpg: " class-p signature magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section "\n" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-section-cache-visibility] 12]) (defalias 'magit-diff-wash-diffstat #[0 "\306`\307\310\306\311#\205\260\312\313!\262\314 \210\211b\210\315\316!\203\316\202'\316\236A\206'\317\320\315\316!\2036\321\316\"@\2067\316\322\306\323\324 \325 &\326\327\330\331\"\211\203Q\211\332=\202\203\n\205\\\333\334!\n\"\211\203g\335\327\"\202\201\336 \"\211\205\337!\203|\211!\262\211\332=\262\262\262#\210\211\n\206\225 ?\205\225\f\3402\253\341\342\343#c\210\344 \210\306\345\346!\203\341\347\312\313!\350\351\"\203\304\312\313\"\312\352\"P\202\324\350\353\"\203\323\211\354\225\306O\202\324\211\262!B\262\355 \210\202\247\211\237\262\345@!\203\307\312\313\306\"\312\356\306\"\312\352\306\"\312\357\306\"\312\360\306\"\355 \210\350\361\"\203\312\354\"P\262\354\211\224O\262G\306\347!\262G\262V\203:\362Z\363\"P\262\266\315\364!\203F\364\202N\364\236A\206N\317\320\315\364!\203]\321\364\"@\206^\364\322 \211A\262 \242\323\324 \325 &\326\327\330\331\"\211\203~\211\332=\202\260\n\205\211\333\334!\n\"\211\203\224\335\327\"\202\256\336 \"\211\205\254\337!\203\251\211!\262\211\332=\262\262\262#\210\211\n\206\302 ?\205\302\f\3402\300\341\342\365#\366\261\210\203\340\341\342\367#c\210\203\353\341\342\370#c\210\371c\210\372\373!\210\374!\210\375\335\376\"\311\"\210\326\377\324 #\201B\201C\"\201D\201E\201F\335\201G\"\"!\201D\201E\201H\335\201G\"\"!\2039J\206P\201I!\203FJ\206P\201I!\205P\211J\212\335\376\"b\210`W\203\221\201J`\317\"\206h\201K`\317\"\204\212\201L`\317\n$\210\203\212\201L`\201C$\210\211b\266\202X)\266\211\f=\203\246\306A\201M!)\202\277\326\335\201N\"\201O\335\211\201N\"\201O\"C\244#0\210+\266\202\345\210\345\201P!\203\326\306y\210\202\331\371c\210\372\373!\210\374!\210\375\335\376\"\311\"\210\326\377\324 #\201B\201C\"\201D\201E\201F\335\201G\"\"!\201D\201E\201H\335\201G\"\"!\203$J\206;\201I!\2031J\206;\201I!\205;\211J\212\335\376\"b\210`W\203|\201J`\317\"\206S\201K`\317\"\204u\201L`\317\n$\210\203u\201L`\201C$\210\211b\266\202C)\266\211\f=\203\221\306A\201M!)\202\252\326\335\201N\"\201O\335\211\201N\"\201O\"C\244#0\210+\211\262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current nil re-search-forward "^ ?\\([0-9]+ +files? change[^\n]*\n\\)" t match-string 1 magit-delete-match class-p diffstat magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize font-lock-face magit-diff-file-heading magit-insert-heading looking-at "^[-0-9]+ [-0-9]+ \\(.+\\)$" magit-decode-git-path string-match "\\`\\([^{]+\\){\\(.+\\) => \\(.+\\)}\\'" 3 " => " 0 magit-delete-line 2 4 5 " +$" make-string 32 file magit-filename " " magit-diffstat-added magit-diffstat-removed "\n" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end magit-diff-statline-re magit-section-cache-visibility eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children "^$"] 21]) #@13 (fn ARGS) (defalias 'magit-diff-wash-diff #[257 "\306\307\"\203\310\311!\210\312ed\"\210\313\314!\203\315 \207\313\316!\203`\317\320\321!!\322 \210\323\324!\2033\325\235\203[\326\327!\203=\327\202E\327\236A\206E\330\331\326\327!\203T\332\327\"@\206U\327\333\334\335 \336 &\337\340\341\342\"\211\203o\211\343=\202\241\n\205z\344\345!\n\"\211\203\205\346\340\"\202\237\347 \"\211\205\235\350!\203\232\211!\262\211\343=\262\262\262#\210\211\n\206\263 ?\205\263\f\3512X\352\353\354\355!@AA\211:\205u\211\242\211\356\267\202r\243\211:\205\376\211\242\211\357\267\202\373\243\211?\205\351\360\262\202\374\243\211?\205\366\361\262\202\374\362\262\262\202s\243\211:\205<\211\242\211\363\267\2029\243\211?\205\364\262\202:\243\211?\205'\365\262\202:\243\211?\2054\366\262\202:\362\262\262\202s\243\211:\205m\211\242\211\367\267\202j\243\211?\205X\370\262\202k\243\211?\205e\371\262\202k\362\262\262\202s\362\262\262#\372\373#c\210\374c\210\375\376!\210\377!\210\201E\346\201F\"\201G\"\210\337\201H\335 #\201I\201J\"\201K\353\201L\346\201M\"\"!\201K\353\201N\346\201M\"\"!\203\317J\206\346\201O!\203\334J\206\346\201O!\205\346\211J\212\346\201F\"b\210`W\203)\201P`\330\"\206\201Q`\330\"\204\"\201R`\330\n$\210\203\"\201R`\201J$\210\211b\266\202\360)\266\211\f=\203>\362@\201S!)\202W\337\346\201T\"\201U\346\211\201T\"\201U\"C\244#0\210+\210\210\201G\207\313A!\203$\320\201V!\201W\362\211\211\201X\232\203\203\262\362\262\202\302\201Y\267\202\265\201Z\202\300\201Z\202\300\201Z\202\300\201[\202\300\201\\\202\300\201[\202\300\201[\202\300\201]\201^\"\262\262\322 \210\313\201_!\203\320\321\362\"\320\201`\362\"\201a\267\266\202\372\262\210\202\372\262\210\202\372\262\210\202\372\266\202\202\372\266\322 \210\202\305\203 \317!\262\203\317!\262\201b\206\362\211\n&\207\313\201c!\205\226\320\321!\201d\232\203<\201e\202M\323\201f!\203J\201g\202M\201h\320\201i!\206Z\320\201j!`\362\211\211\212\321y\210\201kB\362\201G#\203w\201V\224\202xd{\262)\322 \210m\204 \313B!\204 \313\201l!\203\241\320\201V!\262\201m \210\202\313\201n!\203\261\320\321!\262\202\313\201o!\203\301\320\321!\262\202\313\201p!\203\323\320\201i!\262\202\313\201q!\203\372\320\201i!\262\320\321!\201r\232\203\362\201Z\202\365\201s\262\202\313\201t!\203\320\321!\262\322 \210\202\203\317!\262\317!\262\323\201u!\203\211\362C\201V\362\211\211\203m\211A\262\242\262\262\211\262\203m\201v\362\201GD\201w#)\266\203\203`\362\262\203m\262\262T\262\202,\266\211\262\203\211\201i\362O\262\203\211\201i\362O\262\201b%\266\206\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current cl-member-if #[257 "\300\301\"\207" [string-prefix-p "--color-moved"] 4 "\n\n(fn ARG)"] require ansi-color ansi-color-apply-on-region looking-at "^Submodule" magit-diff-wash-submodule "^\\* Unmerged path \\(.*\\)" magit-decode-git-path match-string 1 magit-delete-line derived-mode-p magit-status-mode "--cached" class-p file magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize format "unmerged %s%s" magit-file-status #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 210 85 259 65 321)) #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 225 85 238)) " (both deleted)" " (deleted by us)" nil #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (68 274 65 287 85 300)) " (deleted by them)" " (added by them)" "" #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (65 336 85 349)) " (both added)" " (added by us)" font-lock-face magit-diff-file-heading 10 run-hooks magit-insert-section-hook magit-insert-child-count magit-section-cache-visibility magit-diff-conflict-headline-re magit-diff-headline-re magit-buffer-log-args inhibit-changing-match-data set-marker-insertion-type start t end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children 0 "BUG" "merged" #s(hash-table size 7 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("added in remote" 651 "added in both" 657 "added in local" 663 "removed in both" 669 "changed in both" 675 "removed in local" 681 "removed in remote" 687)) "new file" "removed" "changed" error "No clause matching `%S'" "^ \\([^ ]+\\) +[0-9]\\{6\\} \\([a-z0-9]\\{40\\}\\) \\(.+\\)$" 3 #s(hash-table size 4 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("result" 737 "our" 743 "their" 749 "base" 755)) magit-diff-insert-file-section "^diff --\\(?:\\(git\\) \\(?:\\(.+?\\) \\2\\)?\\|\\(cc\\|combined\\) \\(.+\\)\\)" "git" "modified" magit-revision-mode "resolved" "unmerged" 2 4 re-search-forward "^old mode \\([^\n]+\\)\nnew mode \\([^\n]+\\)\n" magit-delete-match "^--- \\([^/].*?\\) ?$" "^\\+\\+\\+ \\([^/].*?\\) ?$" "^\\(copy\\|rename\\) from \\(.+\\)$" "^\\(copy\\|rename\\) to \\(.+\\)$" "copy" "renamed" "^\\(new file\\|deleted\\)" magit-log-mode "\\`-L" string-match] 20 (#$ . 92900)]) #@60 (fn FILE ORIG STATUS MODES HEADER &optional LONG-STATUS) (defalias 'magit-diff-insert-file-section #[1541 "\306\307!\203\n\307\202\307\236A\206\310\311\306\307!\203!\312\307\"@\206\"\307\313 \314\315 \316 &\317\320\321\322\"\211\203=\211\323=\202|\n\205H\324\325!\n\"\211\203S\326\320\"\202z\327 \"\211\203n\330!\203h\211!\262\211\323=\202x\n\331\232\206x\332\333!\262\262\262#\210\211\n\206\216 ?\205\216\f\3342\302\211\335\336\337\n\203\250\n\f\232\203\255 \202\264\336\340\f##\341\342#c\210\203\304\336\343\"c\210\344 \210\232\204\326\317\345 #\210\317\346#\210\203\306\347!\203\353\347\202\363\347\236A\206\363\310\311\306\347!\203\312\347\"@\206\347\313\350\314\315 \316 &\317\320\321\322\"\211\203\211\323=\202O\n\205(\324\325!\n\"\211\2033\326\320\"\202M\327 \"\211\205K\330!\203H\211!\262\211\323=\262\262\262#\210\211\n\206a ?\205a\f\3342c\210\344 \210\351\352!\210\353!\210\354\326\355\"\356\"\210\317\357\315 #\360\361\"\362\336\363\326\364\"\"!\362\336\365\326\364\"\"!\203\245J\206\270\366!\203\260J\206\270\366!\205\270\211J\212\326\355\"b\210`W\203\357\367`\310\"\206\316\370`\310\"\204\350\371`\310\n$\210\203\350\371`\361$\210\211b\266\202\300)\266\211\f=\203\350?\372!)\202\317\326\373\"\374\326\211\373\"\374\"C\244#0\210+\210\375\376!\266\351\352!\210\353!\210\354\326\355\"\356\"\210\317\357\315 #\360\361\"\362\336\363\326\364\"\"!\362\336\365\326\364\"\"!\203SJ\206f\366!\203^J\206f\366!\205f\211J\212\326\355\"b\210`W\203\235\367`\310\"\206|\370`\310\"\204\226\371`\310\n$\210\203\226\371`\361$\210\211b\266\202n)\266\211\f=\203\260\350?\372!)\202\301\317\326\373\"\374\326\211\373\"\374\"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current class-p file magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp "deleted" derived-mode-p magit-status-mode cancel-section propertize format "%-10s %s" "%s -> %s" font-lock-face magit-diff-file-heading " (%s)" magit-insert-heading source header hunk nil run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-wash-sequence magit-diff-wash-hunk magit-section-cache-visibility] 20 (#$ . 98579)]) (defalias 'magit-diff-wash-submodule #[0 "\306\307!\205f\310\311!\312\211\306\313!\203\314 \210\315\262\306\316!\203#\314 \210\315\262\306\317!\203@\310\311!\232\203@\310\320\312\"\310\321\312\"\314 \210\306\322!\203H\314 \210\202<\211\203W\323\324\325\315\211\311&\262\326\327!\203a\327\202i\327\236A\206i\330\331\326\327!\203x\332\327\"@\206y\327\333\334\335 \336 &\337\340\341\342\"\211\203\224\211\343=\202\312\n\205\237\344\345!\n\"\211\203\252\346\340\"\202\310\347 \"\211\203\305\350!\203\277\211!\262\211\343=\202\306\315\262\262\262#\210\211\n\206\334 ?\205\334\f\3512=\352\353\354P\355\356#\357\203\365\360\202\f\361\312\315@\362#)\266\203\203 \363\202\f\364\204\2051\365\205\366 \205(\n\205(\367 \205.\370\371\260\372%\210\373\374\375 \"!A\376\377\201C\201D\"\201E\201F\201G%\210\201H\201I!\210)\201J\201K!\210\201L!\210\201M\346\201N\"\315\"\210\337\201O\335 #\201P\201Q\"\201R\201S\201T\346\201U\"\"!\201R\201S\201V\346\201U\"\"!\203\264J\206\313\201W!\203\301J\206\313\201W!\205\313\211J\212\346\201N\"b\210`W\203\201X`\330\"\206\345\201Y`\330\"\204\201Z`\330\n$\210\203\201Z`\201Q$\210\211b\266\202\325)\266\211\f=\203#\312B\201[!)\202<\337\346\201\\\"\201]\346\211\201\\\"\201]\"C\244#0\210+\207\306\201^!\203\322\310\311!\232\203\322\310\321\312\"\314 \210\326\327!\203a\327\202i\327\236A\206i\330\331\326\327!\203x\332\327\"@\206y\327\333\334\335 \336 &\337\340\341\342\"\211\203\224\211\343=\202\306\n\205\237\344\345!\n\"\211\203\252\346\340\"\202\304\347 \"\211\205\302\350!\203\277\211!\262\211\343=\262\262\262#\210\211\n\206\330 ?\205\330\f\3512\317\352\353\201_P\355\356#\357\372$\210\201J\201K!\210\201L!\210\201M\346\201N\"\315\"\210\337\201O\335 #\201P\201Q\"\201R\201S\201T\346\201U\"\"!\201R\201S\201V\346\201U\"\"!\203FJ\206]\201W!\203SJ\206]\201W!\205]\211J\212\346\201N\"b\210`W\203\240\201X`\330\"\206w\201Y`\330\"\204\231\201Z`\330\n$\210\203\231\201Z`\201Q$\210\211b\266\202g)\266\211\f=\203\265\312B\201[!)\202\316\337\346\201\\\"\201]\346\211\201\\\"\201]\"C\244#0\210+\207\326\327!\203\334\327\202\344\327\236A\206\344\330\331\326\327!\203\363\332\327\"@\206\364\327\333\334\335 \336 &\337\340\341\342\"\211\203\211\343=\202A\n\205\344\345!\n\"\211\203%\346\340\"\202?\347 \"\211\205=\350!\203:\211!\262\211\343=\262\262\262#\210\211\n\206S ?\205S\f\3512_\352\353\354P\355\356#\357\205i\366\205s\205s\367\205y\370\201`&\210\201J\201K!\210\201L!\210\201M\346\201N\"\315\"\210\337\201O\335 #\201P\201Q\"\201R\201S\201T\346\201U\"\"!\201R\201S\201V\346\201U\"\"!\203\326J\206\355\201W!\203\343J\206\355\201W!\205\355\211J\212\346\201N\"b\210`W\2030\201X`\330\"\206\201Y`\330\"\204)\201Z`\330\n$\210\203)\201Z`\201Q$\210\211b\266\202\367)\266\211\f=\203E\312B\201[!)\202^\337\346\201\\\"\201]\346\211\201\\\"\201]\"C\244#0\210+\211\262\266\203\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current looking-at "^Submodule \\([^ ]+\\)" match-string 1 nil "^Submodule [^ ]+ contains untracked content$" magit-delete-line t "^Submodule [^ ]+ contains modified content$" "^Submodule \\([^ ]+\\) \\([^ :]+\\)\\( (rewind)\\)?:$" 2 3 "^ \\([<>]\\) \\(.+\\)$" replace-regexp-in-string "[^.]\\(\\.\\.\\)[^.]" "..." class-p magit-module-section magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading propertize "modified " font-lock-face magit-diff-file-heading " (" "rewind" "\\.\\.\\." string-match "non-ff" "new commits" ", " "modified" " and " "untracked" " content" ")" file-name-as-directory expand-file-name magit-toplevel magit-git-wash apply-partially inhibit-changing-match-data default-directory magit-section-cache-visibility magit-log-wash-log module "log" "--oneline" "--left-right" delete-char -1 run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children "^Submodule \\([^ ]+\\) \\([^ ]+\\) (\\([^)]+\\))$" "submodule " " content)"] 17]) (defalias 'magit-diff-wash-hunk #[0 "\306\307!\205\311\310\311!\312\313\314\310\315!!\"\310\316!G\317UB\320 \210\321\322!\203(\322\2020\322\236A\2060\323\324\321\322!\203?\325\322\"@\206@\322\326\327\330 \331 &\332\333\334\335\"\211\203Z\211\336=\202\214\n\205e\337\340!\n\"\211\203p\341\333\"\202\212\342 \"\211\205\210\343!\203\205\211!\262\211\336=\262\262\262#\210\211\n\206\236 ?\205\236\f\3442\304\211\345\346P\347\350#c\210\351 \210m\204\303\306\352!\204\303\353y\210\202\263\332\354`#\210\332\355\356#\210\332\357#\210\203\346\332\360\361 !#\210\202\356\332\362@#\210\332\363\364 !@#\210\332\365#\266\366\367!\210\370!\210\371\341\372\"\373\"\210\332\354\330 #\374\375\"\376\377\201A\341\201B\"\"!\376\377\201C\341\201B\"\"!\203?J\206V\201D!\203LJ\206V\201D!\205V\211J\212\341\372\"b\210`W\203\225\201E`\323\"\206n\201F`\323\"\204\216\201G`\323\n$\210\203\216\201G`\375$\210\211b\266\202^)\266\211\f=\203\252\353@\201H!)\202\303\332\341\201I\"\201J\341\211\201I\"\201J\"C\244#0\210+\266\373\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current looking-at "^@\\{2,\\} \\(.+?\\) @\\{2,\\}\\(?: \\(.*\\)\\)?" match-string 0 mapcar #[257 "\300\301\302\303\304O\305\"\"\207" [mapcar string-to-number split-string 1 nil ","] 7 "\n\n(fn STR)"] split-string 1 2 3 magit-delete-line class-p hunk magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize "\n" font-lock-face magit-diff-hunk-heading magit-insert-heading "^[^-+ \\]" nil end washer magit-diff-paint-hunk combined from-ranges butlast from-range to-range last about run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t eieio-oref-default keymap intern format magit-section-cache-visibility "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children] 17]) #@75 Keep new diff sections collapsed if washing takes too long. (fn SECTION) (defalias 'magit-diff-expansion-threshold #[257 "\302!\205\303\304\305 \"! V\205\306\207" [magit-refresh-start-time magit-diff-expansion-threshold magit-file-section-p float-time time-subtract current-time hide] 5 (#$ . 108498)]) (add-hook 'magit-section-set-visibility-hook 'magit-diff-expansion-threshold) (defvar magit-revision-mode-hook nil) (byte-code "\300\301N\204\f\302\300\301\303#\210\304\305!\204\302\305\306\307#\210\300\207" [magit-revision-mode-hook variable-documentation put "Hook run after entering Magit Rev mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp magit-revision-mode-map definition-name magit-revision-mode] 4) (defvar magit-revision-mode-map (make-sparse-keymap)) (byte-code "\301\302N\204\303\301\302\304\305!#\210\306\307!\204\303\307\310\311#\210\312\313 !\210\307\302N\204-\303\307\302\304\314!#\210\306\300!\204B\303\300\310\311#\210\315\316\300\317\"\210!\210\300\302N\204P\303\300\302\304\320!#\210\303\311\321\322#\210\303\311\323\324#\207" [magit-revision-mode-abbrev-table magit-revision-mode-map variable-documentation put purecopy "Keymap for `magit-revision-mode'." boundp magit-revision-mode-syntax-table definition-name magit-revision-mode (lambda (def-tmp-var) (defvar magit-revision-mode-syntax-table def-tmp-var)) make-syntax-table "Syntax table for `magit-revision-mode'." (lambda (def-tmp-var) (defvar magit-revision-mode-abbrev-table def-tmp-var)) define-abbrev-table nil "Abbrev table for `magit-revision-mode'." derived-mode-parent magit-diff-mode custom-mode-group magit-revision] 5) #@828 Mode for looking at a Git commit. This mode is documented in info node `(magit)Revision Buffer'. \Type \[magit-refresh] to refresh the current buffer. Type \[magit-section-toggle] to expand or hide the section at point. Type \[magit-visit-thing] to visit the hunk or file at point. Staging and applying changes is documented in info node `(magit)Staging and Unstaging' and info node `(magit)Applying'. \Type \[magit-apply] to apply the change at point, \[magit-stage] to stage, \[magit-unstage] to unstage, \[magit-discard] to discard, or \[magit-reverse] to reverse it. \{magit-revision-mode-map} In addition to any hooks its parent mode `magit-diff-mode' might have run, this mode runs the hook `magit-revision-mode-hook', as the final or penultimate step during initialization. (defalias 'magit-revision-mode #[0 "\306\300!\210\307\310 \210\311\312\310\313N\203\314\311\313\310\313N#\210\315 !\204'\316 \317 \"\210\320\f!\211\2035\211\321 =\203;\322\f\323 \"\210\210\324 \325\"\204R =\204R\326 \325C#\210\327 !\210\330\f!\210 \331 \210)\332\333!\207" [delay-mode-hooks major-mode mode-name magit-revision-mode-map magit-revision-mode-syntax-table magit-revision-mode-abbrev-table make-local-variable t magit-diff-mode magit-revision-mode "Magit Rev" mode-class put keymap-parent set-keymap-parent current-local-map char-table-parent standard-syntax-table set-char-table-parent syntax-table abbrev-table-get :parents abbrev-table-put use-local-map set-syntax-table hack-dir-local-variables-non-file-buffer run-mode-hooks magit-revision-mode-hook local-abbrev-table] 5 (#$ . 110225) nil]) (put 'magit-revision-mode 'magit-diff-default-arguments '("--stat" "--no-ext-diff")) #@23 (fn REV ARGS FILES) (defalias 'magit-revision-setup-buffer #[771 "\300\301\302\303D\304\305\306 \211#D\307D\310D\311\302D\257#\207" [magit-setup-buffer-internal magit-revision-mode nil magit-buffer-revision magit-buffer-range format "%s^..%s" magit-buffer-diff-args magit-buffer-diff-files magit-buffer-diff-files-suspended] 12 (#$ . 111968)]) (defalias 'magit-revision-refresh-buffer #[0 "\306!\307\310 !\311\nG\211\312\267\202\313\202$\314\n@P\202$\315\316\317\n\320#P\262R!\210\321\322!\2033\322\202;\322 \236A\206;\323\324\321\322!\203J\325\322 \"@\206K\322\326\313\327\330 \331\f&\332\333\334\335\"\211\203e\211\336=\202\230 \205p\337\340! \"\211\203{\341\333\"\202\226\342<\"\211\205\224\343!\203\221\211!\262\211\336=\262\262\262#\210\211 \206\254\f?\205\254==>\3442_\345\346!\210\347\350!\210\351!\210\352\341\353\"\354\"\210\332\355\330 #\356\357\"\360\361\362\341\363\"\"!\360\361\364\341\363\"\"!\203\357J\206\365!\203\372J\206\365!\205\211J\212\341\353\"b\210`W\2039\366`\323\"\206\367`\323\"\2042\370`\323\n$\210\2032\370`\357$\210\211b\266\202\n)\266\211==\203M\313?\371!)\202^\332\341\372\"\373\341\211\372\"\373\"C\244#0\210+\207" [magit-buffer-revision magit-buffer-revision-hash magit-buffer-diff-files magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-rev-parse magit-set-header-line-format magit-object-type " " #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (0 18 1 22)) nil " limited to file " " limited to files " mapconcat identity ", " class-p commitbuf magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-run-section-hook magit-revision-sections-hook run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-section-cache-visibility] 12]) (cl-generic-define-method 'magit-buffer-value nil '(&context (major-mode magit-revision-mode)) nil #[0 " B\207" [magit-buffer-revision magit-buffer-diff-files] 2]) #@57 Insert the diff into this `magit-revision-mode' buffer. (defalias 'magit-insert-revision-diff #[0 "\303\304\305\306\307\310\311\235\205 \312 \313P\314\n&\n\207" [magit-buffer-diff-args magit-buffer-revision magit-buffer-diff-files magit--insert-diff "show" "-p" "--cc" "--format=" "--no-prefix" "--stat" "--numstat" "^{commit}" "--"] 11 (#$ . 114523)]) #@242 Insert tag message and headers into a revision buffer. This function only inserts anything when `magit-show-commit' is called with a tag as argument, when that is called with a commit or a ref which is not a branch, then it inserts nothing. (defalias 'magit-insert-revision-tag #[0 "\306!\307\232\205\250\310\311!\203\311\202\311 \236A\206\312\313\310\311!\203)\314\311 \"@\206*\311\315\316\317\320 \321\n&\322\323\324\325\"\211\203D\211\326=\202v \205O\327\330! \"\211\203Z\331\323\"\202t\332\f\"\211\205r\333!\203o\211!\262\211\326=\262\262\262#\210\211 \206\210\n?\205\210 @\3342\243`\335\336\307#\210\211b\210\337y\210\211`|\266\340\341!\210\342\343\344\345!\344\346!#\347 \210\350\351\352#c\266\353 \210\354\355\316\356#\203\341\357\224\354\360!\210\211`|\266\361c\210\362A\316\356\316\363&\210\202\344db\210\361c\210\364\365!\210\366!\210\367\331\370\"\356\"\210\322\371\320 #\372\373\"\374\342\375\331\376\"\"!\374\342\377\331\376\"\"!\203J\2065\201C!\203+J\2065\201C!\2055\211J\212\331\370\"b\210`W\203t\201D`\312\"\206M\201E`\312\"\204m\201F`\312\n$\210\203m\201F`\373$\210\211b\266\202=)\266\211 =\203\211\316B\201G!)\202\242\322\331\201H\"\201I\331\211\201H\"\201I\"C\244#0\210+\211\262\207" [magit-buffer-revision magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-object-type "tag" class-p taginfo magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-git-insert "cat-file" 3 looking-at "^tagger \\([^<]+\\) <\\([^>]+\\)" format "Tagger: %s <%s>" match-string 1 2 magit-delete-line propertize font-lock-face magit-section-secondary-heading magit-insert-heading re-search-forward "-----BEGIN PGP SIGNATURE-----" t 0 "-----END PGP SIGNATURE-----" 10 magit-process-file "verify-tag" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" magit-insert-section--current magit-git-executable magit-section-cache-visibility boundp next-single-property-change get-text-property put-text-property magit-section-show parent children] 12 (#$ . 114886)]) #@39 Keymap for `commit-message' sections. (defvar magit-commit-message-section-map (byte-code "\300 \301\302\303#\210\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-show-commit] 5) (#$ . 117384)) #@51 Insert the commit message into a revision buffer. (defalias 'magit-insert-revision-message #[0 "\306\307!\203\n\307\202\307\236A\206\310\311\306\307!\203!\312\307\"@\206\"\307\313\314\315\316 \317 &\320\321\322\323\"\211\203<\211\324=\202n\n\205G\325\326!\n\"\211\203R\327\321\"\202l\330 \"\211\205j\331!\203g\211!\262\211\324=\262\262\262#\210\211\n\206\200 ?\205\200\f\3322\211\320\333\334#\210`@\335\336\337\"r\211q\210\340\341\"\216\342\343\"\210\344 *\262c\210`\345\\U\203\275\346\345!\210\347c\266\2021b\210\212\350\351\314\337#\203\323\352\224\352\224T|\210\202\301)A\203\347A\353 ^B\354`\355 \"\210)C\203\342\212m\204\341\356\357\314\360#\210`\356\361\314\337#\210`V\203\335\362`\"C\363\267\202i\211G\364Y\203\334\365\314\337D\366#)\266\203\203\334\367\314\337D\366#)\266\203\202j\211G\364Y\203\334\365\314\337D\366#)\266\203\203\334\370!\202j\211G\364Y\203\334\370!\202j\370!\202j\314\203\334\371`\372\373$\210`b\210\306\374!\203\202\374\202\212\374\236A\206\212\310\311\306\374!\203\231\312\374\"@\206\232\374\313\315\316 \317 &\320\321\322\323\"\211\203\264\211\324=\202\346\n\205\277\325\326!\n\"\211\203\312\327\321\"\202\344\330 \"\211\205\342\331!\203\337\211!\262\211\324=\262\262\262#\210\211\n\206\370 ?\205\370\f\3322\330b\210\375\376!\210\377!\210\201G\327\201H\"\337\"\210\320\201I\316 #\201J\201K\"\201L\201M\201N\327\201O\"\"!\201L\201M\201P\327\201O\"\"!\203SJ\206j\201Q!\203`J\206j\201Q!\205j\211J\212\327\201H\"b\210`W\203\251\201R`\310\"\206\204\201S`\310\"\204\242\371`\310\n$\210\203\242\371`\201K$\210\211b\266\202t)\266\211\f=\203\276\314E\201T!)\202\327\320\327\201U\"\201V\327\211\201U\"\201V\"C\244#0\210+\266\210\210\202\355)\212\314y\210\201W`\201X#\210\201Y \210)F\203-\212\356\201Z\314\337#\203,\352\224\352\225\371\372\201S\372\"\211\203!\211\201[D\202$\201[\262$\266\202\374)db\266\375\376!\210\377!\210\201G\327\201H\"\337\"\210\320\201I\316 #\201J\201K\"\201L\201M\201N\327\201O\"\"!\201L\201M\201P\327\201O\"\"!\203\202J\206\231\201Q!\203\217J\206\231\201Q!\205\231\211J\212\327\201H\"b\210`W\203\330\201R`\310\"\206\263\201S`\310\"\204\321\371`\310\n$\210\203\321\371`\201K$\210\211b\266\202\243)\266\211\f=\203\355\314E\201T!)\202\320\327\201U\"\201V\327\211\201U\"\201V\"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current class-p commit-message magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section heading-highlight-face magit-diff-revision-summary-highlight generate-new-buffer " *temp*" t make-closure #[0 "\301\300!\205 \302\300!\207" [V0 buffer-name kill-buffer] 2] magit-rev-insert-format "%B" magit-revision--wash-message 2 backward-delete-char "(no message)\n" search-forward " \n" 0 window-width fill-region line-end-position re-search-forward "\\_<" move "\\_>" buffer-substring-no-properties #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (quickest 271 quicker 312 quick 342 slow 355)) 7 "[0-9]" string-match "[a-z]" magit-commit-p put-text-property font-lock-face magit-hash commit run-hooks magit-insert-section-hook magit-insert-child-count magit-buffer-revision magit-revision-fill-summary-line fill-column magit-revision-use-hash-sections inhibit-changing-match-data magit-section-cache-visibility magit-diff-highlight-keywords set-marker-insertion-type start end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property magit-section-show parent children magit--add-face-text-property magit-diff-revision-summary magit-insert-heading "\\[[^[]*\\]" magit-keyword] 19 (#$ . 117604)]) #@45 Insert commit notes into a revision buffer. (defalias 'magit-insert-revision-notes #[0 "\306\307!\206\310\311 \211\205\340\211@\312\313!\203\313\202!\313\236A\206!\314\315\312\313!\2030\316\313\"@\2061\313\317\320\321 \322 &\323\324\325\326\"\211\203K\211\327=\202\206\n\205V\330\331!\n\"\211\203a\332\324\"\202\204\333 \"\211\203|\334!\203v\211!\262\211\327=\202\202\n\232?\262\262\262#\210\211\n\206\230 ?\205\230\f\3352\326\211\323\336\337#\210`@\340\341\342\"r\211q\210\343\344\"\216\345\346\347P\350\351%\210\352 *\262c\210`U\203\326\353 \266\202\nb\210\354\210\355\356\357\360\361 \"\203\357\362\354O\202\361\363\364#\"c\210\354u\210\365`\366#\210\367 \210db\210\370c\266\371\372!\210\373!\210\374\332\375\"\342\"\210\323\376\321 #\377\201B\"\201C\355\201D\332\201E\"\"!\201C\355\201F\332\201E\"\"!\203OJ\206f\201G!\203\\J\206f\201G!\205f\211J\212\332\375\"b\210`W\203\247\201H`\314\"\206~\201I`\314\"\204\240\201J`\314\n$\210\203\240\201J`\201B$\210\211b\266\202n)\266\211\f=\203\274\354A\201K!)\202\325\323\332\201L\"\201M\332\211\201L\"\201M\"C\244#0\210+\210A\266\202\202 \207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-get "core.notesRef" "refs/notes/commits" magit-list-active-notes-refs class-p notes magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section heading-highlight-face magit-diff-hunk-heading-highlight generate-new-buffer " *temp*" t make-closure #[0 "\301\300!\205 \302\300!\207" [V0 buffer-name kill-buffer] 2] magit-git-insert "-c" "core.notesRef=" "notes" "show" magit-revision--wash-message magit-cancel-section nil format " (%s)" propertize string-prefix-p "refs/notes/" 11 font-lock-face magit-refname magit--add-face-text-property magit-diff-hunk-heading magit-insert-heading 10 run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start end eieio-oref-default magit-buffer-revision magit-section-cache-visibility keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children] 15 (#$ . 121812)]) (defalias 'magit-revision--wash-message #[0 "\302\303 \210\304 \210) \305>\204 \210\306 \210\307 \207" [major-mode git-commit-major-mode git-commit-mode hack-dir-local-variables hack-local-variables-apply (nil text-mode) font-lock-ensure buffer-string] 2]) #@57 Insert headers about the commit into a revision buffer. (defalias 'magit-insert-revision-headers #[0 "\306\307!\203\n\307\202\307\236A\206\310\311\306\307!\203!\312\307\"@\206\"\307\313\314\315\316 \317 &\320\321\322\323\"\211\203<\211\324=\202n\n\205G\325\326!\n\"\211\203R\327\321\"\202l\330 \"\211\205j\331!\203g\211!\262\211\324=\262\262\262#\210\211\n\206\200 ?\205\200\f\3322\"\333\334@\335#\211\203\230\336!\337\261\210\210\340\341@\342P!\343\344#c\210\345 \210`\346A@\"\210\347@\"\266B\203d\350@!\211\2038\211@\306\351!\203\320\351\202\330\351\236A\206\330\310\311\306\351!\203\347\312\351\"@\206\350\351\313\315\316 \317 &\320\321\322\323\"\211\203\211\324=\2024\n\205 \325\326!\n\"\211\203\327\321\"\2022\330 \"\211\2050\331!\203-\211!\262\211\324=\262\262\262#\210\211\n\206F ?\205F\f\3322.\333\352\"\353\354\"\210\211\355\356\"\355\357\"\360c\210\340\343\344#c\210\361\362\261\266\363\364!\210\365!\210\366\327\367\"\370\"\210\320\371\316 #\372\373\"\374\375\376\327\377\"\"!\374\375\201D\327\377\"\"!\203\251J\206\300\201E!\203\266J\206\300\201E!\205\300\211J\212\327\367\"b\210`W\203\377\201F`\310\"\206\330\201G`\310\"\204\370\201H`\310\n$\210\203\370\201H`\373$\210\211b\266\202\310)\266\211\f=\203\314C\201I!)\202-\320\327\201J\"\201K\327\211\201J\"\201K\"C\244#0\210+\210A\266\202\202\300\210\201L@\201M\201NB\201O=$\210\201L@\201P\201QB\201R>$\210\201S@\370\"\211\203\336\211@A@\306\201T!\203}\201T\202\207\201T\236A\206\207\310\311\306\201T!\203\232\312\201T\"@\206\235\201T\313\315\316 \317 &\320\321\322\323\"\211\203\267\211\324=\202\351\n\205\302\325\326!\n\"\211\203\315\327\321\"\202\347\330 \"\211\205\345\331!\203\342\211!\262\211\324=\262\262\262#\210\211\n\206\373 ?\205\373\f\3322\332\375\201U\340\343\201V#\340\201W!\343\201X##c\210\363\364!\210\365!\210\366\327\367\"\370\"\210\320\371\316 #\372\373\"\374\375\376\327\377\"\"!\374\375\201D\327\377\"\"!\203UJ\206l\201E!\203bJ\206l\201E!\205l\211J\212\327\367\"b\210`W\203\253\201F`\310\"\206\204\201G`\310\"\204\244\201H`\310\n$\210\203\244\201H`\373$\210\211b\266\202t)\266\211\f=\203\300\314C\201I!)\202\331\320\327\201J\"\201K\327\211\201J\"\201K\"C\244#0\210+\266\210\201Y@\370\"\211\203^\211@A@\306\201T!\203\375\201T\202\201T\236A\206\310\311\306\201T!\203\312\201T\"@\206\201T\313\315\316 \317 &\320\321\322\323\"\211\2037\211\324=\202i\n\205B\325\326!\n\"\211\203M\327\321\"\202g\330 \"\211\205e\331!\203b\211!\262\211\324=\262\262\262#\210\211\n\206{ ?\205{\f\3322Z\375\201Z\340\343\201V#\340\201W!\343\201V##c\210\363\364!\210\365!\210\366\327\367\"\370\"\210\320\371\316 #\372\373\"\374\375\376\327\377\"\"!\374\375\201D\327\377\"\"!\203\325J\206\354\201E!\203\342J\206\354\201E!\205\354\211J\212\327\367\"b\210`W\203+\201F`\310\"\206\201G`\310\"\204$\201H`\310\n$\210\203$\201H`\373$\210\211b\266\202\364)\266\211\f=\203@\314C\201I!)\202Y\320\327\201J\"\201K\327\211\201J\"\201K\"C\244#0\210+\266\210\201[c\210\363\364!\210\365!\210\366\327\367\"\370\"\210\320\371\316 #\372\373\"\374\375\376\327\377\"\"!\374\375\201D\327\377\"\"!\203\235J\206\264\201E!\203\252J\206\264\201E!\205\264\211J\212\327\367\"b\210`W\203\363\201F`\310\"\206\314\201G`\310\"\204\354\201H`\310\n$\210\203\354\201H`\373$\210\211b\266\202\274)\266\211\f=\203\314C\201I!)\202!\320\327\201J\"\201K\327\211\201J\"\201K\"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current class-p headers magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-rev-format "%D" "--decorate=full" magit-format-ref-labels 32 propertize magit-rev-parse "^{commit}" font-lock-face magit-hash magit-insert-heading magit-rev-insert-format magit-insert-revision-gravatars magit-commit-parents commit "%h %s" string-match "^\\([^ ]+\\) \\(.*\\)" match-string 1 2 "Parent: " " " "\n" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type magit-buffer-revision magit-revision-headers-format magit-revision-insert-related-refs magit-section-cache-visibility "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit--insert-related-refs "--merged" "Merged" all "--contains" "Contained" (all mixed) magit-get-current-tag tag "Follows: %s (%s)\n" magit-tag number-to-string magit-branch-local magit-get-next-tag "Precedes: %s (%s)\n" 10] 16 (#$ . 124617)]) #@29 (fn REV ARG TITLE REMOTE) (defalias 'magit--insert-related-refs #[1028 "\306\205\307#\211\205\207\310\311\312GZ\313\"\261\210\211\211\203\204\211@iTG\\\314 X\2032\313c\210\202:\312\311\315\313\"\261\210\316\317!\203D\317\202L\317\236A\206L\320\321\316\317!\203[\322\317\"@\206\\\317\323\324\325 \326 &\327\330\331\332\"\211\203v\211\333=\202\250\n\205\201\334\335!\n\"\211\203\214\336\330\"\202\246\337 \"\211\205\244\340!\203\241\211!\262\211\333=\262\262\262#\210\211\n\206\272 ?\205\272\f\3412z\342\343\344\345\"\203\320\346\202\321\347#c\210\350\351!\210\352!\210\353\336\354\"\355\"\210\327\356\325 #\357\360\"\361\362\363\336\364\"\"!\361\362\365\336\364\"\"!\203 J\206\366!\203J\206\366!\205\211J\212\336\354\"b\210`W\203U\367`\320\"\2064\370`\320\"\204N\371`\320\n$\210\203N\371`\360$\210\211b\266\202&)\266\211\f=\203h\372>\373!)\202y\327\336\374\"\375\336\211\374\"\375\"C\244#0\210+\210A\266\202\202\210\312c\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-list-related-branches "-a" ":" make-string 10 32 window-width 12 class-p branch magit-section :type rassq :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section propertize font-lock-face string-prefix-p "remotes/" magit-branch-remote magit-branch-local run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property nil magit-section-show parent children magit-section-cache-visibility] 19 (#$ . 129810)]) #@16 (fn REV BEG) (defalias 'magit-insert-revision-gravatars #[514 "\205Y\301 \205Y\302\303!\210\304\267\202\305\202 \306\202 \307\202 \211\242\243\205/\310\311\"\211\203=\312 $\210\210\211\205G\310\313\"\211\205S\312 $\262\266\204\262\207" [magit-revision-show-gravatars window-system require gravatar #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (t 19 author 23 committer 27)) ("^Author: " . "^Commit: ") ("^Author: ") (nil . "^Commit: ") magit-rev-format "%aE" magit-insert-revision-gravatar "%cE"] 13 (#$ . 131804)]) #@29 (fn BEG REV EMAIL REGEXP) (defalias 'magit-insert-revision-gravatar #[1028 "\212b\210\301\302\303#\205Q\304 \211\205O\305\306!G\307\310`\"!\311\312H\313H\\_\314\315\316H\317#!\\T\311Z\3201J\321\322\n\323  F#0\202L\210\302)\266\204\262)\207" [gravatar-size re-search-forward nil t get-buffer-window match-string 0 query-font font-at 2 4 5 ceiling / 7 1.0 (error) gravatar-retrieve magit-insert-revision-gravatar-cb point-marker] 16 (#$ . 132419)]) #@41 (fn IMAGE REV MARKER ALIGN-TO COLUMN) (defalias 'magit-insert-revision-gravatar-cb #[1285 "\303=?\205o\304!\211\205mr\211q\210\212b\210\232\205l\305`\306\"\242\242\307=?\205l\310\311\"\312B\310\313\"\314B\315\316EC \203F\262\262\317\320\321\306#c\210\320\321\306#c\210\322y\210u\210\320\321\306#c\210\320\321\306#c)\266\203*\262\207" [magit-buffer-revision magit-revision-use-gravatar-kludge inhibit-read-only error marker-buffer get-text-property display image append (:ascent center :relief 1) ((slice 0.0 0.0 1.0 0.5)) (:ascent center :relief 1) ((slice 0.0 0.5 1.0 1.0)) space :align-to t propertize " " nil] 13 (#$ . 132894)]) (defvar magit-merge-preview-mode-hook nil) (byte-code "\300\301N\204\f\302\300\301\303#\210\304\305!\204\302\305\306\307#\210\300\207" [magit-merge-preview-mode-hook variable-documentation put "Hook run after entering Magit Merge mode.\nNo problems result if this variable is not bound.\n`add-hook' automatically binds it. (This is true for all hook variables.)" boundp magit-merge-preview-mode-map definition-name magit-merge-preview-mode] 4) (defvar magit-merge-preview-mode-map (make-sparse-keymap)) (byte-code "\301\302N\204\303\301\302\304\305!#\210\306\307!\204\303\307\310\311#\210\312\313 !\210\307\302N\204-\303\307\302\304\314!#\210\306\300!\204B\303\300\310\311#\210\315\316\300\317\"\210!\210\300\302N\204P\303\300\302\304\320!#\210\303\311\321\322#\210\303\311\323\324#\207" [magit-merge-preview-mode-abbrev-table magit-merge-preview-mode-map variable-documentation put purecopy "Keymap for `magit-merge-preview-mode'." boundp magit-merge-preview-mode-syntax-table definition-name magit-merge-preview-mode (lambda (def-tmp-var) (defvar magit-merge-preview-mode-syntax-table def-tmp-var)) make-syntax-table "Syntax table for `magit-merge-preview-mode'." (lambda (def-tmp-var) (defvar magit-merge-preview-mode-abbrev-table def-tmp-var)) define-abbrev-table nil "Abbrev table for `magit-merge-preview-mode'." derived-mode-parent magit-diff-mode custom-mode-group magit-diff] 5) #@252 Mode for previewing a merge. In addition to any hooks its parent mode `magit-diff-mode' might have run, this mode runs the hook `magit-merge-preview-mode-hook', as the final or penultimate step during initialization. \{magit-merge-preview-mode-map} (defalias 'magit-merge-preview-mode #[0 "\306\300!\210\307\310 \210\311\312\310\313N\203\314\311\313\310\313N#\210\315 !\204'\316 \317 \"\210\320\f!\211\2035\211\321 =\203;\322\f\323 \"\210\210\324 \325\"\204R =\204R\326 \325C#\210\327 !\210\330\f!\210 \331 \210)\332\333!\207" [delay-mode-hooks major-mode mode-name magit-merge-preview-mode-map magit-merge-preview-mode-syntax-table magit-merge-preview-mode-abbrev-table make-local-variable t magit-diff-mode magit-merge-preview-mode "Magit Merge" mode-class put keymap-parent set-keymap-parent current-local-map char-table-parent standard-syntax-table set-char-table-parent syntax-table abbrev-table-get :parents abbrev-table-put use-local-map set-syntax-table hack-dir-local-variables-non-file-buffer run-mode-hooks magit-merge-preview-mode-hook local-abbrev-table] 5 (#$ . 134962) nil]) (put 'magit-merge-preview-mode 'magit-diff-default-arguments '("--no-ext-diff")) #@12 (fn REV) (defalias 'magit-merge-preview-setup-buffer #[257 "\300\301\302\303D\304\305\306\211#DD#\207" [magit-setup-buffer-internal magit-merge-preview-mode nil magit-buffer-revision magit-buffer-range format "%s^..%s"] 10 (#$ . 136157)]) (defalias 'magit-merge-preview-refresh-buffer #[0 "\306 \211\206 \307\310!\311\312\313\206\310#!\210\314\315!\203\315\202'\315 \236A\206'\316\317\314\315!\2036\320\315 \"@\2067\315\321\322\323\324 \325\n&\326\327\330\331\"\211\203Q\211\332=\202\203 \205\\\333\334! \"\211\203g\335\327\"\202\201\336\f\"\211\205\337!\203|\211!\262\211\332=\262\262\262#\210\211 \206\225\n?\205\225 9\3402N\341\342\343\344#$\210\345\346!\210\347!\210\350\335\351\"\352\"\210\326\353\324 #\354\355\"\356\312\357\335\360\"\"!\356\312\361\335\360\"\"!\203\337J\206\362\362!\203\352J\206\362\362!\205\362\211J\212\335\351\"b\210`W\203)\363`\316\"\206\364`\316\"\204\"\365`\316\n$\210\203\"\365`\355$\210\211b\266\202\372)\266\211 =\203<\322:\366!)\202M\326\335\367\"\370\335\211\367\"\370\"C\244#0\210+\207" [magit-buffer-revision magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-get-current-branch magit-rev-verify "HEAD" magit-set-header-line-format format "Preview merge of %s into %s" class-p diffbuf magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit--insert-diff "merge-tree" magit-git-string "merge-base" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-insert-section--current magit-section-cache-visibility] 14]) (cl-generic-define-method 'magit-buffer-value nil '(&context (major-mode magit-merge-preview-mode)) nil #[0 "\207" [magit-buffer-revision] 1]) #@133 When SECTION is a `hunk', ensure that its beginning is visible. It the SECTION has a different type, then do nothing. (fn SECTION) (defalias 'magit-hunk-set-window-start #[257 "\300!\205 \301!\207" [magit-hunk-section-p magit-section-set-window-start] 3 (#$ . 138396)]) (add-hook 'magit-section-movement-hook 'magit-hunk-set-window-start) #@20 (fn SECTION ARG) (defalias 'magit-hunk-goto-successor #[514 "\300!\205\205\301\302\303\304\"!!\211\205\203\303\305\"\306\307\"\211G8\204:\211\206*\310!@\211\2053\311!\210\312\262\266\203\202\203\211\203B\311!\210;\203[\313\303\314\"\312#\203[\315\224b\266\203\202\203\303\310!@\314\"b\210\316y\210\317\320!\203s\316y\210\202g\317\321!\203\316y\210\202s\322y\266\203\262\207" [magit-hunk-section-p magit-get-section magit-section-ident eieio-oref parent children magit-section-siblings prev last magit-section-goto t re-search-forward end 0 -1 looking-at "^ " "^[-+]" nil] 11 (#$ . 138745)]) (add-hook 'magit-section-goto-successor-hook 'magit-hunk-goto-successor) #@36 Keymap for the `unstaged' section. (defvar magit-unstaged-section-map (byte-code "\300 \301\302\303#\210\301\304\305#\210\301\306\307#\210\301\310\311#\210\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-diff-unstaged [remap magit-delete-thing] magit-discard "s" magit-stage "u" magit-unstage] 5) (#$ . 139448)) #@103 Jump to the section "Unstaged changes". With a prefix argument also expand it. (fn &optional EXPAND) (defalias 'magit-jump-to-unstaged #[256 "\303\304C\305!B!\211\2030\306\307\"b\210\2053\3101%\311\312!)0\210\202,\210\313\314\315!\210\316\317!\207\320\321!\207" [magit-root-section inhibit-quit quit-flag magit-get-section unstaged magit-section-ident eieio-oref start (quit) nil magit-section-show t eval (ignore nil) recenter 0 message "Section \"Unstaged changes\" wasn't found"] 5 (#$ . 139791) "P"]) #@42 Insert section showing unstaged changes. (defalias 'magit-insert-unstaged-changes #[0 "\306\307!\203\n\307\202\307\236A\206\310\311\306\307!\203!\312\307\"@\206\"\307\313\314\315\316 \317 &\320\321\322\323\"\211\203<\211\324=\202n\n\205G\325\326!\n\"\211\203R\327\321\"\202l\330 \"\211\205j\331!\203g\211!\262\211\324=\262\262\262#\210\211\n\206\200 ?\205\200\f\3322;\333\334!\210\335\3366\337\3407%\210\341\342!\210\343!\210\344\327\345\"\346\"\210\320\347\316 #\350\351\"\352\353\354\327\355\"\"!\352\353\356\327\355\"\"!\203\314J\206\337\357!\203\327J\206\337\357!\205\337\211J\212\327\345\"b\210`W\203\360`\310\"\206\365\361`\310\"\204\362`\310\n$\210\203\362`\351$\210\211b\266\202\347)\266\211\f=\203)\3148\363!)\202:\320\327\364\"\365\327\211\364\"\365\"C\244#0\210+\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current class-p unstaged magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading "Unstaged changes:" magit--insert-diff "diff" "--no-prefix" "--" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-buffer-diff-args magit-buffer-diff-files magit-section-cache-visibility] 12 (#$ . 140313)]) #@34 Keymap for the `staged' section. (defvar magit-staged-section-map (byte-code "\300 \301\302\303#\210\301\304\305#\210\301\306\307#\210\301\310\311#\210\301\312\313#\210\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-diff-staged [remap magit-delete-thing] magit-discard [remap magit-revert-no-commit] magit-reverse "s" magit-stage "u" magit-unstage] 5) (#$ . 142110)) #@101 Jump to the section "Staged changes". With a prefix argument also expand it. (fn &optional EXPAND) (defalias 'magit-jump-to-staged #[256 "\303\304C\305!B!\211\2030\306\307\"b\210\2053\3101%\311\312!)0\210\202,\210\313\314\315!\210\316\317!\207\320\321!\207" [magit-root-section inhibit-quit quit-flag magit-get-section staged magit-section-ident eieio-oref start (quit) nil magit-section-show t eval (ignore nil) recenter 0 message "Section \"Staged changes\" wasn't found"] 5 (#$ . 142510) "P"]) #@40 Insert section showing staged changes. (defalias 'magit-insert-staged-changes #[0 "\306 ?\205H\307\310!\203\310\202\310\236A\206\311\312\307\310!\203'\313\310\"@\206(\310\314\315\316\317 \320 &\321\322\323\324\"\211\203B\211\325=\202t\n\205M\326\327!\n\"\211\203X\330\322\"\202r\331 \"\211\205p\332!\203m\211!\262\211\325=\262\262\262#\210\211\n\206\206 ?\205\206\f\3332C\334\335!\210\336\337\3408\341\3429&\210\343\344!\210\345!\210\346\330\347\"\350\"\210\321\351\317 #\352\353\"\354\355\356\330\357\"\"!\354\355\360\330\357\"\"!\203\324J\206\347\361!\203\337J\206\347\361!\205\347\211J\212\330\347\"b\210`W\203\362`\311\"\206\375\363`\311\"\204\364`\311\n$\210\203\364`\353$\210\211b\266\202\357)\266\211\f=\2031\315:\365!)\202B\321\330\366\"\367\330\211\366\"\367\"C\244#0\210+\211\262\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-bare-repo-p class-p staged magit-section :type rassq :value nil :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading "Staged changes:" magit--insert-diff "diff" "--cached" "--no-prefix" "--" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern format "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property magit-section-show parent children magit-buffer-diff-args magit-buffer-diff-files magit-section-cache-visibility] 12 (#$ . 143024)]) #@1076 Return the diff type of SECTION. The returned type is one of the symbols `staged', `unstaged', `committed', or `undefined'. This type serves a similar purpose as the general type common to all sections (which is stored in the `type' slot of the corresponding `magit-section' struct) but takes additional information into account. When the SECTION isn't related to diffs and the buffer containing it also isn't a diff-only buffer, then return nil. Currently the type can also be one of `tracked' and `untracked' but these values are not handled explicitly everywhere they should be and a possible fix could be to just return nil here. The section has to be a `diff' or `hunk' section, or a section whose children are of type `diff'. If optional SECTION is nil, return the diff type for the current section. In buffers whose major mode is `magit-diff-mode' SECTION is ignored and the type is determined using other means. In `magit-revision-mode' buffers the type is always `committed'. Do not confuse this with `magit-diff-scope' (which see). (fn &optional SECTION) (defalias 'magit-diff-type #[256 "\211\206\302 \211\205\255\303\304\305\"\203\306\207\303\307!\203V \211\310\232\203%\266\311\207\2030\312\313\"\203>\211\314\232\203:\266\315\207\266\316\207\211\314\232\203R\317!\203N\266\315\207\266\311\207\266\306\207\303\320!\203\215\321\322\"\211\323>\203g\207\211\324\267\202\213\321\325\"\321\322\"\211\326>\203\327!\207\207\321\211\211\325\"\325\"\322\"\207\330\207\303\331!\203\254\332\333\"\203\241\321\334\"\204\250\332\335\"\203\252\306\207\311\207\311\207" [magit-buffer-range magit-buffer-typearg magit-current-section derived-mode-p magit-revision-mode magit-stash-mode committed magit-diff-mode "--no-index" undefined magit-rev-eq "HEAD" "--cached" staged unstaged magit-rev-head-p magit-status-mode eieio-oref type (staged unstaged tracked untracked) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (module 109 file 109 hunk 128)) parent (file module) magit-diff-type nil magit-log-mode magit-section-match commit children [* file commit]] 8 (#$ . 144868)]) #@1060 Return the diff scope of SECTION or the selected section(s). A diff's "scope" describes what part of a diff is selected, it is a symbol, one of `region', `hunk', `hunks', `file', `files', or `list'. Do not confuse this with the diff "type", as returned by `magit-diff-type'. If optional SECTION is non-nil, then return the scope of that, ignoring the sections selected by the region. Otherwise return the scope of the current section, or if the region is active and selects a valid group of diff related sections, the type of these sections, i.e. `hunks' or `files'. If SECTION, or if that is nil the current section, is a `hunk' section; and the region region starts and ends inside the body of a that section, then the type is `region'. If the region is empty after a mouse click, then `hunk' is returned instead of `region'. If optional STRICT is non-nil, then return nil if the diff type of the section at point is `untracked' or the section at point is not actually a `diff' but a `diffstat' section. (fn &optional (SECTION nil SSECTION) STRICT) (defalias 'magit-diff-scope #[128 "\211\205\300\211A\262\242\211A\262\242\203 \301\302\303\304G\\D\"\210?\205)\305\306\300\"\2064\211@\2064\307 \262\205\214\203[\310!\311=?\205\214\312\313\"\211\205S\312\314\"\262\315=?\205\214\312\314\"\205d\300\316 F\211:\205\212\211\242\211\317\267\202\207\243\211:\205E\211\242\211\204\315\243\211:\205\310\211\242\211\300=\203\263\243\211:\205\256\211\243\211?\205\254\320 !\203\253\321\202\254\322\262\262\202\306\243\211:\205\304\211\243\211?\205\302\322\262\262\262\262\202C\211\300=\203'\243\211:\205\"\211\242\211\300=\203 \243\211:\205\211\242\211\204\374\243\211?\205\367\323\262\202\243\211?\205\322\262\262\262\202 \243\211:\205\211\243\211?\205\322\262\262\262\262\202C\243\211:\205A\211\243\211:\205?\211\243\211?\205=\322\262\262\262\262\262\202\210\243\211:\205\313\211\242\211\300=\203\255\243\211:\205\250\211\242\211\300=\203\223\243\211:\205\216\211\242\211\204\202\243\211?\205}\324\262\202\214\243\211?\205\212\325\262\262\262\202\246\243\211:\205\244\211\243\211?\205\242\325\262\262\262\262\202\311\243\211:\205\307\211\243\211:\205\305\211\243\211?\205\303\325\262\262\262\262\262\202\210\243\211:\205Q\211\242\211\300=\2033\243\211:\205.\211\242\211\300=\203\243\211:\205\211\242\211\204\243\211?\205\324\262\202\243\211?\205\325\262\262\262\202,\243\211:\205*\211\243\211?\205(\325\262\262\262\262\202O\243\211:\205M\211\243\211:\205K\211\243\211?\205I\325\262\262\262\262\262\202\210\243\211:\205\202\211\242\211?\205\200\243\211:\205~\211\243\211:\205|\211\243\211?\205z\326\262\262\262\262\262\202\210\306\262\262\207" [t signal wrong-number-of-arguments magit-diff-scope 2 magit-region-sections nil magit-current-section magit-diff-type untracked eieio-oref parent type diffstat magit-diff-use-hunk-region-p #s(hash-table size 6 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (hunk 118 file 330 module 464 untracked 598 unstaged 598 staged 598)) magit-section-internal-region-p region hunk hunks files file list] 15 (#$ . 147035)]) (defalias 'magit-diff-use-hunk-region-p #[0 "\302 \205\303=\204 \303=\204\304 !\205\305 \306 =?\207" [this-command last-command region-active-p mouse-drag-region byte-code-function-p region-end region-beginning] 2]) (byte-code "\300\301\302\"\210\300\303\304\"\207" [add-hook magit-section-unhighlight-hook magit-diff-unhighlight magit-section-highlight-hook magit-diff-highlight] 3) #@78 Remove the highlighting of the diff-related SECTION. (fn SECTION SELECTION) (defalias 'magit-diff-unhighlight #[514 "\300!\205 \301\302#\210\303\207" [magit-hunk-section-p magit-diff-paint-hunk nil t] 6 (#$ . 150701)]) #@274 Highlight the diff-related SECTION. If SECTION is not a diff-related section, then do nothing and return nil. If SELECTION is non-nil, then it is a list of sections selected by the region, including SECTION. All of these sections are highlighted. (fn SECTION SELECTION) (defalias 'magit-diff-highlight #[514 "\300\301\"\203/\302\303\"\203/\211\203)\211\211\203%\211@\304\"\210A\266\202\202\210\202-\304!\210\305\207\306\305\"\211\205f\211\307=\203F\310\305#\210\202e\203a\211\203]\211@\311\"\210A\266\202\202K\210\202e\311!\210\305\207" [magit-section-match commit eieio-oref children magit-diff-highlight-list t magit-diff-scope region magit-diff-paint-hunk magit-diff-highlight-recursive] 8 (#$ . 150932)]) #@36 (fn SECTION &optional SELECTION) (defalias 'magit-diff-highlight-recursive #[513 "\300!\211\301\267\202\302\"\207\303\"\207\304\"\210\305\306#\207\307\310\"\207" [magit-diff-scope #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (list 9 file 14 hunk 19)) magit-diff-highlight-list magit-diff-highlight-file magit-diff-highlight-heading magit-diff-paint-hunk t magit-section-highlight nil] 7 (#$ . 151679)]) #@36 (fn SECTION &optional SELECTION) (defalias 'magit-diff-highlight-list #[513 "\302\303\"\302\304\"\302\305\"\306=\204\204\\\307 \203\"\310 X\204(\311\312#\210\302\313\"\204\\\302\314\"\211\203[\211@\306=\204N\307 \203N\310 \302\303\"X\204T\315\"\210A\266\202\2023\210 \205f\311S\312#\207" [this-command magit-diff-highlight-hunk-body eieio-oref start content end mouse-drag-region region-active-p region-beginning magit-section-make-overlay magit-section-highlight hidden children magit-diff-highlight-recursive] 11 (#$ . 152142)]) #@36 (fn SECTION &optional SELECTION) (defalias 'magit-diff-highlight-file #[513 "\300\"\210\301\302\"?\205%\301\303\"\211\205#\211@\304\"\210A\266\202\202\262\207" [magit-diff-highlight-heading eieio-oref hidden children magit-diff-highlight-recursive] 7 (#$ . 152711)]) #@36 (fn SECTION &optional SELECTION) (defalias 'magit-diff-highlight-heading #[513 "\301\302\303\"\302\304\"\206\302\305\"\302\306\"\235\205\307=?D\211:\205\305\211\242\211\310\267\202\302\243\211:\205Y\211\242\211\311=\203H\243\211?\205C\312\262\202W\211?\205W\243\211?\205U\313\262\262\262\202\303\243\211:\205\213\211\242\211\311=\203z\243\211?\205u\312\262\202\211\211?\205\211\243\211?\205\207\313\262\262\262\202\303\243\211:\205\275\211\242\211\311=\203\254\243\211?\205\247\314\262\202\273\211?\205\273\243\211?\205\271\315\262\262\262\202\303\316\262\262#\207" [this-command magit-section-make-overlay eieio-oref start content end type mouse-drag-region #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (file 44 module 94 hunk 144)) t magit-diff-file-heading-selection magit-diff-file-heading-highlight magit-diff-hunk-heading-selection magit-diff-hunk-heading-highlight nil] 11 (#$ . 152998)]) #@93 (fn SECTION &optional SELECTION (HIGHLIGHT (magit-section-selected-p section selection))) (defalias 'magit-diff-paint-hunk #[641 "\211\203 \211A\262\242\202\304\"\203\305\306\307\310G\\D\"\210\311\204'\311\262\203P\312\313\"\204n\314\315\"\210 >\203F\316 \"\202n\203n\317\262\202n\312\313\"\203k >\203k\314\315\"\210\316 \"\202n\317\262\211\203\212\312\320\"b\210\312\321\"\322\323!\324 \311\325\326\n!!\311y\210`W\203\376 \203\257\327\330\331 \206\237`Sf\"\203\257\332\331 S\331 \333\317$\210\332`\331 T\334\322\335!\203\206\336\337!\nD\211:\205~\211\242\211\340\267\202{\243\211:\205\372\211\242\211\204\350\243\211?\205\343\341\262\202\370\211\317=\205\370\243\211?\205\366\342\262\262\262\202|\243\211:\205+\211\242\211\204\243\211?\205\343\262\202)\211\317=\205)\243\211?\205'\344\262\262\262\202|\243\211:\205\\\211\242\211\204J\243\211?\205E\345\262\202Z\211\317=\205Z\243\211?\205X\346\262\262\262\202|\243\211:\205v\211\242\211?\205t\243\311\262\262\262\202|\311\262\262\262\347\202\366\322\203\220\350\202\221\351!\203\264\352\n\"\210\353\354#\210\206\366 \203\260\355\202\366\356\202\366\322\203\276\357\202\277\360!\203\336\352\n\"\210\353\361#\210 \203\332\362\202\366\363\202\366\352\n\"\210\353\364#\210 \203\365\365\202\366\366$\210\311y\210\202\215)\266)\210\367!\207" [magit-diff-highlight-hunk-body magit-section-unhighlight-sections tab-width magit-diff-hide-trailing-cr-characters magit-section-selected-p signal wrong-number-of-arguments magit-diff-paint-hunk 3 nil eieio-oref hidden add-to-list magit-section-highlighted-sections delq t start end looking-at "@@@" magit-diff-type magit-diff-tab-width magit-section-parent-value char-equal 13 line-end-position put-text-property invisible font-lock-face "^\\+\\+?\\([<=|>]\\)\\{7\\}" match-string 1 #s(hash-table size 4 test equal rehash-size 1.5 rehash-threshold 0.8125 purecopy t data ("<" 206 "|" 255 "=" 304 ">" 353)) magit-diff-our magit-diff-our-highlight magit-diff-base magit-diff-base-highlight magit-diff-their magit-diff-their-highlight magit-diff-conflict-heading "^\\(\\+\\| \\+\\)" "^\\+" magit-diff-paint-tab magit-diff-paint-whitespace added magit-diff-added-highlight magit-diff-added "^\\(-\\| -\\)" "^-" removed magit-diff-removed-highlight magit-diff-removed context magit-diff-context-highlight magit-diff-context magit-diff-update-hunk-refinement] 19 (#$ . 153999)]) (defvar magit-diff--tab-width-cache nil) #@13 (fn FILE) (defalias 'magit-diff-tab-width #[257 "\211C\211\303\242!\240\210\304\204 \207\305\242!\211\205\306\301\"\"\262\206`\307\242\n\"\211\2053\211A\2063 \262\206`\310=\204N\247\203Z\311\312\242!8Y\203Z\211\306\301\313\242!\"\"\207\211\314\"\210 \207" [magit-diff-adjust-tab-width tab-width magit-diff--tab-width-cache expand-file-name #[514 "\301\242\"\211\203\211\241\266\207\242BB\210\207" [magit-diff--tab-width-cache assoc] 5 "\n\n(fn FILE VALUE)"] find-buffer-visiting buffer-local-value assoc always 7 file-attributes find-file-noselect nil] 9 (#$ . 156563)]) #@22 (fn MERGING WIDTH) (defalias 'magit-diff-paint-tab #[514 "\212\203 \300\202\n\301u\210\302f\303U\205&\304``T\305\306\307EC$\210\302u\210\202\f)\207" [2 1 nil 9 put-text-property display space :width] 9 (#$ . 157180)]) #@36 (fn MERGING LINE-TYPE DIFF-TYPE) (defalias 'magit-diff-paint-whitespace #[771 "\205\360\306>\203\211\307>\205\360\310\267\202(\202, \311>\202) \312=\205\360\202,\313\205\360\2034\314\2025\315\316\302!\203?\n\202\217\317\302!\210\313\320\302!\237\321\313\211\211\203\207\211A\262\242\262\262\211\262\203\207@ \313\322\323#)\266\203\203z\313\262\203\207\262\262T\262\202L\266\211\262A\211 \203\266\324\325P!\203\266\326\327\224\327\225\313\322$\330\331\332#\210\330\333\334#\210\330\335\322#\266\211\336=\203\304\324\337P!\204\323\211\250\205\356\324\340\341#!\205\356\326\327\224\327\225\313\322$\330\331\332#\210\330\333\334#\210\330\335\322#\262\266\202\207" [magit-diff-paint-whitespace magit-diff-paint-whitespace-lines magit-diff-highlight-indentation default-directory inhibit-changing-match-data magit-diff-highlight-trailing (uncommitted status) (staged unstaged) #s(hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (added 22 removed 25 context 31)) (all both) all nil "^[-\\+ ]\\{2\\}" "^[-\\+ ]" local-variable-p make-local-variable default-value 0 t string-match looking-at ".*?\\([ ]+\\)$" make-overlay 1 overlay-put font-lock-face magit-diff-whitespace-warning priority 2 evaporate tabs "\\( * [ ]*\\)" format "%s\\([ ]* \\{%s,\\}[ ]*\\)"] 17 (#$ . 157413)]) #@26 (fn &optional SECTION) (defalias 'magit-diff-update-hunk-refinement #[256 "\211\203\341\302\303\"?\205\360\304\305\302\306\"\307 =E\211:\205\340\211\242\211\310\267\202\257\243\211:\205L\211\242\211?\205J\243\211:\205H\211\243\211?\205F !\262\262\262\262\202\336\243\211:\205\252\211\242\211\204\202\243\211:\205}\211\242\211\311=\205{\243\211?\205y\n!\262\262\262\202\250\211\311=\205\250\243\211:\205\246\211\242\211?\205\244\243\211?\205\242\n!\262\262\262\262\262\202\336\211?\205\336\243\211:\205\334\211\242\211\311=\205\332\243\211:\205\330\211\243\211?\205\326 !\262\262\262\262\262\207\312C\211\313\314\"\240\210\211\242 !\262\207" [magit-diff-refine-hunk magit-root-section eieio-oref hidden #[257 "\303\304\305#\210\212\306\307\"b\210\310\311!?\205\305\312 *)\207" [magit-diff-refine-ignore-whitespace write-region-inhibit-fsync smerge-refine-ignore-whitespace eieio-oset refined t eieio-oref start looking-at "@@@" diff-refine-hunk] 5 "\n\n(fn SECTION)"] #[257 "\300\301\302#\210\303\304\305\"\304\306\"\307\310$\207" [eieio-oset refined nil remove-overlays eieio-oref start end diff-mode fine] 6 "\n\n(fn SECTION)"] refined magit-current-section #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (all 37 t 81)) t nil make-closure #[257 "\301\302\"\203 \303!\207\304\305\"\211\205!\211@\300\242!\210A\266\202\202\207" [V0 magit-section-match hunk magit-diff-update-hunk-refinement eieio-oref children] 5 "\n\n(fn SECTION)"]] 12 (#$ . 158794)]) (defalias 'magit-diff-hunk-region-beginning #[0 "\212\300 b\210\301 )\207" [region-beginning line-beginning-position] 1]) (defalias 'magit-diff-hunk-region-end #[0 "\212\300 b\210\301 )\207" [region-end line-end-position] 1]) #@58 Highlight the hunk-internal region if any. (fn SECTION) (defalias 'magit-diff-update-hunk-region #[257 "\300\301\"\302=\205'\303\304\305\"\304\306\"S\307\310\311\312!\313\314\310!&\210\315\316\"\210\301\207" [magit-diff-scope t region magit-diff--make-hunk-overlay eieio-oref start content font-lock-face magit-diff-lines-heading display magit-diff-hunk-region-header after-string magit-diff--hunk-after-string run-hook-with-args magit-diff-highlight-hunk-region-functions] 11 (#$ . 160607)]) #@197 Dim the parts of the hunk that are outside the hunk-internal region. This is done by using the same foreground and background color for added and removed lines as for context lines. (fn SECTION) (defalias 'magit-diff-highlight-hunk-region-dim-outside #[257 "\203\303\202 \304 \203\305\n\306Y\205\307\310\311\310\"D\"\262\312\313\314\"\315 \316\317\320&\210\312\321 T\313\322\"\316\317\320&\207" [magit-diff-highlight-hunk-body magit-diff-unmarked-lines-keep-foreground emacs-major-version magit-diff-context-highlight magit-diff-context append 27 (:extend t) :background face-attribute magit-diff--make-hunk-overlay eieio-oref content magit-diff-hunk-region-beginning font-lock-face priority 2 magit-diff-hunk-region-end end] 9 (#$ . 161116)]) #@211 Highlight the hunk-internal region by making it bold. Or rather highlight using the face `magit-diff-hunk-region', though changing only the `:weight' and/or `:slant' is recommended for that face. (fn SECTION) (defalias 'magit-diff-highlight-hunk-region-using-face #[257 "\300\301 \302 T\303\304$\207" [magit-diff--make-hunk-overlay magit-diff-hunk-region-beginning magit-diff-hunk-region-end font-lock-face magit-diff-hunk-region] 6 (#$ . 161884)]) #@154 Emphasize the hunk-internal region using delimiting horizontal lines. This is implemented as single-pixel newlines places inside overlays. (fn SECTION) (defalias 'magit-diff-highlight-hunk-region-using-overlays #[257 "\300 \203(\301 \302 \303\211\304\305\306#\303\307\310\311#P\312\313#\314\211T\315$\210\314\211T\316$\207\317!\207" [window-system magit-diff-hunk-region-beginning magit-diff-hunk-region-end propertize " " display (space :height (1)) "\n" line-height t font-lock-face magit-diff-lines-boundary magit-diff--make-hunk-overlay before-string after-string magit-diff-highlight-hunk-region-using-face] 9 (#$ . 162341)]) #@184 Emphasize the hunk-internal region using delimiting horizontal lines. This is implemented by overlining and underlining the first and last (visual) lines of the region. (fn SECTION) (defalias 'magit-diff-highlight-hunk-region-using-underline #[257 "\300 \203C\301 \302 \212b\210\303 \210`)\212b\210\304 \210`)\305\306\307\310#\311U\2033\211\312\313&\207\211\312$\210\211\313$\207\314!\207" [window-system magit-diff-hunk-region-beginning magit-diff-hunk-region-end end-of-visual-line beginning-of-visual-line face-background magit-diff-lines-boundary nil t #[642 "\300\301\302\303!&\207" [magit-diff--make-hunk-overlay font-lock-face after-string magit-diff--hunk-after-string] 11 "\n\n(fn B E &rest FACE)"] :overline :underline magit-diff-highlight-hunk-region-using-face] 14 (#$ . 162986)]) #@29 (fn START END &rest ARGS) (defalias 'magit-diff--make-hunk-overlay #[642 "\301\302\303$\304\305\303#\210\203#\304\211A\262\242\211A\262\242#\210\202\f\211B\207" [magit-section--region-overlays make-overlay nil t overlay-put evaporate] 9 (#$ . 163814)]) #@13 (fn FACE) (defalias 'magit-diff--hunk-after-string #[257 "\300\301\302\303\304\305\306\307\310 \311 \312 Z^EE\313\314&\207" [propertize " " font-lock-face display space :align-to + (0 . right) window-hscroll line-end-position line-beginning-position cursor t] 13 (#$ . 164088)]) #@55 Return non-nil if point is inside the body of a hunk. (defalias 'magit-diff-inside-hunk-body-p #[0 "\300\301!\205\302\303 \304\"\211\205`V\262\207" [magit-section-match hunk eieio-oref magit-current-section content] 3 (#$ . 164377)]) #@16 (fn SECTION) (defalias 'magit-diff-file-header #[257 "\300!\203\f\301\302\"\262\303!\205\301\304\"\207" [magit-hunk-section-p eieio-oref parent magit-file-section-p header] 4 (#$ . 164623)]) #@16 (fn SECTION) (defalias 'magit-diff-hunk-region-header #[257 "\300!\301\302\"\210\211\303\211\225SO\207" [magit-diff-hunk-region-patch string-match "\n" 0] 5 (#$ . 164830)]) #@31 (fn SECTION &optional ARGS) (defalias 'magit-diff-hunk-region-patch #[513 "\302\235\203\n\303\202 \304\305\306\"\307 \310 \305\311\"\312\212b\210`W\203f\313\314!\210\315\316\317!\312\320\321#)\266\203\204E`Y\203O`X\203O\316\322!B\262\202`\316\317!\232\203`\323\316\324!PB\262\312y\210\202)\312\325\326\320\"r\211q\210\327\330\"\216\331\332\333!\334#c\210\335ed\"\210\336 \262*\210)\207" [inhibit-changing-match-data buffer-list-update-hook "--reverse" "+" "-" eieio-oref start magit-diff-hunk-region-beginning region-end end nil looking-at "\\(.\\)\\([^\n]*\n\\)" "[@ ]" match-string-no-properties 1 t string-match 0 " " 2 generate-new-buffer " *temp*" make-closure #[0 "\301\300!\205 \302\300!\207" [V0 buffer-name kill-buffer] 2] mapconcat identity reverse "" diff-fixup-modifs buffer-string] 15 (#$ . 165013)]) (provide 'magit-diff)