[elpa] master ec12e27 27/29: Merge branch 'master' of github.com:company-mode/company-mode

[Dmitry Gutov]

branch: master
commit ec12e270336ae5d313db73d2dfa462482050f169
Merge: 90123e7 f932619
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Merge branch 'master' of github.com:company-mode/company-mode
---
 company.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/company.el b/company.el
index 428a27b..7867823 100644
--- a/company.el
+++ b/company.el
@@ -3015,10 +3015,16 @@ Delay is determined by `company-tooltip-idle-delay'."
 
 (defvar company-echo-delay .01)
 
+(defcustom company-echo-truncate-lines t
+  "Whether frontend messages written to the echo area should be truncated."
+  :type 'boolean
+  :package-version '(company . "0.9.3"))
+
 (defun company-echo-show (&optional getter)
   (when getter
     (setq company-echo-last-msg (funcall getter)))
-  (let ((message-log-max nil))
+  (let ((message-log-max nil)
+        (message-truncate-lines company-echo-truncate-lines))
     (if company-echo-last-msg
         (message "%s" company-echo-last-msg)
       (message ""))))