summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2012-11-09 18:55:07 +0100
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2012-11-09 18:55:07 +0100
commit8d2cd7136728e0a09c4b5a826d0d588c48b856c7 (patch)
tree10d275a267aaf505a49c913fe8fa5fa048cd6cca
parent7c45fa45537a1580e176e88aa519b932860b48db (diff)
* helm.el (helm-read-pattern-maybe): Simplify, don't need a special flag
just always suspend when in persistent action. * helm-files.el (helm-ff-quick-delete): Remove suspend timer flag.
-rw-r--r--helm-files.el3
-rw-r--r--helm.el6
2 files changed, 3 insertions, 6 deletions
diff --git a/helm-files.el b/helm-files.el
index d3f93bfa..31497c3e 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -1518,8 +1518,7 @@ See `helm-ff-transform-fname-for-completion'."
(progn (helm-previous-line)
(helm-get-selection))
sel)))
- (helm-mark-current-line)))
- (helm-timer-suspended-p t))
+ (helm-mark-current-line))))
(setq presel (if (and helm-ff-transformer-show-only-basename
(not (helm-ff-dot-file-p presel)))
(helm-c-basename presel) presel))
diff --git a/helm.el b/helm.el
index 361df7e3..03142e6f 100644
--- a/helm.el
+++ b/helm.el
@@ -493,9 +493,6 @@ It is disabled by default because *Helm Log* grows quickly.")
"Default functions to match candidates according to `helm-pattern'.")
(defvar helm-process-delayed-sources-timer nil)
(defvar helm-update-blacklist-regexps '("^" "$" "!" " " "\\b" "\\<" "\\>" "\\<_" "\\>_"))
-(defvar helm-timer-suspended-p nil
- "Allow to suspend helm timer.
-This should not be set globally, unless you are sure value will be restored.")
;; Utility: logging
@@ -1604,7 +1601,8 @@ For ANY-PRESELECT ANY-RESUME ANY-KEYMAP, See `helm'."
(setq timer (run-with-idle-timer
helm-input-idle-delay 'repeat
#'(lambda ()
- (unless helm-timer-suspended-p
+ ;; Don't update when in persistent action.
+ (unless helm-in-persistent-action
(helm-check-minibuffer-input)
(helm-print-error-messages))))))
(read-from-minibuffer (or any-prompt "pattern: ")