Update packages
This commit is contained in:
parent
0f51e9aa9a
commit
2264497898
@ -3,7 +3,7 @@
|
|||||||
;;; Code:
|
;;; Code:
|
||||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||||
|
|
||||||
;;;### (autoloads nil "helm" "helm.el" (22536 47004 98678 675000))
|
;;;### (autoloads nil "helm" "helm.el" (22538 14678 331196 868000))
|
||||||
;;; Generated autoloads from helm.el
|
;;; Generated autoloads from helm.el
|
||||||
|
|
||||||
(autoload 'helm-define-multi-key "helm" "\
|
(autoload 'helm-define-multi-key "helm" "\
|
||||||
@ -188,7 +188,7 @@ Enable/disable helm debugging from outside of helm session.
|
|||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el"
|
;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el"
|
||||||
;;;;;; "helm-source.el") (22536 47004 114678 663000))
|
;;;;;; "helm-source.el") (22538 14678 343196 850000))
|
||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
(define-package "helm-core" "20161019.2058" "Development files for Helm"
|
(define-package "helm-core" "20161020.2305" "Development files for Helm"
|
||||||
'((emacs "24.4")
|
'((emacs "24.4")
|
||||||
(async "1.9"))
|
(async "1.9"))
|
||||||
:url "https://emacs-helm.github.io/helm/")
|
:url "https://emacs-helm.github.io/helm/")
|
@ -1538,7 +1538,7 @@ IOW Don't use VALUE of previous VAR to set the VALUE of next VAR.
|
|||||||
helm--local-variables))))
|
helm--local-variables))))
|
||||||
|
|
||||||
|
|
||||||
;; Core: API helper
|
;; API helper
|
||||||
(cl-defun helm-empty-buffer-p (&optional (buffer helm-buffer))
|
(cl-defun helm-empty-buffer-p (&optional (buffer helm-buffer))
|
||||||
"Check if BUFFER have candidates.
|
"Check if BUFFER have candidates.
|
||||||
Default value for BUFFER is `helm-buffer'."
|
Default value for BUFFER is `helm-buffer'."
|
||||||
@ -1560,7 +1560,7 @@ was deleted and the candidates list not updated."
|
|||||||
(bobp)))))))
|
(bobp)))))))
|
||||||
|
|
||||||
|
|
||||||
;; Core: tools
|
;; Tools
|
||||||
;;
|
;;
|
||||||
(defun helm-funcall-with-source (source functions &rest args)
|
(defun helm-funcall-with-source (source functions &rest args)
|
||||||
"Call from SOURCE FUNCTIONS list or single function FUNCTIONS with ARGS.
|
"Call from SOURCE FUNCTIONS list or single function FUNCTIONS with ARGS.
|
||||||
@ -1646,7 +1646,7 @@ only."
|
|||||||
;; See comment about this in `with-local-quit'.
|
;; See comment about this in `with-local-quit'.
|
||||||
(eval '(ignore nil)))))
|
(eval '(ignore nil)))))
|
||||||
|
|
||||||
;; Core: entry point
|
;; Entry point
|
||||||
;; `:allow-nest' is not in this list because it is treated before.
|
;; `:allow-nest' is not in this list because it is treated before.
|
||||||
(defconst helm-argument-keys
|
(defconst helm-argument-keys
|
||||||
'(:sources :input :prompt :resume
|
'(:sources :input :prompt :resume
|
||||||
@ -1816,7 +1816,7 @@ example, :candidate-number-limit is bound to
|
|||||||
unless (memq key helm-argument-keys)
|
unless (memq key helm-argument-keys)
|
||||||
collect (cons sym value)))
|
collect (cons sym value)))
|
||||||
|
|
||||||
;;; Core: entry point helper
|
;;; Entry point helper
|
||||||
(defun helm-internal (&optional
|
(defun helm-internal (&optional
|
||||||
any-sources any-input
|
any-sources any-input
|
||||||
any-prompt any-resume
|
any-prompt any-resume
|
||||||
@ -2040,7 +2040,7 @@ Arguments SAME-AS-HELM are the same as `helm'"
|
|||||||
(helm-display-mode-line (helm-get-current-source)))))))
|
(helm-display-mode-line (helm-get-current-source)))))))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: Accessors
|
;;; Accessors
|
||||||
;;
|
;;
|
||||||
(defun helm-current-position (save-or-restore)
|
(defun helm-current-position (save-or-restore)
|
||||||
"Save or restore current position in `helm-current-buffer'.
|
"Save or restore current position in `helm-current-buffer'.
|
||||||
@ -2181,7 +2181,7 @@ value of `helm-full-frame' or `helm-split-window-default-side'."
|
|||||||
(helm-log-run-hook 'helm-window-configuration-hook)))
|
(helm-log-run-hook 'helm-window-configuration-hook)))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: initialize
|
;;; Initialize
|
||||||
;;
|
;;
|
||||||
(defun helm-initialize (any-resume any-input any-default any-sources)
|
(defun helm-initialize (any-resume any-input any-default any-sources)
|
||||||
"Start initialization of `helm' session.
|
"Start initialization of `helm' session.
|
||||||
@ -2578,7 +2578,7 @@ WARNING: Do not use this mode yourself, it is internal to helm."
|
|||||||
(setq helm--remap-mouse-mode-map nil)))
|
(setq helm--remap-mouse-mode-map nil)))
|
||||||
(put 'helm--remap-mouse-mode 'helm-only t)
|
(put 'helm--remap-mouse-mode 'helm-only t)
|
||||||
|
|
||||||
;; Core: clean up
|
;; Clean up
|
||||||
|
|
||||||
(defun helm-cleanup ()
|
(defun helm-cleanup ()
|
||||||
"Clean up the mess when helm exit or quit."
|
"Clean up the mess when helm exit or quit."
|
||||||
@ -2624,7 +2624,7 @@ WARNING: Do not use this mode yourself, it is internal to helm."
|
|||||||
(delete-minibuffer-contents)))))
|
(delete-minibuffer-contents)))))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: input handling
|
;;; Input handling
|
||||||
;;
|
;;
|
||||||
;;
|
;;
|
||||||
(defun helm-check-minibuffer-input ()
|
(defun helm-check-minibuffer-input ()
|
||||||
@ -2653,7 +2653,7 @@ WARNING: Do not use this mode yourself, it is internal to helm."
|
|||||||
(add-hook 'helm-after-update-hook #'helm--reset-update-flag)
|
(add-hook 'helm-after-update-hook #'helm--reset-update-flag)
|
||||||
|
|
||||||
|
|
||||||
;; Core: all candidates
|
;; All candidates
|
||||||
|
|
||||||
(defun helm-get-candidates (source)
|
(defun helm-get-candidates (source)
|
||||||
"Retrieve and return the list of candidates from SOURCE."
|
"Retrieve and return the list of candidates from SOURCE."
|
||||||
@ -2734,7 +2734,7 @@ Cache the candidates if there is no cached value yet."
|
|||||||
candidates))))
|
candidates))))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: candidate transformers
|
;;; Candidate transformers
|
||||||
|
|
||||||
(defun helm-process-candidate-transformer (candidates source)
|
(defun helm-process-candidate-transformer (candidates source)
|
||||||
"Execute `candidate-transformer' function(s) on CANDIDATES in SOURCE."
|
"Execute `candidate-transformer' function(s) on CANDIDATES in SOURCE."
|
||||||
@ -2809,7 +2809,7 @@ CANDIDATES."
|
|||||||
source))
|
source))
|
||||||
|
|
||||||
|
|
||||||
;; Core: narrowing candidates
|
;; Narrowing candidates
|
||||||
(defun helm-candidate-number-limit (source)
|
(defun helm-candidate-number-limit (source)
|
||||||
"Apply candidate-number-limit attribute value.
|
"Apply candidate-number-limit attribute value.
|
||||||
This overrides `helm-candidate-number-limit' variable.
|
This overrides `helm-candidate-number-limit' variable.
|
||||||
@ -2903,7 +2903,7 @@ This function is used with sources built with `helm-source-sync'."
|
|||||||
;; We could use here directly `re-search-forward'
|
;; We could use here directly `re-search-forward'
|
||||||
;; on the regexp produced by `helm--mapconcat-pattern',
|
;; on the regexp produced by `helm--mapconcat-pattern',
|
||||||
;; but it is very slow because emacs have to do an incredible
|
;; but it is very slow because emacs have to do an incredible
|
||||||
;; amount of loops to match e.g "[^f]*o[^o]..." in the whole buffer,
|
;; amount of loops to match e.g "[^f]*f[^o]*o..." in the whole buffer,
|
||||||
;; more the regexp is long more the amount of loops grow.
|
;; more the regexp is long more the amount of loops grow.
|
||||||
;; (Probably leading to a max-lisp-eval-depth error if both
|
;; (Probably leading to a max-lisp-eval-depth error if both
|
||||||
;; regexp and buffer are too big)
|
;; regexp and buffer are too big)
|
||||||
@ -3057,6 +3057,10 @@ See `helm-fuzzy-default-highlight-match'."
|
|||||||
(cl-loop for c in candidates
|
(cl-loop for c in candidates
|
||||||
collect (funcall helm-fuzzy-matching-highlight-fn c)))
|
collect (funcall helm-fuzzy-matching-highlight-fn c)))
|
||||||
|
|
||||||
|
|
||||||
|
;;; Matching candidates
|
||||||
|
;;
|
||||||
|
;;
|
||||||
(defun helm-match-functions (source)
|
(defun helm-match-functions (source)
|
||||||
(let ((matchfns (or (assoc-default 'match source)
|
(let ((matchfns (or (assoc-default 'match source)
|
||||||
(assoc-default 'match-strict source)
|
(assoc-default 'match-strict source)
|
||||||
@ -3075,29 +3079,6 @@ It is used for narrowing list of candidates to the
|
|||||||
`helm-candidate-number-limit'."
|
`helm-candidate-number-limit'."
|
||||||
(if (> (length seq) n) (cl-subseq seq 0 n) seq))
|
(if (> (length seq) n) (cl-subseq seq 0 n) seq))
|
||||||
|
|
||||||
(cl-defun helm-set-case-fold-search (&optional (pattern helm-pattern))
|
|
||||||
"Used to set the value of `case-fold-search' in helm.
|
|
||||||
Return t or nil depending on the value of `helm-case-fold-search'
|
|
||||||
and `helm-pattern'."
|
|
||||||
(let ((helm-case-fold-search
|
|
||||||
(helm-aif (assq 'case-fold-search (helm-get-current-source))
|
|
||||||
(cdr it)
|
|
||||||
helm-case-fold-search))
|
|
||||||
;; Only parse basename for filenames
|
|
||||||
;; to avoid setting case sensitivity
|
|
||||||
;; when expanded directories contains upcase
|
|
||||||
;; characters.
|
|
||||||
(bn-or-pattern (if (string-match "[~/]*" pattern)
|
|
||||||
(helm-basename pattern)
|
|
||||||
pattern)))
|
|
||||||
(helm-set-case-fold-search-1 bn-or-pattern)))
|
|
||||||
|
|
||||||
(defun helm-set-case-fold-search-1 (pattern)
|
|
||||||
(cl-case helm-case-fold-search
|
|
||||||
(smart (let ((case-fold-search nil))
|
|
||||||
(if (string-match "[[:upper:]]" pattern) nil t)))
|
|
||||||
(t helm-case-fold-search)))
|
|
||||||
|
|
||||||
(defun helm-match-from-candidates (cands matchfns match-part-fn limit source)
|
(defun helm-match-from-candidates (cands matchfns match-part-fn limit source)
|
||||||
(condition-case-unless-debug err
|
(condition-case-unless-debug err
|
||||||
(cl-loop with hash = (make-hash-table :test 'equal)
|
(cl-loop with hash = (make-hash-table :test 'equal)
|
||||||
@ -3211,7 +3192,34 @@ and `helm-pattern'."
|
|||||||
(unless (eq matches t) matches)))
|
(unless (eq matches t) matches)))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: helm-update
|
;;; Case fold search
|
||||||
|
;;
|
||||||
|
;;
|
||||||
|
(cl-defun helm-set-case-fold-search (&optional (pattern helm-pattern))
|
||||||
|
"Used to set the value of `case-fold-search' in helm.
|
||||||
|
Return t or nil depending on the value of `helm-case-fold-search'
|
||||||
|
and `helm-pattern'."
|
||||||
|
(let ((helm-case-fold-search
|
||||||
|
(helm-aif (assq 'case-fold-search (helm-get-current-source))
|
||||||
|
(cdr it)
|
||||||
|
helm-case-fold-search))
|
||||||
|
;; Only parse basename for filenames
|
||||||
|
;; to avoid setting case sensitivity
|
||||||
|
;; when expanded directories contains upcase
|
||||||
|
;; characters.
|
||||||
|
(bn-or-pattern (if (string-match "[~/]*" pattern)
|
||||||
|
(helm-basename pattern)
|
||||||
|
pattern)))
|
||||||
|
(helm-set-case-fold-search-1 bn-or-pattern)))
|
||||||
|
|
||||||
|
(defun helm-set-case-fold-search-1 (pattern)
|
||||||
|
(cl-case helm-case-fold-search
|
||||||
|
(smart (let ((case-fold-search nil))
|
||||||
|
(if (string-match "[[:upper:]]" pattern) nil t)))
|
||||||
|
(t helm-case-fold-search)))
|
||||||
|
|
||||||
|
|
||||||
|
;;; Helm update
|
||||||
;;
|
;;
|
||||||
(defun helm-update (&optional preselect source)
|
(defun helm-update (&optional preselect source)
|
||||||
"Update candidates list in `helm-buffer' based on `helm-pattern'.
|
"Update candidates list in `helm-buffer' based on `helm-pattern'.
|
||||||
@ -3384,7 +3392,7 @@ this additional info after the source name by overlay."
|
|||||||
(insert "\n"))
|
(insert "\n"))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: async process
|
;;; Async process
|
||||||
;;
|
;;
|
||||||
(defun helm-output-filter (process output-string)
|
(defun helm-output-filter (process output-string)
|
||||||
"The `process-filter' function for helm async sources."
|
"The `process-filter' function for helm async sources."
|
||||||
@ -3505,7 +3513,7 @@ function."
|
|||||||
(delete-process process))
|
(delete-process process))
|
||||||
|
|
||||||
|
|
||||||
;;; Core: action
|
;;; Actions
|
||||||
;;
|
;;
|
||||||
(defun helm-execute-selection-action ()
|
(defun helm-execute-selection-action ()
|
||||||
"Execute current action."
|
"Execute current action."
|
||||||
@ -3641,7 +3649,7 @@ If action buffer is selected, back to the helm buffer."
|
|||||||
(helm-initialize-overlays helm-action-buffer)))
|
(helm-initialize-overlays helm-action-buffer)))
|
||||||
|
|
||||||
|
|
||||||
;; Core: selection
|
;; Selection of candidates
|
||||||
|
|
||||||
(defun helm-display-source-at-screen-top-maybe (unit)
|
(defun helm-display-source-at-screen-top-maybe (unit)
|
||||||
"Display source at the top of screen when UNIT value is 'source.
|
"Display source at the top of screen when UNIT value is 'source.
|
||||||
@ -4273,7 +4281,7 @@ to a list of forms.\n\n")
|
|||||||
(put 'helm-enable-or-switch-to-debug 'helm-only t)
|
(put 'helm-enable-or-switch-to-debug 'helm-only t)
|
||||||
|
|
||||||
|
|
||||||
;; Core: misc
|
;; Misc
|
||||||
(defun helm-kill-buffer-hook ()
|
(defun helm-kill-buffer-hook ()
|
||||||
"Remove tick entry from `helm-tick-hash' and remove buffer from
|
"Remove tick entry from `helm-tick-hash' and remove buffer from
|
||||||
`helm-buffers' when killing a buffer."
|
`helm-buffers' when killing a buffer."
|
@ -3,8 +3,8 @@
|
|||||||
;;; Code:
|
;;; Code:
|
||||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||||
|
|
||||||
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22536 46995 446685
|
;;;### (autoloads nil "git-rebase" "git-rebase.el" (22538 14680 167194
|
||||||
;;;;;; 206000))
|
;;;;;; 56000))
|
||||||
;;; Generated autoloads from git-rebase.el
|
;;; Generated autoloads from git-rebase.el
|
||||||
|
|
||||||
(autoload 'git-rebase-mode "git-rebase" "\
|
(autoload 'git-rebase-mode "git-rebase" "\
|
||||||
@ -23,7 +23,7 @@ running 'man git-rebase' at the command line) for details.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit" "magit.el" (22536 46995 526685 145000))
|
;;;### (autoloads nil "magit" "magit.el" (22538 14680 243193 940000))
|
||||||
;;; Generated autoloads from magit.el
|
;;; Generated autoloads from magit.el
|
||||||
|
|
||||||
(autoload 'magit-status "magit" "\
|
(autoload 'magit-status "magit" "\
|
||||||
@ -501,8 +501,8 @@ Git, and Emacs in the echo area.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22536 46995
|
;;;### (autoloads nil "magit-apply" "magit-apply.el" (22538 14680
|
||||||
;;;;;; 466685 191000))
|
;;;;;; 187194 25000))
|
||||||
;;; Generated autoloads from magit-apply.el
|
;;; Generated autoloads from magit-apply.el
|
||||||
|
|
||||||
(autoload 'magit-stage-file "magit-apply" "\
|
(autoload 'magit-stage-file "magit-apply" "\
|
||||||
@ -538,8 +538,8 @@ Remove all changes from the staging area.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22536
|
;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22538
|
||||||
;;;;;; 46995 410685 233000))
|
;;;;;; 14680 139194 99000))
|
||||||
;;; Generated autoloads from magit-autorevert.el
|
;;; Generated autoloads from magit-autorevert.el
|
||||||
|
|
||||||
(defvar magit-revert-buffers t)
|
(defvar magit-revert-buffers t)
|
||||||
@ -568,8 +568,8 @@ See `auto-revert-mode' for more information on Auto-Revert mode.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22536 46995
|
;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22538 14680
|
||||||
;;;;;; 462685 194000))
|
;;;;;; 179194 37000))
|
||||||
;;; Generated autoloads from magit-bisect.el
|
;;; Generated autoloads from magit-bisect.el
|
||||||
(autoload 'magit-bisect-popup "magit-bisect" nil t)
|
(autoload 'magit-bisect-popup "magit-bisect" nil t)
|
||||||
|
|
||||||
@ -620,8 +620,8 @@ bisect run'.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22536 46995
|
;;;### (autoloads nil "magit-blame" "magit-blame.el" (22538 14680
|
||||||
;;;;;; 514685 155000))
|
;;;;;; 231193 959000))
|
||||||
;;; Generated autoloads from magit-blame.el
|
;;; Generated autoloads from magit-blame.el
|
||||||
(autoload 'magit-blame-popup "magit-blame" nil t)
|
(autoload 'magit-blame-popup "magit-blame" nil t)
|
||||||
|
|
||||||
@ -645,8 +645,8 @@ only arguments available from `magit-blame-popup' should be used.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22536 46995
|
;;;### (autoloads nil "magit-commit" "magit-commit.el" (22538 14680
|
||||||
;;;;;; 414685 230000))
|
;;;;;; 143194 93000))
|
||||||
;;; Generated autoloads from magit-commit.el
|
;;; Generated autoloads from magit-commit.el
|
||||||
|
|
||||||
(autoload 'magit-commit "magit-commit" "\
|
(autoload 'magit-commit "magit-commit" "\
|
||||||
@ -728,8 +728,8 @@ Create a squash commit targeting COMMIT and instantly rebase.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22536 46995 510685
|
;;;### (autoloads nil "magit-diff" "magit-diff.el" (22538 14680 223193
|
||||||
;;;;;; 158000))
|
;;;;;; 968000))
|
||||||
;;; Generated autoloads from magit-diff.el
|
;;; Generated autoloads from magit-diff.el
|
||||||
|
|
||||||
(autoload 'magit-diff-popup "magit-diff" "\
|
(autoload 'magit-diff-popup "magit-diff" "\
|
||||||
@ -813,8 +813,8 @@ for a revision.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22536 46995
|
;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22538 14680
|
||||||
;;;;;; 498685 167000))
|
;;;;;; 211193 989000))
|
||||||
;;; Generated autoloads from magit-ediff.el
|
;;; Generated autoloads from magit-ediff.el
|
||||||
(autoload 'magit-ediff-popup "magit-ediff" nil t)
|
(autoload 'magit-ediff-popup "magit-ediff" nil t)
|
||||||
|
|
||||||
@ -902,8 +902,8 @@ stash that were staged.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22536 46995
|
;;;### (autoloads nil "magit-extras" "magit-extras.el" (22538 14680
|
||||||
;;;;;; 418685 227000))
|
;;;;;; 147194 87000))
|
||||||
;;; Generated autoloads from magit-extras.el
|
;;; Generated autoloads from magit-extras.el
|
||||||
|
|
||||||
(autoload 'magit-run-git-gui "magit-extras" "\
|
(autoload 'magit-run-git-gui "magit-extras" "\
|
||||||
@ -973,8 +973,8 @@ on a position in a file-visiting buffer.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-log" "magit-log.el" (22536 46995 506685
|
;;;### (autoloads nil "magit-log" "magit-log.el" (22538 14680 215193
|
||||||
;;;;;; 161000))
|
;;;;;; 982000))
|
||||||
;;; Generated autoloads from magit-log.el
|
;;; Generated autoloads from magit-log.el
|
||||||
|
|
||||||
(autoload 'magit-log-buffer-file-popup "magit-log" "\
|
(autoload 'magit-log-buffer-file-popup "magit-log" "\
|
||||||
@ -1056,8 +1056,8 @@ Show commits in a branch that are not merged in the upstream branch.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22536 46995
|
;;;### (autoloads nil "magit-remote" "magit-remote.el" (22538 14680
|
||||||
;;;;;; 542685 134000))
|
;;;;;; 263193 909000))
|
||||||
;;; Generated autoloads from magit-remote.el
|
;;; Generated autoloads from magit-remote.el
|
||||||
|
|
||||||
(autoload 'magit-clone "magit-remote" "\
|
(autoload 'magit-clone "magit-remote" "\
|
||||||
@ -1289,8 +1289,8 @@ is asked to pull. START has to be reachable from that commit.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22536
|
;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22538
|
||||||
;;;;;; 46995 534685 139000))
|
;;;;;; 14680 251193 925000))
|
||||||
;;; Generated autoloads from magit-sequence.el
|
;;; Generated autoloads from magit-sequence.el
|
||||||
|
|
||||||
(autoload 'magit-sequencer-continue "magit-sequence" "\
|
(autoload 'magit-sequencer-continue "magit-sequence" "\
|
||||||
@ -1440,8 +1440,8 @@ Abort the current rebase operation, restoring the original branch.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22536 46995
|
;;;### (autoloads nil "magit-stash" "magit-stash.el" (22538 14680
|
||||||
;;;;;; 486685 176000))
|
;;;;;; 199194 6000))
|
||||||
;;; Generated autoloads from magit-stash.el
|
;;; Generated autoloads from magit-stash.el
|
||||||
(autoload 'magit-stash-popup "magit-stash" nil t)
|
(autoload 'magit-stash-popup "magit-stash" nil t)
|
||||||
|
|
||||||
@ -1540,8 +1540,8 @@ Show all diffs of a stash in a buffer.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22536
|
;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22538
|
||||||
;;;;;; 46995 562685 119000))
|
;;;;;; 14680 279193 884000))
|
||||||
;;; Generated autoloads from magit-submodule.el
|
;;; Generated autoloads from magit-submodule.el
|
||||||
(autoload 'magit-submodule-popup "magit-submodule" nil t)
|
(autoload 'magit-submodule-popup "magit-submodule" nil t)
|
||||||
|
|
||||||
@ -1631,8 +1631,8 @@ Display a list of the current repository's submodules.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22536 46995
|
;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22538 14680
|
||||||
;;;;;; 450685 203000))
|
;;;;;; 171194 49000))
|
||||||
;;; Generated autoloads from magit-subtree.el
|
;;; Generated autoloads from magit-subtree.el
|
||||||
(autoload 'magit-subtree-popup "magit-subtree" nil t)
|
(autoload 'magit-subtree-popup "magit-subtree" nil t)
|
||||||
|
|
||||||
@ -1668,8 +1668,8 @@ Extract the history of the subtree PREFIX.
|
|||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
||||||
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22536 46995 430685
|
;;;### (autoloads nil "magit-wip" "magit-wip.el" (22538 14680 155194
|
||||||
;;;;;; 218000))
|
;;;;;; 73000))
|
||||||
;;; Generated autoloads from magit-wip.el
|
;;; Generated autoloads from magit-wip.el
|
||||||
|
|
||||||
(defvar magit-wip-after-save-mode nil "\
|
(defvar magit-wip-after-save-mode nil "\
|
||||||
@ -1739,7 +1739,7 @@ command which is about to be called are committed.
|
|||||||
|
|
||||||
;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el"
|
;;;### (autoloads nil nil ("magit-core.el" "magit-git.el" "magit-mode.el"
|
||||||
;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el")
|
;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el")
|
||||||
;;;;;; (22536 46995 546685 131000))
|
;;;;;; (22538 14680 271193 896000))
|
||||||
|
|
||||||
;;;***
|
;;;***
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
(define-package "magit" "20161019.2021" "A Git porcelain inside Emacs"
|
(define-package "magit" "20161021.433" "A Git porcelain inside Emacs"
|
||||||
'((emacs "24.4")
|
'((emacs "24.4")
|
||||||
(async "20160711.223")
|
(async "20160711.223")
|
||||||
(dash "20160820.501")
|
(dash "20160820.501")
|
@ -590,20 +590,22 @@ Magit status buffer."
|
|||||||
"Special sentinel used by `magit-run-git-sequencer'."
|
"Special sentinel used by `magit-run-git-sequencer'."
|
||||||
(when (memq (process-status process) '(exit signal))
|
(when (memq (process-status process) '(exit signal))
|
||||||
(magit-process-sentinel process event)
|
(magit-process-sentinel process event)
|
||||||
(--when-let (with-current-buffer (process-get process 'command-buf)
|
(-when-let (process-buf (process-get process 'process-buf))
|
||||||
(magit-mode-get-buffer 'magit-status-mode))
|
(when (buffer-live-p process-buf)
|
||||||
(with-current-buffer it
|
(-when-let (status-buf (with-current-buffer process-buf
|
||||||
(--when-let
|
(magit-mode-get-buffer 'magit-status-mode)))
|
||||||
(magit-get-section
|
(with-current-buffer status-buf
|
||||||
`((commit . ,(magit-rev-parse "HEAD"))
|
(--when-let
|
||||||
(,(pcase (car (cadr (-split-at
|
(magit-get-section
|
||||||
(1+ (length magit-git-global-arguments))
|
`((commit . ,(magit-rev-parse "HEAD"))
|
||||||
(process-command process))))
|
(,(pcase (car (cadr (-split-at
|
||||||
((or "rebase" "am") 'rebase-sequence)
|
(1+ (length magit-git-global-arguments))
|
||||||
((or "cherry-pick" "revert") 'sequence)))
|
(process-command process))))
|
||||||
(status)))
|
((or "rebase" "am") 'rebase-sequence)
|
||||||
(goto-char (magit-section-start it))
|
((or "cherry-pick" "revert") 'sequence)))
|
||||||
(magit-section-update-highlight))))))
|
(status)))
|
||||||
|
(goto-char (magit-section-start it))
|
||||||
|
(magit-section-update-highlight))))))))
|
||||||
|
|
||||||
(defun magit-process-filter (proc string)
|
(defun magit-process-filter (proc string)
|
||||||
"Default filter used by `magit-start-process'."
|
"Default filter used by `magit-start-process'."
|
||||||
@ -791,11 +793,10 @@ as argument."
|
|||||||
default-dir (process-get arg 'default-dir)
|
default-dir (process-get arg 'default-dir)
|
||||||
section (process-get arg 'section)
|
section (process-get arg 'section)
|
||||||
arg (process-exit-status arg)))
|
arg (process-exit-status arg)))
|
||||||
(with-current-buffer process-buf
|
|
||||||
(magit-process-unset-mode-line))
|
|
||||||
(when (featurep 'dired)
|
(when (featurep 'dired)
|
||||||
(dired-uncache default-dir))
|
(dired-uncache default-dir))
|
||||||
(when (buffer-live-p process-buf)
|
(when (buffer-live-p process-buf)
|
||||||
|
(magit-process-unset-mode-line)
|
||||||
(with-current-buffer process-buf
|
(with-current-buffer process-buf
|
||||||
(let ((inhibit-read-only t)
|
(let ((inhibit-read-only t)
|
||||||
(marker (magit-section-start section)))
|
(marker (magit-section-start section)))
|
||||||
@ -832,18 +833,19 @@ as argument."
|
|||||||
"Git failed")))
|
"Git failed")))
|
||||||
(if magit-process-raise-error
|
(if magit-process-raise-error
|
||||||
(signal 'magit-git-error (list (format "%s (in %s)" msg default-dir)))
|
(signal 'magit-git-error (list (format "%s (in %s)" msg default-dir)))
|
||||||
(--when-let (with-current-buffer command-buf
|
(when (buffer-live-p process-buf)
|
||||||
(magit-mode-get-buffer 'magit-status-mode))
|
(--when-let (magit-mode-get-buffer 'magit-status-mode)
|
||||||
(with-current-buffer it
|
(when (buffer-live-p it)
|
||||||
(setq magit-this-error msg)))
|
(with-current-buffer it
|
||||||
(message "%s ... [%s buffer %s for details]" msg
|
(setq magit-this-error msg))))
|
||||||
(-if-let (key (and (buffer-live-p command-buf)
|
(message "%s ... [%s buffer %s for details]" msg
|
||||||
(with-current-buffer command-buf
|
(-if-let (key (and (buffer-live-p command-buf)
|
||||||
(car (where-is-internal
|
(with-current-buffer command-buf
|
||||||
'magit-process-buffer)))))
|
(car (where-is-internal
|
||||||
(format "Hit %s to see" (key-description key))
|
'magit-process-buffer)))))
|
||||||
"See")
|
(format "Hit %s to see" (key-description key))
|
||||||
(buffer-name process-buf)))))
|
"See")
|
||||||
|
(buffer-name process-buf))))))
|
||||||
arg)
|
arg)
|
||||||
|
|
||||||
(defun magit-process-display-buffer (process)
|
(defun magit-process-display-buffer (process)
|
Loading…
Reference in New Issue
Block a user