dgutov pushed a commit to branch master in repository elpa. commit 0233a0c41139c2bfabc4265dfdc7730c6395ce4d Author: Dmitry Gutov <dgu...@yandex.ru> Date: Mon Aug 4 02:34:29 2014 +0400
Use `window-body-width' instead of the now-alias `window-width' --- company.el | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/company.el b/company.el index 732226a..3f90a48 100644 --- a/company.el +++ b/company.el @@ -2364,7 +2364,7 @@ If SHOW-VERSION is non-nil, show the version in the echo area." (- (nth 3 edges) (nth 1 edges)))) (defsubst company--window-width () - (let ((ww (window-width))) + (let ((ww (window-body-width))) ;; Account for the line continuation column. (when (zerop (cadr (window-fringes))) (cl-decf ww)) @@ -2579,7 +2579,7 @@ Returns a negative number if the tooltip should be displayed above point." (defun company-echo-format () - (let ((limit (window-width (minibuffer-window))) + (let ((limit (window-body-width (minibuffer-window))) (len -1) ;; Roll to selection. (candidates (nthcdr company-selection company-candidates)) @@ -2609,7 +2609,7 @@ Returns a negative number if the tooltip should be displayed above point." (defun company-echo-strip-common-format () - (let ((limit (window-width (minibuffer-window))) + (let ((limit (window-body-width (minibuffer-window))) (len (+ (length company-prefix) 2)) ;; Roll to selection. (candidates (nthcdr company-selection company-candidates))