branch: master
commit f04aec86cd60918d64caa6e5fd244fb12790662f
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
ivy-hydra.el: Bind "t" to toggle-truncate-lines
* ivy.el (ivy-format-function-default): When `truncate-lines' is non-nil
don't truncate with "...".
Use "C-o t" when you complete very long lines and want to see them
whole.
Fixes #214
---
ivy-hydra.el | 9 +++++----
ivy.el | 10 ++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ivy-hydra.el b/ivy-hydra.el
index 6ab1f9a..152812b 100644
--- a/ivy-hydra.el
+++ b/ivy-hydra.el
@@ -47,11 +47,11 @@
(defhydra hydra-ivy (:hint nil
:color pink)
"
-^^^^^^ ^Yes^ ^No^ ^Maybe^ ^Action^
+^^^^^^ ^Yes^ ^No^ ^Maybe^ ^Action^
^^^^^^^^^^^^^^---------------------------------------------------
-^ ^ _k_ ^ ^ _f_ollow _i_nsert _c_: calling %s(if ivy-calling \"on\"
\"off\") _w_/_s_: %s(ivy-action-name)
+^ ^ _k_ ^ ^ _f_ollow _i_nsert _c_: calling %s(if ivy-calling \"on\"
\"off\") _w_/_s_: %s(ivy-action-name)
_h_ ^+^ _l_ _d_one _o_ops _m_: matcher %s(if (eq ivy--regex-function
'ivy--regex-fuzzy) \"fuzzy\" \"ivy\")
-^ ^ _j_ ^ ^ _g_o ^ ^ _<_/_>_: shrink/grow window
+^ ^ _j_ ^ ^ _g_o ^ ^ _<_/_>_: shrink/grow _t_runcate:
%`truncate-lines
"
;; arrows
("h" ivy-beginning-of-buffer)
@@ -73,7 +73,8 @@ _h_ ^+^ _l_ _d_one _o_ops _m_: matcher %s(if (eq
ivy--regex-function 'i
(">" ivy-minibuffer-grow)
("<" ivy-minibuffer-shrink)
("w" ivy-prev-action)
- ("s" ivy-next-action))
+ ("s" ivy-next-action)
+ ("t" (setq truncate-lines (not truncate-lines))))
(provide 'ivy-hydra)
diff --git a/ivy.el b/ivy.el
index 25ea6c6..bf3981a 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1568,10 +1568,12 @@ This string will be inserted into the minibuffer.")
(let ((ww (- (window-width)
(if (and (boundp 'fringe-mode) (eq fringe-mode 0)) 1 0))))
(mapconcat
- (lambda (s)
- (if (> (length s) ww)
- (concat (substring s 0 (- ww 3)) "...")
- s))
+ (if truncate-lines
+ (lambda (s)
+ (if (> (length s) ww)
+ (concat (substring s 0 (- ww 3)) "...")
+ s))
+ #'identity)
cands "\n"))))
(defun ivy-format-function-arrow (cands)
