summaryrefslogtreecommitdiff
path: root/helm.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2016-09-28 12:24:14 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2016-09-28 12:24:14 +0200
commit9d87387aa432ed06c966d0cd193e6cea48359337 (patch)
tree795e21661d3fee14c34eae19d9c07412adaf3cf6 /helm.el
parent1a0375918373fdef6e41b7564e9641f3f727a7bb (diff)
Revert all previous changes to fix mode-line (#1579, #1593).
* helm.el (helm-execute-selection-action): These changes are slowing down and finally hanging helm in rapid execution of persistent action (follow).
Diffstat (limited to 'helm.el')
-rw-r--r--helm.el19
1 files changed, 1 insertions, 18 deletions
diff --git a/helm.el b/helm.el
index 64b050a9..8668b3ab 100644
--- a/helm.el
+++ b/helm.el
@@ -34,9 +34,6 @@
(require 'helm-multi-match)
(require 'helm-source)
-(declare-function face-remap-add-relative "face-remap.el")
-(declare-function face-remap-remove-relative "face-remap.el")
-
;;; Multi keys
;;
@@ -3507,9 +3504,6 @@ function."
;; is split, so jump to this position before executing action.
(helm-current-position 'restore)
(prog1 (helm-execute-selection-action-1)
- (setq face-remapping-alist
- (delete (assoc 'mode-line face-remapping-alist)
- face-remapping-alist))
(helm-log-run-hook 'helm-after-action-hook)))
(defun helm-execute-selection-action-1 (&optional
@@ -4862,9 +4856,7 @@ window to maintain visibility."
(not (functionp attr-val))
(cdr attr-val)))
(cursor-in-echo-area t)
- mode-line-in-non-selected-windows
- mode-line-cookie
- buf-in-pa-window)
+ mode-line-in-non-selected-windows)
(when source
(with-helm-window
(save-selected-window
@@ -4872,12 +4864,6 @@ window to maintain visibility."
(helm-select-persistent-action-window)
(helm-select-persistent-action-window
(or split-onewindow helm-onewindow-p)))
- (add-hook 'helm-goto-line-before-hook
- (lambda ()
- (setq mode-line-cookie
- (face-remap-add-relative
- 'mode-line 'mode-line-inactive)
- buf-in-pa-window (current-buffer))))
(helm-log "current-buffer = %S" (current-buffer))
(let ((helm-in-persistent-action t)
(same-window-regexps '("."))
@@ -4885,9 +4871,6 @@ window to maintain visibility."
special-display-regexps special-display-buffer-names)
(helm-execute-selection-action-1
selection (or fn (helm-get-actions-from-current-source source)) t)
- (helm-aif buf-in-pa-window
- (with-current-buffer it
- (face-remap-remove-relative mode-line-cookie)))
(helm-log-run-hook 'helm-after-persistent-action-hook))
;; A typical case is when a persistent action delete
;; the buffer already displayed in