diff --git a/elpa/helm-core-20161019.2058/helm-core-autoloads.el b/elpa/helm-core-20161020.2305/helm-core-autoloads.el similarity index 98% rename from elpa/helm-core-20161019.2058/helm-core-autoloads.el rename to elpa/helm-core-20161020.2305/helm-core-autoloads.el index 5435ab0..282938e 100644 --- a/elpa/helm-core-20161019.2058/helm-core-autoloads.el +++ b/elpa/helm-core-20161020.2305/helm-core-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (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 (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" -;;;;;; "helm-source.el") (22536 47004 114678 663000)) +;;;;;; "helm-source.el") (22538 14678 343196 850000)) ;;;*** diff --git a/elpa/helm-core-20161019.2058/helm-core-pkg.el b/elpa/helm-core-20161020.2305/helm-core-pkg.el similarity index 68% rename from elpa/helm-core-20161019.2058/helm-core-pkg.el rename to elpa/helm-core-20161020.2305/helm-core-pkg.el index c084175..f487970 100644 --- a/elpa/helm-core-20161019.2058/helm-core-pkg.el +++ b/elpa/helm-core-20161020.2305/helm-core-pkg.el @@ -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") (async "1.9")) :url "https://emacs-helm.github.io/helm/") diff --git a/elpa/helm-core-20161019.2058/helm-lib.el b/elpa/helm-core-20161020.2305/helm-lib.el similarity index 100% rename from elpa/helm-core-20161019.2058/helm-lib.el rename to elpa/helm-core-20161020.2305/helm-lib.el diff --git a/elpa/helm-core-20161019.2058/helm-multi-match.el b/elpa/helm-core-20161020.2305/helm-multi-match.el similarity index 100% rename from elpa/helm-core-20161019.2058/helm-multi-match.el rename to elpa/helm-core-20161020.2305/helm-multi-match.el diff --git a/elpa/helm-core-20161019.2058/helm-source.el b/elpa/helm-core-20161020.2305/helm-source.el similarity index 100% rename from elpa/helm-core-20161019.2058/helm-source.el rename to elpa/helm-core-20161020.2305/helm-source.el diff --git a/elpa/helm-core-20161019.2058/helm.el b/elpa/helm-core-20161020.2305/helm.el similarity index 99% rename from elpa/helm-core-20161019.2058/helm.el rename to elpa/helm-core-20161020.2305/helm.el index 8f5f36e..8c10291 100644 --- a/elpa/helm-core-20161019.2058/helm.el +++ b/elpa/helm-core-20161020.2305/helm.el @@ -1538,7 +1538,7 @@ IOW Don't use VALUE of previous VAR to set the VALUE of next VAR. helm--local-variables)))) -;; Core: API helper +;; API helper (cl-defun helm-empty-buffer-p (&optional (buffer helm-buffer)) "Check if BUFFER have candidates. Default value for BUFFER is `helm-buffer'." @@ -1560,7 +1560,7 @@ was deleted and the candidates list not updated." (bobp))))))) -;; Core: tools +;; Tools ;; (defun helm-funcall-with-source (source functions &rest 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'. (eval '(ignore nil))))) -;; Core: entry point +;; Entry point ;; `:allow-nest' is not in this list because it is treated before. (defconst helm-argument-keys '(:sources :input :prompt :resume @@ -1816,7 +1816,7 @@ example, :candidate-number-limit is bound to unless (memq key helm-argument-keys) collect (cons sym value))) -;;; Core: entry point helper +;;; Entry point helper (defun helm-internal (&optional any-sources any-input 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))))))) -;;; Core: Accessors +;;; Accessors ;; (defun helm-current-position (save-or-restore) "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))) -;;; Core: initialize +;;; Initialize ;; (defun helm-initialize (any-resume any-input any-default any-sources) "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))) (put 'helm--remap-mouse-mode 'helm-only t) -;; Core: clean up +;; Clean up (defun helm-cleanup () "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))))) -;;; Core: input handling +;;; Input handling ;; ;; (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) -;; Core: all candidates +;; All candidates (defun helm-get-candidates (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)))) -;;; Core: candidate transformers +;;; Candidate transformers (defun helm-process-candidate-transformer (candidates source) "Execute `candidate-transformer' function(s) on CANDIDATES in SOURCE." @@ -2809,7 +2809,7 @@ CANDIDATES." source)) -;; Core: narrowing candidates +;; Narrowing candidates (defun helm-candidate-number-limit (source) "Apply candidate-number-limit attribute value. 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' ;; on the regexp produced by `helm--mapconcat-pattern', ;; 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. ;; (Probably leading to a max-lisp-eval-depth error if both ;; regexp and buffer are too big) @@ -3057,6 +3057,10 @@ See `helm-fuzzy-default-highlight-match'." (cl-loop for c in candidates collect (funcall helm-fuzzy-matching-highlight-fn c))) + +;;; Matching candidates +;; +;; (defun helm-match-functions (source) (let ((matchfns (or (assoc-default 'match source) (assoc-default 'match-strict source) @@ -3075,29 +3079,6 @@ It is used for narrowing list of candidates to the `helm-candidate-number-limit'." (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) (condition-case-unless-debug err (cl-loop with hash = (make-hash-table :test 'equal) @@ -3211,7 +3192,34 @@ and `helm-pattern'." (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) "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")) -;;; Core: async process +;;; Async process ;; (defun helm-output-filter (process output-string) "The `process-filter' function for helm async sources." @@ -3505,7 +3513,7 @@ function." (delete-process process)) -;;; Core: action +;;; Actions ;; (defun helm-execute-selection-action () "Execute current action." @@ -3641,7 +3649,7 @@ If action buffer is selected, back to the helm buffer." (helm-initialize-overlays helm-action-buffer))) -;; Core: selection +;; Selection of candidates (defun helm-display-source-at-screen-top-maybe (unit) "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) -;; Core: misc +;; Misc (defun helm-kill-buffer-hook () "Remove tick entry from `helm-tick-hash' and remove buffer from `helm-buffers' when killing a buffer." diff --git a/elpa/magit-20161019.2021/AUTHORS.md b/elpa/magit-20161021.433/AUTHORS.md similarity index 100% rename from elpa/magit-20161019.2021/AUTHORS.md rename to elpa/magit-20161021.433/AUTHORS.md diff --git a/elpa/magit-20161019.2021/COPYING b/elpa/magit-20161021.433/COPYING similarity index 100% rename from elpa/magit-20161019.2021/COPYING rename to elpa/magit-20161021.433/COPYING diff --git a/elpa/magit-20161019.2021/dir b/elpa/magit-20161021.433/dir similarity index 100% rename from elpa/magit-20161019.2021/dir rename to elpa/magit-20161021.433/dir diff --git a/elpa/magit-20161019.2021/git-rebase.el b/elpa/magit-20161021.433/git-rebase.el similarity index 100% rename from elpa/magit-20161019.2021/git-rebase.el rename to elpa/magit-20161021.433/git-rebase.el diff --git a/elpa/magit-20161019.2021/magit-apply.el b/elpa/magit-20161021.433/magit-apply.el similarity index 100% rename from elpa/magit-20161019.2021/magit-apply.el rename to elpa/magit-20161021.433/magit-apply.el diff --git a/elpa/magit-20161019.2021/magit-autoloads.el b/elpa/magit-20161021.433/magit-autoloads.el similarity index 97% rename from elpa/magit-20161019.2021/magit-autoloads.el rename to elpa/magit-20161021.433/magit-autoloads.el index 674a900..b7765e9 100644 --- a/elpa/magit-20161019.2021/magit-autoloads.el +++ b/elpa/magit-20161021.433/magit-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (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 -;;;;;; 206000)) +;;;### (autoloads nil "git-rebase" "git-rebase.el" (22538 14680 167194 +;;;;;; 56000)) ;;; Generated autoloads from git-rebase.el (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 (autoload 'magit-status "magit" "\ @@ -501,8 +501,8 @@ Git, and Emacs in the echo area. ;;;*** -;;;### (autoloads nil "magit-apply" "magit-apply.el" (22536 46995 -;;;;;; 466685 191000)) +;;;### (autoloads nil "magit-apply" "magit-apply.el" (22538 14680 +;;;;;; 187194 25000)) ;;; Generated autoloads from magit-apply.el (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 -;;;;;; 46995 410685 233000)) +;;;### (autoloads nil "magit-autorevert" "magit-autorevert.el" (22538 +;;;;;; 14680 139194 99000)) ;;; Generated autoloads from magit-autorevert.el (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 -;;;;;; 462685 194000)) +;;;### (autoloads nil "magit-bisect" "magit-bisect.el" (22538 14680 +;;;;;; 179194 37000)) ;;; Generated autoloads from magit-bisect.el (autoload 'magit-bisect-popup "magit-bisect" nil t) @@ -620,8 +620,8 @@ bisect run'. ;;;*** -;;;### (autoloads nil "magit-blame" "magit-blame.el" (22536 46995 -;;;;;; 514685 155000)) +;;;### (autoloads nil "magit-blame" "magit-blame.el" (22538 14680 +;;;;;; 231193 959000)) ;;; Generated autoloads from magit-blame.el (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 -;;;;;; 414685 230000)) +;;;### (autoloads nil "magit-commit" "magit-commit.el" (22538 14680 +;;;;;; 143194 93000)) ;;; Generated autoloads from magit-commit.el (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 -;;;;;; 158000)) +;;;### (autoloads nil "magit-diff" "magit-diff.el" (22538 14680 223193 +;;;;;; 968000)) ;;; Generated autoloads from magit-diff.el (autoload 'magit-diff-popup "magit-diff" "\ @@ -813,8 +813,8 @@ for a revision. ;;;*** -;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22536 46995 -;;;;;; 498685 167000)) +;;;### (autoloads nil "magit-ediff" "magit-ediff.el" (22538 14680 +;;;;;; 211193 989000)) ;;; Generated autoloads from magit-ediff.el (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 -;;;;;; 418685 227000)) +;;;### (autoloads nil "magit-extras" "magit-extras.el" (22538 14680 +;;;;;; 147194 87000)) ;;; Generated autoloads from magit-extras.el (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 -;;;;;; 161000)) +;;;### (autoloads nil "magit-log" "magit-log.el" (22538 14680 215193 +;;;;;; 982000)) ;;; Generated autoloads from magit-log.el (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 -;;;;;; 542685 134000)) +;;;### (autoloads nil "magit-remote" "magit-remote.el" (22538 14680 +;;;;;; 263193 909000)) ;;; Generated autoloads from magit-remote.el (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 -;;;;;; 46995 534685 139000)) +;;;### (autoloads nil "magit-sequence" "magit-sequence.el" (22538 +;;;;;; 14680 251193 925000)) ;;; Generated autoloads from magit-sequence.el (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 -;;;;;; 486685 176000)) +;;;### (autoloads nil "magit-stash" "magit-stash.el" (22538 14680 +;;;;;; 199194 6000)) ;;; Generated autoloads from magit-stash.el (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 -;;;;;; 46995 562685 119000)) +;;;### (autoloads nil "magit-submodule" "magit-submodule.el" (22538 +;;;;;; 14680 279193 884000)) ;;; Generated autoloads from magit-submodule.el (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 -;;;;;; 450685 203000)) +;;;### (autoloads nil "magit-subtree" "magit-subtree.el" (22538 14680 +;;;;;; 171194 49000)) ;;; Generated autoloads from magit-subtree.el (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 -;;;;;; 218000)) +;;;### (autoloads nil "magit-wip" "magit-wip.el" (22538 14680 155194 +;;;;;; 73000)) ;;; Generated autoloads from magit-wip.el (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" ;;;;;; "magit-pkg.el" "magit-process.el" "magit-section.el" "magit-utils.el") -;;;;;; (22536 46995 546685 131000)) +;;;;;; (22538 14680 271193 896000)) ;;;*** diff --git a/elpa/magit-20161019.2021/magit-autorevert.el b/elpa/magit-20161021.433/magit-autorevert.el similarity index 100% rename from elpa/magit-20161019.2021/magit-autorevert.el rename to elpa/magit-20161021.433/magit-autorevert.el diff --git a/elpa/magit-20161019.2021/magit-bisect.el b/elpa/magit-20161021.433/magit-bisect.el similarity index 100% rename from elpa/magit-20161019.2021/magit-bisect.el rename to elpa/magit-20161021.433/magit-bisect.el diff --git a/elpa/magit-20161019.2021/magit-blame.el b/elpa/magit-20161021.433/magit-blame.el similarity index 100% rename from elpa/magit-20161019.2021/magit-blame.el rename to elpa/magit-20161021.433/magit-blame.el diff --git a/elpa/magit-20161019.2021/magit-commit.el b/elpa/magit-20161021.433/magit-commit.el similarity index 100% rename from elpa/magit-20161019.2021/magit-commit.el rename to elpa/magit-20161021.433/magit-commit.el diff --git a/elpa/magit-20161019.2021/magit-core.el b/elpa/magit-20161021.433/magit-core.el similarity index 100% rename from elpa/magit-20161019.2021/magit-core.el rename to elpa/magit-20161021.433/magit-core.el diff --git a/elpa/magit-20161019.2021/magit-diff.el b/elpa/magit-20161021.433/magit-diff.el similarity index 100% rename from elpa/magit-20161019.2021/magit-diff.el rename to elpa/magit-20161021.433/magit-diff.el diff --git a/elpa/magit-20161019.2021/magit-ediff.el b/elpa/magit-20161021.433/magit-ediff.el similarity index 100% rename from elpa/magit-20161019.2021/magit-ediff.el rename to elpa/magit-20161021.433/magit-ediff.el diff --git a/elpa/magit-20161019.2021/magit-extras.el b/elpa/magit-20161021.433/magit-extras.el similarity index 100% rename from elpa/magit-20161019.2021/magit-extras.el rename to elpa/magit-20161021.433/magit-extras.el diff --git a/elpa/magit-20161019.2021/magit-git.el b/elpa/magit-20161021.433/magit-git.el similarity index 100% rename from elpa/magit-20161019.2021/magit-git.el rename to elpa/magit-20161021.433/magit-git.el diff --git a/elpa/magit-20161019.2021/magit-log.el b/elpa/magit-20161021.433/magit-log.el similarity index 100% rename from elpa/magit-20161019.2021/magit-log.el rename to elpa/magit-20161021.433/magit-log.el diff --git a/elpa/magit-20161019.2021/magit-mode.el b/elpa/magit-20161021.433/magit-mode.el similarity index 100% rename from elpa/magit-20161019.2021/magit-mode.el rename to elpa/magit-20161021.433/magit-mode.el diff --git a/elpa/magit-20161019.2021/magit-pkg.el b/elpa/magit-20161021.433/magit-pkg.el similarity index 80% rename from elpa/magit-20161019.2021/magit-pkg.el rename to elpa/magit-20161021.433/magit-pkg.el index 9c1501f..fd9aa97 100644 --- a/elpa/magit-20161019.2021/magit-pkg.el +++ b/elpa/magit-20161021.433/magit-pkg.el @@ -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") (async "20160711.223") (dash "20160820.501") diff --git a/elpa/magit-20161019.2021/magit-process.el b/elpa/magit-20161021.433/magit-process.el similarity index 95% rename from elpa/magit-20161019.2021/magit-process.el rename to elpa/magit-20161021.433/magit-process.el index b917a41..f4a3236 100644 --- a/elpa/magit-20161019.2021/magit-process.el +++ b/elpa/magit-20161021.433/magit-process.el @@ -590,20 +590,22 @@ Magit status buffer." "Special sentinel used by `magit-run-git-sequencer'." (when (memq (process-status process) '(exit signal)) (magit-process-sentinel process event) - (--when-let (with-current-buffer (process-get process 'command-buf) - (magit-mode-get-buffer 'magit-status-mode)) - (with-current-buffer it - (--when-let - (magit-get-section - `((commit . ,(magit-rev-parse "HEAD")) - (,(pcase (car (cadr (-split-at - (1+ (length magit-git-global-arguments)) - (process-command process)))) - ((or "rebase" "am") 'rebase-sequence) - ((or "cherry-pick" "revert") 'sequence))) - (status))) - (goto-char (magit-section-start it)) - (magit-section-update-highlight)))))) + (-when-let (process-buf (process-get process 'process-buf)) + (when (buffer-live-p process-buf) + (-when-let (status-buf (with-current-buffer process-buf + (magit-mode-get-buffer 'magit-status-mode))) + (with-current-buffer status-buf + (--when-let + (magit-get-section + `((commit . ,(magit-rev-parse "HEAD")) + (,(pcase (car (cadr (-split-at + (1+ (length magit-git-global-arguments)) + (process-command process)))) + ((or "rebase" "am") 'rebase-sequence) + ((or "cherry-pick" "revert") 'sequence))) + (status))) + (goto-char (magit-section-start it)) + (magit-section-update-highlight)))))))) (defun magit-process-filter (proc string) "Default filter used by `magit-start-process'." @@ -791,11 +793,10 @@ as argument." default-dir (process-get arg 'default-dir) section (process-get arg 'section) arg (process-exit-status arg))) - (with-current-buffer process-buf - (magit-process-unset-mode-line)) (when (featurep 'dired) (dired-uncache default-dir)) (when (buffer-live-p process-buf) + (magit-process-unset-mode-line) (with-current-buffer process-buf (let ((inhibit-read-only t) (marker (magit-section-start section))) @@ -832,18 +833,19 @@ as argument." "Git failed"))) (if magit-process-raise-error (signal 'magit-git-error (list (format "%s (in %s)" msg default-dir))) - (--when-let (with-current-buffer command-buf - (magit-mode-get-buffer 'magit-status-mode)) - (with-current-buffer it - (setq magit-this-error msg))) - (message "%s ... [%s buffer %s for details]" msg - (-if-let (key (and (buffer-live-p command-buf) - (with-current-buffer command-buf - (car (where-is-internal - 'magit-process-buffer))))) - (format "Hit %s to see" (key-description key)) - "See") - (buffer-name process-buf))))) + (when (buffer-live-p process-buf) + (--when-let (magit-mode-get-buffer 'magit-status-mode) + (when (buffer-live-p it) + (with-current-buffer it + (setq magit-this-error msg)))) + (message "%s ... [%s buffer %s for details]" msg + (-if-let (key (and (buffer-live-p command-buf) + (with-current-buffer command-buf + (car (where-is-internal + 'magit-process-buffer))))) + (format "Hit %s to see" (key-description key)) + "See") + (buffer-name process-buf)))))) arg) (defun magit-process-display-buffer (process) diff --git a/elpa/magit-20161019.2021/magit-remote.el b/elpa/magit-20161021.433/magit-remote.el similarity index 100% rename from elpa/magit-20161019.2021/magit-remote.el rename to elpa/magit-20161021.433/magit-remote.el diff --git a/elpa/magit-20161019.2021/magit-section.el b/elpa/magit-20161021.433/magit-section.el similarity index 100% rename from elpa/magit-20161019.2021/magit-section.el rename to elpa/magit-20161021.433/magit-section.el diff --git a/elpa/magit-20161019.2021/magit-sequence.el b/elpa/magit-20161021.433/magit-sequence.el similarity index 100% rename from elpa/magit-20161019.2021/magit-sequence.el rename to elpa/magit-20161021.433/magit-sequence.el diff --git a/elpa/magit-20161019.2021/magit-stash.el b/elpa/magit-20161021.433/magit-stash.el similarity index 100% rename from elpa/magit-20161019.2021/magit-stash.el rename to elpa/magit-20161021.433/magit-stash.el diff --git a/elpa/magit-20161019.2021/magit-submodule.el b/elpa/magit-20161021.433/magit-submodule.el similarity index 100% rename from elpa/magit-20161019.2021/magit-submodule.el rename to elpa/magit-20161021.433/magit-submodule.el diff --git a/elpa/magit-20161019.2021/magit-subtree.el b/elpa/magit-20161021.433/magit-subtree.el similarity index 100% rename from elpa/magit-20161019.2021/magit-subtree.el rename to elpa/magit-20161021.433/magit-subtree.el diff --git a/elpa/magit-20161019.2021/magit-utils.el b/elpa/magit-20161021.433/magit-utils.el similarity index 100% rename from elpa/magit-20161019.2021/magit-utils.el rename to elpa/magit-20161021.433/magit-utils.el diff --git a/elpa/magit-20161019.2021/magit-wip.el b/elpa/magit-20161021.433/magit-wip.el similarity index 100% rename from elpa/magit-20161019.2021/magit-wip.el rename to elpa/magit-20161021.433/magit-wip.el diff --git a/elpa/magit-20161019.2021/magit.el b/elpa/magit-20161021.433/magit.el similarity index 100% rename from elpa/magit-20161019.2021/magit.el rename to elpa/magit-20161021.433/magit.el diff --git a/elpa/magit-20161019.2021/magit.info b/elpa/magit-20161021.433/magit.info similarity index 100% rename from elpa/magit-20161019.2021/magit.info rename to elpa/magit-20161021.433/magit.info diff --git a/elpa/magit-20161019.2021/magit.info-1 b/elpa/magit-20161021.433/magit.info-1 similarity index 100% rename from elpa/magit-20161019.2021/magit.info-1 rename to elpa/magit-20161021.433/magit.info-1 diff --git a/elpa/magit-20161019.2021/magit.info-2 b/elpa/magit-20161021.433/magit.info-2 similarity index 100% rename from elpa/magit-20161019.2021/magit.info-2 rename to elpa/magit-20161021.433/magit.info-2