.emacs.d.git - Gitblit

removed needless lines in init and setup tramp for windows

Chizi123

2018-11-18 9d27fc972e84736015ab3b1c331888a8fe3d1276

commit \| author \| age
5cb5f7	1	;ELC
C	2	;;; Compiled
	3	;;; in Emacs version 26.1
	4	;;; with all optimizations.
	5
	6	;;; This file uses dynamic docstrings, first added in Emacs 19.29.
	7
	8	;;; This file does not contain utf-8 non-ASCII characters,
	9	;;; and so can be loaded in Emacs versions earlier than 23.
	10
	11	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
	12	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
	13
	14
	15	(byte-code "\300\301!\210\300\302!\210\300\303!\210\304\305\306\307\310\311\312\313&\210\314\315\316\317\320DD\321\322\323\312\305\324\325\326\327\330\331& \210\314\332\316\317\333DD\334\322\335\312\305\324\336& \210\314\337\316\317\340DD\341\322\342\312\305\324\336& \207" [require magit ediff smerge-mode custom-declare-group magit-ediff nil "Ediff support for Magit." :link (info-link "(magit)Ediffing") :group magit-extensions custom-declare-variable magit-ediff-quit-hook funcall function #[0 "\300\207" [(magit-ediff-cleanup-auxiliary-buffers magit-ediff-restore-previous-winconf)] 1] "Hooks to run after finishing Ediff, when that was invoked using Magit.\nThe hooks are run in the Ediff control buffer. This is similar\nto `ediff-quit-hook' but takes the needs of Magit into account.\nThe `ediff-quit-hook' is ignored by Ediff sessions which were\ninvoked using Magit." :package-version (magit . "2.2.0") :type hook :get magit-hook-custom-get :options (magit-ediff-cleanup-auxiliary-buffers magit-ediff-restore-previous-winconf) magit-ediff-dwim-show-on-hunks #[0 "\300\207" [nil] 1] "Whether `magit-ediff-dwim' runs show variants on hunks.\nIf non-nil, `magit-ediff-show-staged' or\n`magit-ediff-show-unstaged' are called based on what section the\nhunk is in. Otherwise, `magit-ediff-dwim' runs\n`magit-ediff-stage' when point is on an uncommitted hunk." (magit . "2.2.0") boolean magit-ediff-show-stash-with-index #[0 "\300\207" [t] 1] "Whether `magit-ediff-show-stash' shows the state of the index.\n\nIf non-nil, use a third Ediff buffer to distinguish which changes\nin the stash were staged. In cases where the stash contains no\nstaged changes, fall back to a two-buffer Ediff.\n\nMore specifically, a stash is a merge commit, stash@{N}, with\npotentially three parents.\n\n* stash@{N}^1 represents the `HEAD' commit at the time the stash\n was created.\n\n* stash@{N}^2 records any changes that were staged when the stash\n was made.\n\n* stash@{N}^3, if it exists, contains files that were untracked\n when stashing.\n\nIf this option is non-nil, `magit-ediff-show-stash' will run\nEdiff on a file using three buffers: one for stash@{N}, another\nfor stash@{N}^1, and a third for stash@{N}^2.\n\nOtherwise, Ediff uses two buffers, comparing\nstash@{N}^1..stash@{N}. Along with any unstaged changes, changes\nin the index commit, stash@{N}^2, will be shown in this\ncomparison unless they conflicted with changes in the working\ntree at the time of stashing." (magit . "2.6.0")] 14)
	16	(defvar magit-ediff-previous-winconf nil)
	17	#@55 Popup console for ediff commands.
	18
	19	(fn &optional ARG)
	20	(defalias 'magit-ediff-popup #[256 "\300\301\302#\207" [magit-invoke-popup magit-ediff-popup nil] 5 (#$ . 2958) "P"])
	21	(defvar magit-ediff-popup (list :variable 'magit-ediff-arguments :actions '((69 "Dwim" magit-ediff-dwim) (117 "Show unstaged" magit-ediff-show-unstaged) (115 "Stage" magit-ediff-stage) (105 "Show staged" magit-ediff-show-staged) (109 "Resolve" magit-ediff-resolve) (119 "Show worktree" magit-ediff-show-working-tree) (114 "Diff range" magit-ediff-compare) (99 "Show commit" magit-ediff-show-commit) nil (122 "Show stash" magit-ediff-show-stash)) :max-action-columns 2))
	22	(byte-code "\300\301!\210\302\303\304\305\306DD\307\310\311\312\313&\207" [magit-define-popup-keys-deferred magit-ediff-popup custom-declare-variable magit-ediff-arguments funcall function #[0 "\301\302\"\207" [magit-ediff-popup plist-get :default-arguments] 3] "" :group magit-git-arguments :type (repeat (string :tag "Argument"))] 8)
	23	(defalias 'magit-ediff-arguments #[0 "\303=\203 \207\n\207" [magit-current-popup magit-current-popup-args magit-ediff-arguments magit-ediff-popup] 2])
	24	(put 'magit-ediff-arguments 'definition-name 'magit-ediff-popup)
	25	#@279 Resolve outstanding conflicts in FILE using Ediff.
	26	FILE has to be relative to the top directory of the repository.
	27
	28	In the rare event that you want to manually resolve all
	29	conflicts, including those already resolved by Git, use
	30	`ediff-merge-revisions-with-ancestor'.
	31
	32	(fn FILE)
	33	(defalias 'magit-ediff-resolve #[257 "\302 \211\203\211r\303!q\210\304 \210\305\301!\210\306\211*\202\307 \207" [default-directory ediff-quit-hook magit-toplevel find-file-noselect smerge-ediff make-local-variable #[0 " r\211q\210\306\307\310\n\"!\203\311 \210\312!\210\313 \210)\266\314!\203&\315!\210\314\f!\2030\315\f!\210\314!\203:\315!\210\314 !\203D\315 !\210\316\317!)\207" [ediff-buffer-C smerge-ediff-buf buffer-file-name ediff-buffer-A ediff-buffer-B ediff-ancestor-buffer yes-or-no-p format "Conflict resolution finished; save %s? " erase-buffer insert-buffer-substring save-buffer buffer-live-p kill-buffer run-hooks magit-ediff-quit-hook smerge-ediff-windows magit-ediff-previous-winconf] 6] magit--not-inside-repository-error] 4 (#$ . 4165) (byte-code "\300 \301 \211\204\f\302\303!\210\304\305\306\307\306\211\235@&C\207" [magit-current-file magit-unmerged-files user-error "There are no unresolved conflicts" magit-completing-read "Resolve file" nil t] 11)])
	34	#@123 Stage and unstage changes to FILE using Ediff.
	35	FILE has to be relative to the top directory of the repository.
	36
	37	(fn FILE)
	38	(defalias 'magit-ediff-stage #[257 "\304 \211\203\212\211\305 \306\307\"\310\311P!\211\205r\211q\210 )?\312!\211\206*\313!r\211q\210\n)\314\206;\315\307\n\"r\316\n\317\"q\210\320p)\321\320\322\323\321\320\324\325\326?\205X\327\203g?\205h\330\202h\331?\205o\332\333\334DC\335BBC$BBBBEEC\314%)\266\206)\202\214\336 \207" [default-directory buffer-read-only buffer-file-coding-system coding-system-for-read magit-toplevel current-window-configuration magit-get-revision-buffer "HEAD" get-buffer ".~{index}~" get-file-buffer find-file-noselect ediff-buffers3 magit-find-file-noselect magit-find-file-index-noselect t nil lambda setq-local ediff-quit-hook (and (buffer-live-p ediff-buffer-B) (buffer-modified-p ediff-buffer-B) (with-current-buffer ediff-buffer-B (magit-update-index))) (and (buffer-live-p ediff-buffer-C) (buffer-modified-p ediff-buffer-C) (with-current-buffer ediff-buffer-C (when (y-or-n-p (format "Save file %s? " buffer-file-name)) (save-buffer)))) append ((ediff-kill-buffer-carefully ediff-buffer-A)) ((with-current-buffer ediff-buffer-B (setq buffer-read-only t))) ((ediff-kill-buffer-carefully ediff-buffer-B)) ((ediff-kill-buffer-carefully ediff-buffer-C)) let magit-ediff-previous-winconf ((run-hooks 'magit-ediff-quit-hook)) magit--not-inside-repository-error] 27 (#$ . 5456) (byte-code "\300\301\302 \303\211\211\211\304 &C\207" [magit-completing-read "Selectively stage file" magit-tracked-files nil magit-current-file] 8)])
	39	#@487 Compare REVA:FILEA with REVB:FILEB using Ediff.
	40
	41	FILEA and FILEB have to be relative to the top directory of the
	42	repository. If REVA or REVB is nil, then this stands for the
	43	working tree state.
	44
	45	If the region is active, use the revisions on the first and last
	46	line of the region. With a prefix argument, instead of diffing
	47	the revisions, choose a revision to view changes along, starting
	48	at the common ancestor of both revisions (i.e., use a "..."
	49	range).
	50
	51	(fn REVA REVB FILEA FILEB)
	52	(defalias 'magit-ediff-compare #[1028 "\301 \211\203\202\211\302 \203\303\"\202\304!\203%\303\"\202(\304!\305\206?\203;\306 \"\202?\307!\206U\203Q\306 \"\202U\307!\310\311\312\313\310\311\314?\205c\315?\205j\316\317\320DC\321BBC#BBEEC\322$\266\203)\202\204\323 \207" [default-directory magit-toplevel current-window-configuration magit-get-revision-buffer get-file-buffer ediff-buffers magit-find-file-noselect find-file-noselect lambda nil setq-local ediff-quit-hook append ((ediff-kill-buffer-carefully ediff-buffer-A)) ((ediff-kill-buffer-carefully ediff-buffer-B)) let magit-ediff-previous-winconf ((run-hooks 'magit-ediff-quit-hook)) ediff-revision magit--not-inside-repository-error] 23 (#$ . 7070) (byte-code "\301\302\"\211@A\211@A\211D\303\"\244\266\202\207" [current-prefix-arg magit-ediff-compare--read-revisions nil magit-ediff-read-files] 11)])
	53	#@28
	54
	55	(fn &optional ARG MBASE)
	56	(defalias 'magit-ediff-compare--read-revisions #[512 "\206 \300\301\302#\303!\211\203\304!\202\302D\262\207" [magit-diff-read-range-or-commit "Compare range or commit" nil magit-split-range -cons-to-list] 6 (#$ . 8477)])
	57	#@174 Read file in REVB, return it and the corresponding file in REVA.
	58	When FILEB is non-nil, use this as REVB's file instead of
	59	prompting for it.
	60
	61	(fn REVA REVB &optional FILEB)
	62	(defalias 'magit-ediff-read-files #[770 "\211\204 \300\301\302\206 \303#\304\"\301\305\206\303##\262\211\306!\235@\206N\307\310\"\"A\206N\300\301\311\206@\303$\304\"\301\312##D\207" [magit-read-file-choice format "File to compare between %s and %s" "the working tree" magit-changed-files "No changed files between %s and %s" magit-revision-files assoc magit-renamed-files "File in %s to compare with %s in %s" "No files have changed between %s and %s"] 10 (#$ . 8743)])
	63	#@483 Compare, stage, or resolve using Ediff.
	64	This command tries to guess what file, and what commit or range
	65	the user wants to compare, stage, or resolve using Ediff. It
	66	might only be able to guess either the file, or range or commit,
	67	in which case the user is asked about the other. It might not
	68	always guess right, in which case the appropriate `magit-ediff-*'
	69	command has to be used explicitly. If it cannot read the user's
	70	mind at all, then it asks the user for a command to run.
	71	(defalias 'magit-ediff-dwim #[0 "\302 \211\203\303\304\"\203\212\305\211\306\"\307\"b\210\310 )\202\311 \312 \313C\313C\313C\314\315\316\317\320\321\2042\n\322>\203I\323 \203C\324\202D\325\240\210\202\250\n\326=\203X\327\240\210\202\250\n\330=\203g\331\240\210\202\250\n:\203\377\n@\211\332\267\202\225A\n#\266\202\373A\n#\266\202\373\333\334!\203\373\335 \211\336=\203\277\337 @!\211@A\211@A\240\210\240\266\202\372\204\313\n\325\240\210\202\372\211\326=\203\331\n\327\240\210\202\372\211\330=\203\347\n\331\240\210\202\372\211\340=\203\365\n\313\240\210\202\372\n\313\240\210\210\210\202\250\n;\203&\337!\211@A\211@A\341\240\210\240\210 \240\266\202\250\211 #\210\202\250\n\326=\203A !\210\202\250\n\330=\203P !\210\202\250\n:\203\213\n@\211\342\267\202~A\n#\266\202\207A\n#\266\202\207\n\n\n#\210\210\202\250\n;\203\237\n\n\n$\210\202\250\211 #\210\266\242\204\321\343\344\345\346\"\211\347\267\202\312\350\202\313\341\202\313\325\202\313\324\202\313\313\262!\202\242\341=\203\354\351\341\242\242\352\242\242\n#$\202\242\350=\203\372\350\242!\202\242\353=\203\353\242!\202\203\242!\202\343\242!\266\205\207" [magit-ediff-dwim-show-on-hunks magit-refresh-args magit-current-section magit-section-match-1 hunk eieio-oref parent start magit-ediff-dwim magit-diff--dwim magit-current-file nil #[1028 "\300!\211@A\211@A \301\240\210\240\210\240\266\202\207" [magit-ediff-compare--read-revisions magit-ediff-compare] 13 "\n\n(fn RANGE COMMAND REVA REVB)"] #[771 "\300\240\210\240\207" [magit-ediff-show-stash] 5 "\n\n(fn COMMAND REVB VALUE)"] #[771 "\300\240\210\240\207" [magit-ediff-show-commit] 5 "\n\n(fn COMMAND REVB VALUE)"] #[257 "\211\300\240\207" [magit-ediff-show-staged] 3 "\n\n(fn COMMAND)"] #[257 "\211\300\240\207" [magit-ediff-show-unstaged] 3 "\n\n(fn COMMAND)"] #[771 "\302\303!\205_\304 \211\305=\203,\306@!\211@A\211@A \240\210\240\266\202\266\205\202] \2046\307\240\202]\211\310=\203B\311\240\202]\211\312=\203N\313\240\202]\211\314=\203Z\315\240\202]\315\240\262\207" [magit-refresh-args magit-ediff-dwim-show-on-hunks derived-mode-p magit-diff-mode magit-diff-type committed magit-ediff-compare--read-revisions magit-ediff-stage unstaged magit-ediff-show-unstaged staged magit-ediff-show-staged undefined nil] 13 "\n\n(fn COMMAND REVA REVB)"] (staged unstaged) magit-anything-unmerged-p magit-ediff-resolve magit-ediff-stage unstaged magit-ediff-show-unstaged staged magit-ediff-show-staged #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (commit 118 stash 133)) derived-mode-p magit-diff-mode magit-diff-type committed magit-ediff-compare--read-revisions undefined magit-ediff-compare #s(hash-table size 2 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (commit 351 stash 366)) call-interactively read-char-choice "Failed to read your mind; do you want to [c]ommit, [r]ange, [s]tage, resol[v]e, or [C-g] to abort " (99 114 115 118) #s(hash-table size 4 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy t data (99 442 114 446 115 450 118 454)) magit-ediff-show-commit apply magit-ediff-read-files magit-ediff-show-stash] 23 (#$ . 9426) nil])
	72	#@227 Show staged changes using Ediff.
	73
	74	This only allows looking at the changes; to stage, unstage,
	75	and discard changes using Ediff, use `magit-ediff-stage'.
	76
	77	FILE must be relative to the top directory of the repository.
	78
	79	(fn FILE)
	80	(defalias 'magit-ediff-show-staged #[257 "\300 \301\302\"\303\304P!\305\206\306\302\"\206\307\310\"\311\312\313\314\311\312\315?\205,\316?\2053\317\320\321DC\322BBC#BBEEC\305$\207" [current-window-configuration magit-get-revision-buffer "HEAD" get-buffer ".~{index}~" ediff-buffers magit-find-file-noselect magit-find-file-index-noselect t lambda nil setq-local ediff-quit-hook append ((ediff-kill-buffer-carefully ediff-buffer-A)) ((ediff-kill-buffer-carefully ediff-buffer-B)) let magit-ediff-previous-winconf ((run-hooks 'magit-ediff-quit-hook))] 19 (#$ . 13277) (byte-code "\300\301\302 \303#C\207" [magit-read-file-choice "Show staged changes for file" magit-staged-files "No staged files"] 4)])
	81	#@229 Show unstaged changes using Ediff.
	82
	83	This only allows looking at the changes; to stage, unstage,
	84	and discard changes using Ediff, use `magit-ediff-stage'.
	85
	86	FILE must be relative to the top directory of the repository.
	87
	88	(fn FILE)
	89	(defalias 'magit-ediff-show-unstaged #[257 "\301 \211\203Q\211\302 \303\304P!\305!\306\206\307\310\"\206$\311!\312\313\314\315\312\313\316?\2052\317?\2059\320\321\322DC\323BBC#BBEEC\306$\266\203)\202S\324 \207" [default-directory magit-toplevel current-window-configuration get-buffer ".~{index}~" get-file-buffer ediff-buffers magit-find-file-index-noselect t find-file-noselect lambda nil setq-local ediff-quit-hook append ((ediff-kill-buffer-carefully ediff-buffer-A)) ((ediff-kill-buffer-carefully ediff-buffer-B)) let magit-ediff-previous-winconf ((run-hooks 'magit-ediff-quit-hook)) magit--not-inside-repository-error] 20 (#$ . 14231) (byte-code "\300\301\302 \303#C\207" [magit-read-file-choice "Show unstaged changes for file" magit-unstaged-files "No unstaged files"] 4)])
	90	#@132 Show changes between `HEAD' and working tree using Ediff.
	91	FILE must be relative to the top directory of the repository.
	92
	93	(fn FILE)
	94	(defalias 'magit-ediff-show-working-tree #[257 "\301 \211\203P\211\302 \303\304\"\305!\306\206\307\304\"\206#\310!\311\312\313\314\311\312\315?\2051\316?\2058\317\320\321DC\322BBC#BBEEC\306$\266\203)\202R\323 \207" [default-directory magit-toplevel current-window-configuration magit-get-revision-buffer "HEAD" get-file-buffer ediff-buffers magit-find-file-noselect find-file-noselect lambda nil setq-local ediff-quit-hook append ((ediff-kill-buffer-carefully ediff-buffer-A)) ((ediff-kill-buffer-carefully ediff-buffer-B)) let magit-ediff-previous-winconf ((run-hooks 'magit-ediff-quit-hook)) magit--not-inside-repository-error] 20 (#$ . 15270) (byte-code "\300\301\302\303!\304#C\207" [magit-read-file-choice "Show changes in file" magit-changed-files "HEAD" "No changed files"] 4)])
	95	#@61 Show changes introduced by COMMIT using Ediff.
	96
	97	(fn COMMIT)
	98	(defalias 'magit-ediff-show-commit #[257 "\211\300P\301\302\303\304 #$\207" ["^" apply magit-ediff-compare magit-ediff-read-files magit-current-file] 11 (#$ . 16215) (byte-code "\300\301!C\207" [magit-read-branch-or-commit "Revision"] 2)])
	99	#@204 Show changes introduced by STASH using Ediff.
	100	`magit-ediff-show-stash-with-index' controls whether a
	101	three-buffer Ediff is used in order to distinguish changes in the
	102	stash that were staged.
	103
	104	(fn STASH)
	105	(defalias 'magit-ediff-show-stash #[257 "\211\301P\302P\303\"\211@A\211@A\203\211\304 \"\235\203\211\305 \306\f\"\306\f\"\306\f\"\307\206B\310\"\206L\310\"\206V\310\"\311\312\313\314\311\312\315 ?\205d\316 ?\205k\317 ?\205r\320\321\322DC\323BBC$BBEEC\307%\266\204\202\222\324\n$\262\266\202\207" [magit-ediff-show-stash-with-index "^1" "^2" magit-ediff-read-files magit-changed-files current-window-configuration magit-get-revision-buffer ediff-buffers3 magit-find-file-noselect lambda nil setq-local ediff-quit-hook append ((ediff-kill-buffer-carefully ediff-buffer-A)) ((ediff-kill-buffer-carefully ediff-buffer-B)) ((ediff-kill-buffer-carefully ediff-buffer-C)) let magit-ediff-previous-winconf ((run-hooks 'magit-ediff-quit-hook)) magit-ediff-compare] 33 (#$ . 16529) (byte-code "\300\301!C\207" [magit-read-stash "Stash"] 2)])
	106	(defalias 'magit-ediff-cleanup-auxiliary-buffers #[0 "\306! \307\n!\203\310\n!\202\307!\205\310!\f\211\211\205-\311 !\205-\312\311 !!)\2056\313\311 !!)\210\211\211\205L\311 !\205L\312\311 !!)\205U\313\311 !!)\210\211\211\205k\311 !\205k\312\311 !!)\205t\313\311 !!)\210\211\211\205\212\311 !\205\212\312\311 !!)\205\223\313\311 !!)\210\211\211\205\251\311 !\205\251\312\311 !!)\205\262\313\311 !!)\210\211\211\205\310\311 !\205\310\312\311 !!)\205\321\313\311 !!)\210\211\211\205\347\311 !\205\347\312\311 !!)\205\360\313\311 !!)\210\314\315!\203 \211\211\205\f\311 !\205\f\312\311 !!)\205\313\311 !!)\210\316 \203)\317!\203)\320!\210\2023\307!\2033\321!\210\316 \203=\204@\322 \210\211\211\205S\311 !\205S\312\311 !!)\205\\\313\311 !!)\210\317!\205g\323!\207" [ediff-control-buffer ediff-control-frame ediff-window-A ediff-window-B ediff-diff-buffer buf ediff-get-visible-buffer-window window-live-p window-frame get-buffer buffer-name kill-buffer boundp ediff-patch-diagnostics ediff-window-display-p frame-live-p delete-frame delete-window ediff-kill-bottom-toolbar select-frame ediff-custom-diff-buffer ediff-fine-diff-buffer ediff-tmp-buffer ediff-error-buffer ediff-msg-buffer ediff-debug-buffer ediff-multiframe] 8])
	107	(defalias 'magit-ediff-restore-previous-winconf #[0 "\301!\207" [magit-ediff-previous-winconf set-window-configuration] 2])
	108	(provide 'magit-ediff)