branch: elpa/helm
commit 993757a4b2c4c9d97193f9d96dcb43bdbf064f2e
Author: Stefan Monnier <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Long line changes only
---
helm-command.el | 3 ++-
helm-eval.el | 21 +++++++++++----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/helm-command.el b/helm-command.el
index b2b6866438..73fb976c3f 100644
--- a/helm-command.el
+++ b/helm-command.el
@@ -304,7 +304,8 @@ default to `extended-command-history'."
(prompt (concat (cond
((eq helm-M-x-prefix-argument '-) "- ")
((and (consp helm-M-x-prefix-argument)
- (eq (car helm-M-x-prefix-argument) 4)) "C-u ")
+ (eq (car helm-M-x-prefix-argument) 4))
+ "C-u ")
((and (consp helm-M-x-prefix-argument)
(integerp (car helm-M-x-prefix-argument)))
(format "%d " (car helm-M-x-prefix-argument)))
diff --git a/helm-eval.el b/helm-eval.el
index 8ae4ecc291..a826f5a944 100644
--- a/helm-eval.el
+++ b/helm-eval.el
@@ -85,16 +85,17 @@ Should take one arg: the string to display."
(helm-build-dummy-source "Evaluation Result"
:multiline t
:mode-line "C-RET: nl-and-indent, M-tab: reindent, C-tab:complete, C-p/n:
next/prec-line."
- :filtered-candidate-transformer (lambda (_candidates _source)
- (list
- (condition-case nil
- (with-helm-current-buffer
- (pp-to-string
- (if edebug-active
- (edebug-eval-expression
- (read helm-pattern))
- (eval (read helm-pattern)))))
- (error "Error"))))
+ :filtered-candidate-transformer
+ (lambda (_candidates _source)
+ (list
+ (condition-case nil
+ (with-helm-current-buffer
+ (pp-to-string
+ (if edebug-active
+ (edebug-eval-expression
+ (read helm-pattern))
+ (eval (read helm-pattern) t))))
+ (error "Error"))))
:nohighlight t
:keymap helm-eval-expression-map
:action '(("Copy result to kill-ring" . (lambda (candidate)
