summaryrefslogtreecommitdiff
path: root/helm-grep.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2015-06-03 07:50:06 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2015-06-03 07:50:06 +0200
commitaafc88250ba48ee1657c076c65aefa79ff188c95 (patch)
tree475b92e5774ea3c005e8c720a69f17797257abc1 /helm-grep.el
parent367f488c3672d4e4453df7c02c904a68d2487b8c (diff)
Prevent updating to an empty pattern with default-as-input.
* helm.el (helm-check-new-input): Delay setting of helm--maybe-use-default-as-input to next update. * helm-id-utils.el: Reuse one-by-one transformer. * helm-grep.el: Fix one-by-one-transformer.
Diffstat (limited to 'helm-grep.el')
-rw-r--r--helm-grep.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/helm-grep.el b/helm-grep.el
index 2473b2ba..702f1696 100644
--- a/helm-grep.el
+++ b/helm-grep.el
@@ -995,13 +995,15 @@ in recurse, search being made on `helm-zgrep-file-extension-regexp'."
(lambda () (or helm-ff-default-directory
(helm-default-directory)
default-directory)))))
- (helm-grep--filter-candidate-1 candidate)))
+ (if (consp candidate)
+ (helm-grep--filter-candidate-1 (car candidate))
+ (helm-grep--filter-candidate-1 candidate))))
(defun helm-grep-highlight-match (str &optional multi-match)
"Highlight in string STR all occurences matching `helm-pattern'."
(require 'helm-match-plugin)
(let (beg end)
- (condition-case nil
+ (condition-case-unless-debug nil
(with-temp-buffer
(insert str)
(goto-char (point-min))